Changeset 19121

Timestamp:

Nov 21, 2012, 3:28:55 PM (11 years ago)

Author:

mistic100

Message:

feature:2718 Add batch manager filters for photo dimensions, small cleaning in the code

Location:

trunk/admin

Files:

• batch_manager.php (modified) (7 diffs)
• themes/default/template/batch_manager_global.tpl (modified) (3 diffs)

trunk/admin/batch_manager.php

@@ -371 +371 @@
   if (isset($_SESSION['bulk_manager_filter']['dimension']['max_ratio']))
   {
-    $where_clause[] = 'width/height <= '.sprintf('%.2f99', $_SESSION['bulk_manager_filter']['dimension']['max_ratio']);
+    // max_ratio is a floor value, so must be a bit increased
+    $where_clause[] = 'width/height < '.($_SESSION['bulk_manager_filter']['dimension']['max_ratio']+0.01);
   }
   
@@ -447 +448 @@
 $ratios = array();
 
+// get all width, height and ratios
 $query = '
 SELECT
@@ -455 +457 @@
 ;';
 $result = pwg_query($query);
+
 while ($row = pwg_db_fetch_assoc($result))
 {
@@ -474 +477 @@
 $dimensions['heights'] = implode(',', $heights);
 $dimensions['ratios'] = implode(',', $ratios);
-
-$dimensions['bounds'] = pwg_db_fetch_assoc(pwg_query($query));
 
 $dimensions['bounds'] = array(
@@ -486 +487 @@
   );
 
+// find ratio categories
 $ratio_categories = array(
   'portrait' => array(),
@@ -499 +501 @@
     $ratio_categories['portrait'][] = $ratio;
   }
-
-  if ($ratio >= 0.95 and $ratio < 1.05)
+  else if ($ratio >= 0.95 and $ratio <= 1.05)
   {
     $ratio_categories['square'][] = $ratio;
   }
-
-  if ($ratio > 1.05 and $ratio <= 2.5)
+  else if ($ratio > 1.05 and $ratio < 2)
   {
     $ratio_categories['landscape'][] = $ratio;
   }
-
-  if ($ratio > 2.5)
+  else if ($ratio >= 2)
   {
     $ratio_categories['panorama'][] = $ratio;
@@ -527 +526 @@
 }
 
+// selected=bound if nothing selected
 foreach (array_keys($dimensions['bounds']) as $type)
 {

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

@@ -490 +490 @@
   /* dimensions sliders */
   /**
-   * find the key from a value in the startStopValues array, for the hour slider
+   * find the key from a value in the startStopValues array
    */
   function getSliderKeyFromValue(value, values) {
@@ -604 +604 @@
     var max = jQuery(this).data("max");
 
-    $("#filter_dimension_"+ type +"_slider").slider(
-      "values",
-      0,
+    $("#filter_dimension_"+ type +"_slider").slider("values", 0,
       getSliderKeyFromValue(min, dimension_values[type])
     );
 
-    $("#filter_dimension_"+type+"_slider").slider("values", 1, getSliderKeyFromValue(max, dimension_values[type]));
+    $("#filter_dimension_"+type+"_slider").slider("values", 1, 
+      getSliderKeyFromValue(max, dimension_values[type])
+    );
   });
 });
@@ -686 +686 @@
           
           {'Ratio'|@translate} ({'Width'|@translate}/{'Height'|@translate}) <span id="filter_dimension_ratio_info">{'between %.2f and %.2f'|@translate|sprintf:$dimensions.selected.min_ratio:$dimensions.selected.max_ratio}</span>
-{if isset($dimensions.ratio_portrait.min)}
+{if isset($dimensions.ratio_portrait)}
           | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_portrait.min}" data-max="{$dimensions.ratio_portrait.max}">{'Portrait'|@translate}</a>
 {/if}
-{if isset($dimensions.ratio_square.min)}
+{if isset($dimensions.ratio_square)}
           | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_square.min}" data-max="{$dimensions.ratio_square.max}">{'square'|@translate}</a>
 {/if}
-{if isset($dimensions.ratio_landscape.min)}
+{if isset($dimensions.ratio_landscape)}
           | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_landscape.min}" data-max="{$dimensions.ratio_landscape.max}">{'Landscape'|@translate}</a>
 {/if}
-{if isset($dimensions.ratio_panorama.min)}
+{if isset($dimensions.ratio_panorama)}
           | <a class="dimensions-choice" data-type="ratio" data-min="{$dimensions.ratio_panorama.min}" data-max="{$dimensions.ratio_panorama.max}">{'Panorama'|@translate}</a>
 {/if}