diff options
Diffstat (limited to '')
| -rw-r--r-- | themes/default/template/comment_list.tpl | 11 | ||||
| -rw-r--r-- | themes/default/template/picture_content.tpl | 7 | ||||
| -rw-r--r-- | themes/default/template/thumbnails.tpl | 10 |
3 files changed, 6 insertions, 22 deletions
diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index b61cd73bb..59618cde2 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -13,18 +13,9 @@ {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 !$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}"> + <img src="{$pwg->derivative_url($derivative_params, $comment.src_image)}" alt="{$comment.ALT}"> </a> </div> {/if} diff --git a/themes/default/template/picture_content.tpl b/themes/default/template/picture_content.tpl index 06ec8180f..d0fb1e178 100644 --- a/themes/default/template/picture_content.tpl +++ b/themes/default/template/picture_content.tpl @@ -1,9 +1,4 @@ -{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}"> +<img src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()} 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}"> {foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip} <map name="map{$derivative->get_type()}"> diff --git a/themes/default/template/thumbnails.tpl b/themes/default/template/thumbnails.tpl index 9121aed60..476ec5ef3 100644 --- a/themes/default/template/thumbnails.tpl +++ b/themes/default/template/thumbnails.tpl @@ -1,4 +1,6 @@ {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*} @@ -23,15 +25,11 @@ {/html_style} {foreach from=$thumbnails item=thumbnail} {assign var=derivative value=$pwg->derivative($derivative_params, $thumbnail.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> + <li> <span class="wrap1"> <span class="wrap2"> <a href="{$thumbnail.URL}"> - <img class="thumbnail" {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="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}"> + <img class="thumbnail" {if !$derivative->is_cached()}data-{/if}src="{$derivative->get_url()}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}"> </a> </span> {if $SHOW_THUMBNAIL_CAPTION } |