iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-10 07:14:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r16504 & r16505 from trunk to branch 2.4

Browse Source 
bug:2684
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/branches/2.4@16506 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
flop25
2012-07-08 17:02:11 +00:00
parent b5025b2947
commit fa373d27ca
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/template/comment_list.tpl
+8 -1
View File
@@ -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}
themes/default/template/mainpage_categories.tpl
+4 -1
View File
@@ -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'}
{strip}{html_style}
.thumbnailCategory .illustration{ldelim}
width: {$derivative_params->max_width()+5}px;
@@ -9,11 +11,12 @@
{/html_style}{/strip}
<ul class="thumbnailCategories">
{foreach from=$category_thumbnails item=cat name=cat_loop}
{assign var=derivative value=$pwg->derivative($derivative_params, $cat.representative.src_image)}
<li class="{if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
<div class="thumbnailCategory">
<div class="illustration">
<a href="{$cat.URL}">
<img src="{$pwg->derivative_url($derivative_params, $cat.representative.src_image)}" 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">
themes/default/template/picture_content.tpl
+4 -1
View File
@@ -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()}">
themes/default/template/thumbnails.tpl
+1 -1
View File
@@ -29,7 +29,7 @@
<span class="wrap1">
<span class="wrap2">
<a href="{$thumbnail.URL}">
<img class="thumbnail" {if !$derivative->is_cached()}data-{/if}src="{$derivative->get_url()}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}">
<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}">
</a>
</span>
{if $SHOW_THUMBNAIL_CAPTION }