Skip to content

Commit

Permalink
only load the js for the ajax loading, if one picture needs to be gen…
Browse files Browse the repository at this point in the history 
…erated

bug:2684

git-svn-id: http://piwigo.org/svn/trunk@16522 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
@flop25
flop25 committed Jul 9, 2012
1 parent efa0a0f commit 587d567
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
16 changes: 9 additions & 7 deletions themes/default/template/comment_list.tpl
View file
@@ -1,5 +1,3 @@
{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}
Expand All @@ -15,11 +13,15 @@
{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}
{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}
{if !$derivative->is_cached()}
{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}
<div class="illustration">
<a href="{$comment.U_PICTURE}">
<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}">
Expand Down
6 changes: 4 additions & 2 deletions themes/default/template/mainpage_categories.tpl
View file
@@ -1,5 +1,3 @@
{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}
width: {$derivative_params->max_width()+5}px;
Expand All @@ -12,6 +10,10 @@
<ul class="thumbnailCategories">
{foreach from=$category_thumbnails item=cat name=cat_loop}
{assign var=derivative value=$pwg->derivative($derivative_params, $cat.representative.src_image)}
{if !$derivative->is_cached()}
{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}
<li class="{if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
<div class="thumbnailCategory">
<div class="illustration">
Expand Down
2 changes: 2 additions & 0 deletions themes/default/template/picture_content.tpl
View file
@@ -1,5 +1,7 @@
{if !$current.selected_derivative->is_cached()}
{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}

<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}">

Expand Down
8 changes: 5 additions & 3 deletions themes/default/template/thumbnails.tpl
View file
@@ -1,6 +1,4 @@
{if !empty($thumbnails)}{strip}
{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'}
{*define_derivative name='derivative_params' width=160 height=90 crop=true*}
{html_style}
{*Set some sizes according to maximum thumbnail width and height*}
Expand All @@ -25,7 +23,11 @@
{/html_style}
{foreach from=$thumbnails item=thumbnail}
{assign var=derivative value=$pwg->derivative($derivative_params, $thumbnail.src_image)}
<li>
{if !$derivative->is_cached()}
{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}
<li>
<span class="wrap1">
<span class="wrap2">
<a href="{$thumbnail.URL}">
Expand Down

0 comments on commit 587d567

Please sign in to comment.