Changeset 16506 for branches

Timestamp:

Jul 8, 2012, 7:02:11 PM (12 years ago)

Author:

flop25

Message:

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

Location:

branches/2.4/themes/default/template

Files:

• comment_list.tpl (modified) (2 diffs)
• mainpage_categories.tpl (modified) (2 diffs)
• picture_content.tpl (modified) (1 diff)
• thumbnails.tpl (modified) (1 diff)

branches/2.4/themes/default/template/comment_list.tpl

@@ +1 @@
+{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}
@@ -14 +16 @@
 <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>

branches/2.4/themes/default/template/mainpage_categories.tpl

@@ +1 @@
+{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}
@@ -10 +12 @@
 <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>

branches/2.4/themes/default/template/picture_content.tpl

@@ -1 @@
-<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}

branches/2.4/themes/default/template/thumbnails.tpl

@@ -30 +30 @@
                 <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>