diff options
| author | plegall <plg@piwigo.org> | 2014-08-22 08:56:51 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2014-08-22 08:56:51 +0000 |
| commit | 3d362a235f0564dce11c1597e1ea7569db36365b (patch) | |
| tree | c645bb9685ac3c258f08dfdb9aa3a65981547a0a /admin/themes/default | |
| parent | 0e20e01efbeea5f2d54b7d36fafe919051c0dc14 (diff) | |
feature 2810: for duplicates filter, add "date & time" (checked by default) and "width & height" as options.
Change algorithm for a single SQL query with GROUP_CONCAT instead of 2 queries.
git-svn-id: http://piwigo.org/svn/trunk@29244 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes/default')
| -rw-r--r-- | admin/themes/default/template/batch_manager_global.tpl | 8 | ||||
| -rw-r--r-- | admin/themes/default/theme.css | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index 6ee116408..575929674 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -392,6 +392,7 @@ $(document).ready(function() { jQuery("select[name=filter_prefilter]").change(function() { jQuery("#empty_caddie").toggle(jQuery(this).val() == "caddie"); + jQuery("#duplicates_options").toggle(jQuery(this).val() == "duplicates"); }); }); @@ -418,6 +419,13 @@ $(document).ready(function() { {/foreach} </select> <a id="empty_caddie" href="admin.php?page=batch_manager&action=empty_caddie" style="{if !isset($filter.prefilter) or $filter.prefilter ne 'caddie'}display:none{/if}">{'Empty caddie'|translate}</a> + + <span id="duplicates_options" style="{if !isset($filter.prefilter) or $filter.prefilter ne 'duplicates'}display:none{/if}"> + {'based on'|translate} + <input type="checkbox" checked="checked" disabled="disabled"> {'file name'|translate} + <label><input type="checkbox" name="filter_duplicates_date" {if isset($filter.duplicates_date) or (isset($filter.prefilter) and $filter.prefilter ne 'duplicates')}checked="checked"{/if}> {'date & time'|translate}</label> + <label><input type="checkbox" name="filter_duplicates_dimensions" {if isset($filter.duplicates_dimensions)}checked="checked"{/if}> {'width & height'|translate}</label> + </span> </li> <li id="filter_category" {if !isset($filter.category)}style="display:none"{/if}> diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 1dd29258f..262728f29 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -981,6 +981,8 @@ LEGEND { #batchManagerGlobal blockquote {margin:5px 0 20px 15px;} #batchManagerGlobal .ui-slider-horizontal {width:650px;margin:5px 0 10px 0;} +#batchManagerGlobal #duplicates_options label {margin-left:10px;} + #order_filters a.addFilter {font-weight:normal;margin-left:20px;} #order_filters a.removeFilter {font-weight:normal;} #order_filters span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */ |