diff options
author | flop25 <flop25@piwigo.org> | 2012-07-08 16:58:29 +0000 |
---|---|---|
committer | flop25 <flop25@piwigo.org> | 2012-07-08 16:58:29 +0000 |
commit | 911ce29f9436c559dbdffe41c0a3944993f9e6f6 (patch) | |
tree | 53b427b42157d4dd4a14eecf89d092833af9e910 /themes/default/template | |
parent | e00b7dfa1af3c7c8dda21faae736907a6ddda935 (diff) |
adding the loader ajax-loader-small.gif for comment_list.tpl, and ajax-loader-big.gif for picture_content.tpl
bug:2684
git-svn-id: http://piwigo.org/svn/trunk@16505 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | themes/default/template/comment_list.tpl | 9 | ||||
-rw-r--r-- | themes/default/template/mainpage_categories.tpl | 2 | ||||
-rw-r--r-- | themes/default/template/picture_content.tpl | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index 59618cde2..ad53eecbe 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -1,3 +1,5 @@ +{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} @@ -13,9 +15,14 @@ {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} <div class="illustration"> <a href="{$comment.U_PICTURE}"> - <img src="{$pwg->derivative_url($derivative_params, $comment.src_image)}" alt="{$comment.ALT}"> + <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}"> </a> </div> {/if} diff --git a/themes/default/template/mainpage_categories.tpl b/themes/default/template/mainpage_categories.tpl index 28cdf7143..f5b9d8a1e 100644 --- a/themes/default/template/mainpage_categories.tpl +++ b/themes/default/template/mainpage_categories.tpl @@ -16,7 +16,7 @@ <div class="thumbnailCategory"> <div class="illustration"> <a href="{$cat.URL}"> - <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="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}"> + <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="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '|@strip_tags:false} - {'display this album'|@translate}"> </a> </div> <div class="description"> diff --git a/themes/default/template/picture_content.tpl b/themes/default/template/picture_content.tpl index d0fb1e178..4514d6780 100644 --- a/themes/default/template/picture_content.tpl +++ b/themes/default/template/picture_content.tpl @@ -1,4 +1,7 @@ -<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}"> +{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'} + +<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}"> {foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip} <map name="map{$derivative->get_type()}"> |