Changeset 16930 for branches/2.4


Ignore:
Timestamp:
07/23/12 14:05:14 (7 years ago)
Author:
flop25
Message:

revert bug:2684 on tpl files

Location:
branches/2.4/themes/default/template
Files:
3 edited

Legend:

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

    r16523 r16930  
    1414<li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> 
    1515        {if isset($comment.src_image)} 
    16         {if isset($comment_derivative_params)} 
    17         {assign var=derivative value=$pwg->derivative($comment_derivative_params, $comment.src_image)} 
    18         {else} 
    19         {assign var=derivative value=$pwg->derivative($derivative_params, $comment.src_image)} 
    20         {/if} 
    21         {if !$derivative->is_cached()} 
    22         {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} 
    23         {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} 
    24         {/if} 
    2516        <div class="illustration"> 
    2617                <a href="{$comment.U_PICTURE}"> 
    27                 <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}"> 
     18                <img src="{$pwg->derivative_url($derivative_params, $comment.src_image)}" alt="{$comment.ALT}"> 
    2819                </a> 
    2920        </div> 
  • branches/2.4/themes/default/template/picture_content.tpl

    r16523 r16930  
    1 {if !$current.selected_derivative->is_cached()} 
    2 {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} 
    3 {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} 
    4 {/if} 
    5  
    6 <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}"> 
     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}"> 
    72 
    83{foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip} 
  • branches/2.4/themes/default/template/thumbnails.tpl

    r16523 r16930  
    11{if !empty($thumbnails)}{strip} 
     2{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} 
     3{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} 
    24{*define_derivative name='derivative_params' width=160 height=90 crop=true*} 
    35{html_style} 
     
    2426{foreach from=$thumbnails item=thumbnail} 
    2527{assign var=derivative value=$pwg->derivative($derivative_params, $thumbnail.src_image)} 
    26 {if !$derivative->is_cached()} 
    27 {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} 
    28 {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} 
    29 {/if} 
    30 <li> 
     28        <li> 
    3129        <span class="wrap1"> 
    3230                <span class="wrap2"> 
    3331                <a href="{$thumbnail.URL}"> 
    34                         <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}"> 
     32                        <img class="thumbnail" {if !$derivative->is_cached()}data-{/if}src="{$derivative->get_url()}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}"> 
    3533                </a> 
    3634                </span> 
Note: See TracChangeset for help on using the changeset viewer.