aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes/default
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-11-15 11:58:10 +0000
committerplegall <plg@piwigo.org>2011-11-15 11:58:10 +0000
commitf6a6701fb77e377e33896c1d73821416dcc7b921 (patch)
tree584927d902dd1e8c86821a92bc6e039ae73ddd79 /admin/themes/default
parent144a79944b194d31f9494a8ec0a38aff8867e001 (diff)
merge r12629 from branch 2.3 to trunk
bug 2506 fixed: Batch Manager does not take permissions into account when filtering on tags feature 2507 added: Batch Manager can filter on "all tags" or "any tag" git-svn-id: http://piwigo.org/svn/trunk@12630 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/themes/default/template/batch_manager_global.tpl22
1 files changed, 12 insertions, 10 deletions
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 627156be4..d278bb7f4 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -483,16 +483,18 @@ jQuery(window).load(function() {
</select>
<label><input type="checkbox" name="filter_category_recursive" {if isset($filter.category_recursive)}checked="checked"{/if}> {'include child albums'|@translate}</label>
</li>
- <li id="filter_tags" {if !isset($filter.tags)}style="display:none"{/if}>
- <a href="#" class="removeFilter" title="remove this filter"><span>[x]</span></a>
- <input type="checkbox" name="filter_tags_use" class="useFilterCheckbox" {if isset($filter.tags)}checked="checked"{/if}>
- {'Tags'|@translate}
- <select id="tagsFilter" name="filter_tags">
- {foreach from=$filter_tags item=tag}
- <option value="{$tag.id}">{$tag.name}</option>
- {/foreach}
- </select>
- </li>
+ <li id="filter_tags" {if !isset($filter.tags)}style="display:none"{/if}>
+ <a href="#" class="removeFilter" title="remove this filter"><span>[x]</span></a>
+ <input type="checkbox" name="filter_tags_use" class="useFilterCheckbox" {if isset($filter.tags)}checked="checked"{/if}>
+ {'Tags'|@translate}
+ <select id="tagsFilter" name="filter_tags">
+ {foreach from=$filter_tags item=tag}
+ <option value="{$tag.id}">{$tag.name}</option>
+ {/foreach}
+ </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>
+ <label><span><input type="radio" name="tag_mode" value="OR" {if isset($filter.tag_mode) and $filter.tag_mode eq 'OR'}checked="checked"{/if}> {'Any tag'|@translate}</span></label>
+ </li>
<li id="filter_level" {if !isset($filter.level)}style="display:none"{/if}>
<a href="#" class="removeFilter" title="remove this filter"><span>[x]</span></a>
<input type="checkbox" name="filter_level_use" class="useFilterCheckbox" {if isset($filter.level)}checked="checked"{/if}>