Changeset 17289 for trunk/admin/themes/default/template/batch_manager_global.tpl

Timestamp:

Aug 1, 2012, 6:59:06 PM (12 years ago)

Author:

rvelices

Message:

batch manager improvements/fixes:

• when refreshing photo set, start is set to 0 (otherwise if the new set is smaller that start, it looks like it is empty)
• correct positioning of thumbnails (width/height) is done in template instead of javascript (immediate instead on ready + no reflows)
• less space lost on batch manager page
• fix wrong page title in batch manager because of global variable $title overriden
• fix language keys in element_set_ranks (capital/lowercase issue)

File:

• trunk/admin/themes/default/template/batch_manager_global.tpl (modified) (8 diffs)

trunk/admin/themes/default/template/batch_manager_global.tpl

@@ -51 +51 @@
     });
   }
+        $('ul.thumbnails').enableShiftClick();
 });
 {/literal}{/footer_script}
@@ -482 +483 @@
 });
 
-jQuery(window).load(function() {
-        var max_w=0, max_h=0;
-        $(".thumbnails img").each(function () {
-                max_w = Math.max(max_w, $(this).width() );
-                max_h = Math.max(max_h, $(this).height() );
-        });
-        max_w += 10;
-        max_h += 35;
-        $("ul.thumbnails span, ul.thumbnails label").css('width', max_w+'px').css('height', max_h+'px');
-        $('ul.thumbnails').enableShiftClick();
-});
+
 {/literal}{/footer_script}
 
@@ -500 +491 @@
 
   <form action="{$F_ACTION}" method="post">
+        <input type="hidden" name="start" value="{$START}">
 
   <fieldset>
@@ -511 +503 @@
         <select name="filter_prefilter">
           {foreach from=$prefilters item=prefilter}
-          <option value="{$prefilter.ID}" {if $filter.prefilter eq $prefilter.ID}selected="selected"{/if}>{$prefilter.NAME}</option>
+          <option value="{$prefilter.ID}" {if isset($filter.prefilter) && $filter.prefilter eq $prefilter.ID}selected="selected"{/if}>{$prefilter.NAME}</option>
           {/foreach}
         </select>
@@ -529 +521 @@
         {'Tags'|@translate}
         <select id="tagsFilter" name="filter_tags">
-          {foreach from=$filter_tags item=tag}
+          {if isset($filter_tags)}{foreach from=$filter_tags item=tag}
           <option value="{$tag.id}">{$tag.name}</option>
-          {/foreach}
+          {/foreach}{/if}
         </select>
         <label><span><input type="radio" name="tag_mode" value="AND" {if !isset($filter.tag_mode) or $filter.tag_mode eq 'AND'}checked="checked"{/if}> {'All tags'|@translate}</span></label>
@@ -547 +539 @@
     </ul>
 
-    <p class="actionButtons" style="">
+    <p class="actionButtons">
       <select id="addFilter">
         <option value="-1">{'Add a filter'|@translate}</option>
@@ -587 +579 @@
   </p>
 
-    <ul class="thumbnails">
-                        {foreach from=$thumbnails item=thumbnail}
-                                {if in_array($thumbnail.ID, $selection)}
-                                        {assign var='isSelected' value=true}
-                                {else}
-                                        {assign var='isSelected' value=false}
-                                {/if}
-                        <li>
-                                <span class="wrap1">
-                                        <label>
-                                                <span class="wrap2{if $isSelected} thumbSelected{/if}">
-                                                <div class="actions"><a href="{$thumbnail.FILE_SRC}" class="preview-box">{'Zoom'|@translate}</a> &middot; <a href="{$thumbnail.U_EDIT}" target="_blank">{'Edit'|@translate}</a></div>
-                                                        {if $thumbnail.LEVEL > 0}
-                                                        <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
-                                                        <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}</em>
-                                                        {/if}
-                                                        <span>
-                                                                <img src="{$thumbnail.TN_SRC}" alt="{$thumbnail.FILE}" title="{$thumbnail.TITLE|@escape:'html'}" class="thumbnail">
-                                                        </span>
-                                                </span>
-                                                <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" {if $isSelected}checked="checked"{/if}>
-                                        </label>
-                                </span>
-                        </li>
-      {/foreach}
-    </ul>
+        <ul class="thumbnails">
+                {html_style}
+UL.thumbnails SPAN.wrap2{ldelim}
+  width: {$thumb_params->max_width()+2}px;
+}
+UL.thumbnails SPAN.wrap2 {ldelim}
+  height: {$thumb_params->max_height()+25}px;
+}
+                {/html_style}
+                {foreach from=$thumbnails item=thumbnail}
+                {assign var='isSelected' value=$thumbnail.id|@in_array:$selection}
+                <li>
+                        <span class="wrap1">
+                                <label>
+                                        <input type="checkbox" name="selection[]" value="{$thumbnail.id}" {if $isSelected}checked="checked"{/if}>
+                                        <span class="wrap2{if $isSelected} thumbSelected{/if}">
+                                        <div class="actions"><a href="{$thumbnail.FILE_SRC}" class="preview-box">{'Zoom'|@translate}</a> &middot; <a href="{$thumbnail.U_EDIT}" target="_blank">{'Edit'|@translate}</a></div>
+                                                {if $thumbnail.level > 0}
+                                                <em class="levelIndicatorB">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.level))}</em>
+                                                <em class="levelIndicatorF" title="{'Who can see these photos?'|@translate} : ">{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.level))}</em>
+                                                {/if}
+                                                <img src="{$thumbnail.thumb->get_url()}" alt="{$thumbnail.file}" title="{$thumbnail.TITLE|@escape:'html'}" {$thumbnail.thumb->get_size_htm()}>
+                                        </span>
+                                </label>
+                        </span>
+                </li>
+                {/foreach}
+        </ul>
 
   {if !empty($navbar) }
@@ -714 +708 @@
     <!-- del_tags -->
     <div id="action_del_tags" class="bulkAction">
-{$DEL_TAG_SELECTION}
+{if !empty($DEL_TAG_SELECTION)}{$DEL_TAG_SELECTION}{/if}
     </div>