diff options
| -rw-r--r-- | themes/default/template/comment_list.tpl | 16 | ||||
| -rw-r--r-- | themes/default/template/mainpage_categories.tpl | 6 | ||||
| -rw-r--r-- | themes/default/template/picture_content.tpl | 2 | ||||
| -rw-r--r-- | themes/default/template/thumbnails.tpl | 8 |
4 files changed, 20 insertions, 12 deletions
diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index ad53eecbe..b61cd73bb 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -1,5 +1,3 @@ -{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} -{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} {if isset($comment_derivative_params)} {strip}{html_style} .commentElement .illustration{ldelim} @@ -15,11 +13,15 @@ {foreach from=$comments item=comment name=comment_loop} <li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> {if isset($comment.src_image)} - {if isset($comment_derivative_params)} - {assign var=derivative value=$pwg->derivative($comment_derivative_params, $comment.src_image)} - {else} - {assign var=derivative value=$pwg->derivative($derivative_params, $comment.src_image)} - {/if} + {if isset($comment_derivative_params)} + {assign var=derivative value=$pwg->derivative($comment_derivative_params, $comment.src_image)} + {else} + {assign var=derivative value=$pwg->derivative($derivative_params, $comment.src_image)} + {/if} + {if !$derivative->is_cached()} + {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} + {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} + {/if} <div class="illustration"> <a href="{$comment.U_PICTURE}"> <img {if $derivative->is_cached()}src="{$derivative->get_url()}"{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax-loader-small.gif" data-src="{$derivative->get_url()}"{/if} alt="{$comment.ALT}"> diff --git a/themes/default/template/mainpage_categories.tpl b/themes/default/template/mainpage_categories.tpl index f5b9d8a1e..041e18439 100644 --- a/themes/default/template/mainpage_categories.tpl +++ b/themes/default/template/mainpage_categories.tpl @@ -1,5 +1,3 @@ -{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} -{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} {strip}{html_style} .thumbnailCategory .illustration{ldelim} width: {$derivative_params->max_width()+5}px; @@ -12,6 +10,10 @@ <ul class="thumbnailCategories"> {foreach from=$category_thumbnails item=cat name=cat_loop} {assign var=derivative value=$pwg->derivative($derivative_params, $cat.representative.src_image)} +{if !$derivative->is_cached()} +{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} +{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} +{/if} <li class="{if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> <div class="thumbnailCategory"> <div class="illustration"> diff --git a/themes/default/template/picture_content.tpl b/themes/default/template/picture_content.tpl index 4514d6780..06ec8180f 100644 --- a/themes/default/template/picture_content.tpl +++ b/themes/default/template/picture_content.tpl @@ -1,5 +1,7 @@ +{if !$current.selected_derivative->is_cached()} {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} +{/if} <img {if $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()} {else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax-loader-big.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}{/if}"> diff --git a/themes/default/template/thumbnails.tpl b/themes/default/template/thumbnails.tpl index de7e88ce1..9121aed60 100644 --- a/themes/default/template/thumbnails.tpl +++ b/themes/default/template/thumbnails.tpl @@ -1,6 +1,4 @@ {if !empty($thumbnails)}{strip} -{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} -{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} {*define_derivative name='derivative_params' width=160 height=90 crop=true*} {html_style} {*Set some sizes according to maximum thumbnail width and height*} @@ -25,7 +23,11 @@ {/html_style} {foreach from=$thumbnails item=thumbnail} {assign var=derivative value=$pwg->derivative($derivative_params, $thumbnail.src_image)} - <li> +{if !$derivative->is_cached()} +{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} +{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} +{/if} +<li> <span class="wrap1"> <span class="wrap2"> <a href="{$thumbnail.URL}"> |