Changeset 29244 for trunk/admin/themes/default

Timestamp:

Aug 22, 2014, 10:56:51 AM (10 years ago)

Author:

plg

Message:

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.

Location:

trunk/admin/themes/default

Files:

• template/batch_manager_global.tpl (modified) (2 diffs)
• theme.css (modified) (1 diff)

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

@@ -393 +393 @@
   jQuery("select[name=filter_prefilter]").change(function() {
     jQuery("#empty_caddie").toggle(jQuery(this).val() == "caddie");
+    jQuery("#duplicates_options").toggle(jQuery(this).val() == "duplicates");
   });
 });
@@ -419 +420 @@
         </select>
         <a id="empty_caddie" href="admin.php?page=batch_manager&amp;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>
 

trunk/admin/themes/default/theme.css

@@ -982 +982 @@
 #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;}