merge r16504 & r16505 from trunk to branch 2.4

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

1 files changed, 8 insertions, 1 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}