Changeset 16523


Ignore:
Timestamp:
Jul 9, 2012, 10:03:44 AM (12 years ago)
Author:
flop25
Message:

merge r16522 from branch 2.4 to trunk
only load the js for the ajax loading, if one picture needs to be generated
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

    r16506 r16523  
    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'}
    31{if isset($comment_derivative_params)}
    42{strip}{html_style}
     
    1614<li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
    1715        {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}
     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}
    2325        <div class="illustration">
    2426                <a href="{$comment.U_PICTURE}">
  • branches/2.4/themes/default/template/mainpage_categories.tpl

    r16506 r16523  
    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'}
    31{strip}{html_style}
    42.thumbnailCategory .illustration{ldelim}
     
    1311{foreach from=$category_thumbnails item=cat name=cat_loop}
    1412{assign var=derivative value=$pwg->derivative($derivative_params, $cat.representative.src_image)}
     13{if !$derivative->is_cached()}
     14{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'}
     15{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'}
     16{/if}
    1517        <li class="{if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
    1618                <div class="thumbnailCategory">
  • branches/2.4/themes/default/template/picture_content.tpl

    r16506 r16523  
     1{if !$current.selected_derivative->is_cached()}
    12{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'}
     4{/if}
    35
    46<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}">
  • branches/2.4/themes/default/template/thumbnails.tpl

    r16506 r16523  
    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'}
    42{*define_derivative name='derivative_params' width=160 height=90 crop=true*}
    53{html_style}
     
    2624{foreach from=$thumbnails item=thumbnail}
    2725{assign var=derivative value=$pwg->derivative($derivative_params, $thumbnail.src_image)}
    28         <li>
     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>
    2931        <span class="wrap1">
    3032                <span class="wrap2">
Note: See TracChangeset for help on using the changeset viewer.