Changeset 23318 for extensions/BatchDownloader/admin

Timestamp:

Jun 18, 2013, 3:38:03 AM (11 years ago)

Author:

mistic100

Message:

it's late! some corrections, code cleaning & filter by size on admin page

Location:

extensions/BatchDownloader/admin

Files:

• sets.php (modified) (4 diffs)
• template/sets.tpl (modified) (3 diffs)
• template/style.css (modified) (1 diff)

extensions/BatchDownloader/admin/sets.php

@@ -64 +64 @@
   }
   
-  $order_by = $_POST['order_by'].' '.$_POST['direction'];
+  if ($_POST['size'] != -1)
+  {
+    array_push($where_clauses, 'size = "'.$_POST['size'].'"');
+  }
+  
+  if ($_POST['order_by'] == 'size')
+  {
+    $order_by = 'FIND_IN_SET(size, "square,thumb,2small,xsmall,small,medium,large,xlarge,xxlarge,original") '.$_POST['direction'];
+  }
+  else
+  {
+    $order_by = $_POST['order_by'].' '.$_POST['direction'];
+  }
 }
 
@@ -122 +134 @@
   );
 
+$page['size_items'] = array(
+  -1 => '------------',
+  );
+foreach (ImageStdParams::get_defined_type_map() as $params)
+{
+  $page['size_items'][ $params->type ] = l10n($params->type);
+}
+$page['size_items']['original'] = l10n('Original');
+
 $page['order_by_items'] = array(
   'date_creation' => l10n('Creation date'),
@@ -127 +148 @@
   'nb_images' => l10n('Number of images'),
   'nb_archives' => l10n('Number of archives'),
+  'size' => l10n('Photo sizes'),
   );
 
@@ -139 +161 @@
   'type_options' => $page['type_items'],
   'type_selected' => isset($_POST['type']) ? $_POST['type'] : '',
+  'size_options' => $page['size_items'],
+  'size_selected' => isset($_POST['size']) ? $_POST['size'] : '',
   'order_options' => $page['order_by_items'],
   'order_selected' => isset($_POST['order_by']) ? $_POST['order_by'] : '',

extensions/BatchDownloader/admin/template/sets.tpl

@@ -17 +17 @@
     {'Set type'|@translate}
     {html_options name=type options=$type_options selected=$type_selected}
+  </label>
+  
+  <label>
+    {'Photo sizes'|@translate}
+    {html_options name=size options=$size_options selected=$size_selected}
   </label>
   
@@ -49 +54 @@
       <td class="type">{'Set type'|@translate}</td>
       <td class="date">{'Creation date'|@translate}</td>
-      <td class="size">{'Total size'|@translate}</td>
+      <td class="img_size">{'Photo sizes'|@translate}</td>
       <td class="images">{'Number of images'|@translate}</td>
       <td class="archives">{'Number of archives'|@translate}</td>
+      <td class="size">{'Total size'|@translate}</td>
       <td class="status">{'Status'|@translate}</td>
       <td class="action">{'Actions'|@translate}</td>
@@ -62 +68 @@
     <td>{$set.NAME}</td>
     <td style="text-align:center;">{$set.DATE_CREATION}</td>
-    <td>{$set.TOTAL_SIZE}</td>
+    <td>{if $set.SIZE=='original'}{'Original'|@translate}{else}{$set.SIZE|@translate}{/if}</td>
     <td>{$set.NB_IMAGES}</td>
     <td>{$set.NB_ARCHIVES}</td>
+    <td>{$set.TOTAL_SIZE}</td>
     <td>
       {$set.STATUS|@translate}

extensions/BatchDownloader/admin/template/style.css

@@ -38 +38 @@
   width:100px;
 }
+.table2 .img_size {
+  width:120px;
+}
 .table2 .images {
   width:100px;