Changeset 16506


Ignore:
Timestamp:
07/08/12 19:02:11 (7 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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/themes/default/template/comment_list.tpl

    r15924 r16506  
     1{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} 
     2{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} 
    13{if isset($comment_derivative_params)} 
    24{strip}{html_style} 
     
    1416<li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> 
    1517        {if isset($comment.src_image)} 
     18    {if isset($comment_derivative_params)} 
     19    {assign var=derivative value=$pwg->derivative($comment_derivative_params, $comment.src_image)} 
     20    {else} 
     21    {assign var=derivative value=$pwg->derivative($derivative_params, $comment.src_image)} 
     22    {/if} 
    1623        <div class="illustration"> 
    1724                <a href="{$comment.U_PICTURE}"> 
    18                 <img src="{$pwg->derivative_url($derivative_params, $comment.src_image)}" alt="{$comment.ALT}"> 
     25                <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}"> 
    1926                </a> 
    2027        </div> 
  • branches/2.4/themes/default/template/mainpage_categories.tpl

    r14239 r16506  
     1{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} 
     2{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} 
    13{strip}{html_style} 
    24.thumbnailCategory .illustration{ldelim} 
     
    1012<ul class="thumbnailCategories"> 
    1113{foreach from=$category_thumbnails item=cat name=cat_loop} 
     14{assign var=derivative value=$pwg->derivative($derivative_params, $cat.representative.src_image)} 
    1215        <li class="{if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> 
    1316                <div class="thumbnailCategory"> 
    1417                        <div class="illustration"> 
    1518                        <a href="{$cat.URL}"> 
    16                                 <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}"> 
     19                                <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}"> 
    1720                        </a> 
    1821                        </div> 
  • branches/2.4/themes/default/template/picture_content.tpl

    r14180 r16506  
    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}"> 
     1{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} 
     2{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} 
     3 
     4<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}"> 
    25 
    36{foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip} 
  • branches/2.4/themes/default/template/thumbnails.tpl

    r14239 r16506  
    3030                <span class="wrap2"> 
    3131                <a href="{$thumbnail.URL}"> 
    32                         <img class="thumbnail" {if !$derivative->is_cached()}data-{/if}src="{$derivative->get_url()}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}"> 
     32                        <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}"> 
    3333                </a> 
    3434                </span> 
Note: See TracChangeset for help on using the changeset viewer.