aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-10-09 04:58:57 +0000
committerrvelices <rv-github@modusoptimus.com>2012-10-09 04:58:57 +0000
commit05671cf18cfa0eff7757930fda00bdc19f83dbc6 (patch)
tree30d30ff4ad6862ac23db7f3320922303073bc752 /admin/themes
parent4c03bc9260bda368950e143e5a9861c8eaf664b5 (diff)
batch manager - remove unused code, less sql queries and avoid 4 calls to same display_select function
git-svn-id: http://piwigo.org/svn/trunk@18573 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes')
-rw-r--r--admin/themes/default/template/batch_manager_global.tpl9
1 files changed, 3 insertions, 6 deletions
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 821c4caef..5b031fc6b 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -15,7 +15,6 @@ jQuery(document).ready(function() {
jQuery.fn.enableShiftClick = function() {
var inputs = [];
var count=0;
- var This=$(this);
this.find('input[type=checkbox]').each(function() {
var pos=count;
inputs[count++]=this;
@@ -522,7 +521,7 @@ $(document).ready(function() {
<input type="checkbox" name="filter_category_use" class="useFilterCheckbox" {if isset($filter.category)}checked="checked"{/if}>
{'Album'|@translate}
<select style="width:400px" name="filter_category" size="1">
- {html_options options=$filter_category_options selected=$filter_category_options_selected}
+ {html_options options=$category_full_name_options selected=$filter_category_selected}
</select>
<label><input type="checkbox" name="filter_category_recursive" {if isset($filter.category_recursive)}checked="checked"{/if}> {'include child albums'|@translate}</label>
</li>
@@ -675,9 +674,7 @@ UL.thumbnails SPAN.wrap2 {ldelim}
<select name="selectAction">
<option value="-1">{'Choose an action'|@translate}</option>
<option disabled="disabled">------------------</option>
- {if isset($show_delete_form) }
<option value="delete">{'Delete selected photos'|@translate}</option>
- {/if}
<option value="associate">{'Associate to album'|@translate}</option>
<option value="move">{'Move to album'|@translate}</option>
{if !empty($dissociate_options)}
@@ -714,7 +711,7 @@ UL.thumbnails SPAN.wrap2 {ldelim}
<!-- associate -->
<div id="action_associate" class="bulkAction">
<select style="width:400px" name="associate" size="1">
- {html_options options=$associate_options }
+ {html_options options=$category_full_name_options}
</select>
<br>{'... or '|@translate} <a href="#" class="addAlbumOpen" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
</div>
@@ -722,7 +719,7 @@ UL.thumbnails SPAN.wrap2 {ldelim}
<!-- move -->
<div id="action_move" class="bulkAction">
<select style="width:400px" name="move" size="1">
- {html_options options=$move_options }
+ {html_options options=$category_full_name_options}
</select>
<br>{'... or '|@translate} <a href="#" class="addAlbumOpen" title="{'create a new album'|@translate}">{'create a new album'|@translate}</a>
</div>