Changeset 2517

Timestamp:

Sep 11, 2008, 11:40:00 PM (16 years ago)

Author:

plg

Message:

feature 169 added: ability to manually sort images inside a category. A
dedicated screen let the administrator sort the images (pur HTML, no
JavaScript yet). The "rank" sort order is available only for a category
without flat mode. New database column image_category.rank.

Location:

trunk

Files:

• admin/cat_modify.php (modified) (2 diffs)
• admin/element_set_ranks.php (added)
• admin/template/yoga/admin/cat_modify.tpl (modified) (1 diff)
• admin/template/yoga/admin/element_set_ranks.tpl (added)
• include/config_default.inc.php (modified) (1 diff)
• include/functions_category.inc.php (modified) (2 diffs)
• include/section_init.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• install/db/76-database.php (added)
• install/piwigo_structure.sql (modified) (1 diff)
• template/yoga/icon/ranks.png (added)

trunk/admin/cat_modify.php

@@ -275 +275 @@
 if ($category['has_images'])
 {
-  $template->assign( 'U_MANAGE_ELEMENTS',
-        $base_url.'element_set&cat='.$category['id']
+  $template->assign(
+    'U_MANAGE_ELEMENTS',
+    $base_url.'element_set&cat='.$category['id']
+    );
+  $template->assign(
+    'U_MANAGE_RANKS',
+    $base_url.'element_set_ranks&cat_id='.$category['id']
     );
 }
@@ -314 +319 @@
   'file' => l10n('File name'),
   'id' => 'Id',
+  'rank' => l10n('Rank'),
   );
 

trunk/admin/template/yoga/admin/cat_modify.tpl

@@ -10 +10 @@
   {if isset($U_MANAGE_ELEMENTS) }
   <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
+  <li><a href="{$U_MANAGE_RANKS}" title="{'manage element ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}" /></a></li>
   {/if}
   <li><a href="{$U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}" /></a></li>

trunk/include/config_default.inc.php

@@ -63 +63 @@
 //    the date_available
 $conf['order_by'] = ' ORDER BY date_available DESC, file ASC, id ASC';
+
+// order_by_inside_category : inside a category, images can also be ordered
+// by rank. A manually defined rank on each image for the category.
+//
+// In addition to fields of #images table, you can use the
+// #image_category.rank column
+//
+// $conf['order_by_inside_category'] = ' ORDER BY rank';
+// will sort images by the manually defined rank of images in this category.
+$conf['order_by_inside_category'] = $conf['order_by'];
 
 // file_ext : file extensions (case sensitive) authorized

trunk/include/functions_category.inc.php

@@ -258 +258 @@
 function get_category_preferred_image_orders()
 {
-  global $conf;
+  global $conf, $page;
+  
   return array(
     array(l10n('default_sort'), '', true),
@@ -265 +266 @@
     array(l10n('Creation date'), 'date_creation DESC', true),
     array(l10n('Post date'), 'date_available DESC', true),
-    array(l10n('File name'), 'file ASC', true)
-  );
+    array(l10n('File name'), 'file ASC', true),
+    array(
+      l10n('Rank'),
+      'rank ASC',
+      ('categories' == $page['section'] and !isset($page['flat']))
+      )
+    );
 }
 

trunk/include/section_init.inc.php

@@ -173 +173 @@
 $page['nb_image_page'] = $user['nb_image_page'];
 
+// if flat mode is active, we must consider the image set as a standard set
+// and not as a category set because we can't use the #image_category.rank :
+// displayed images are not directly linked to the displayed category
+if ('categories' == $page['section'] and !isset($page['flat']))
+{
+  $conf['order_by'] = $conf['order_by_inside_category'];
+}
+
 if (pwg_get_session_var('image_order',0) > 0)
 {
+  $image_order_id = pwg_get_session_var('image_order');
+  
   $orders = get_category_preferred_image_orders();
 
-  $conf['order_by'] = str_replace(
-    'ORDER BY ',
-    'ORDER BY '.$orders[ pwg_get_session_var('image_order',0) ][1].',',
-    $conf['order_by']
+  // the current session stored image_order might be not compatible with
+  // current image set, for example if the current image_order is the rank
+  // and that we are displaying images related to a tag.
+  //
+  // In case of incompatibility, the session stored image_order is removed.
+  if ($orders[$image_order_id][2])
+  {
+    $conf['order_by'] = str_replace(
+      'ORDER BY ',
+      'ORDER BY '.$orders[$image_order_id][1].',',
+      $conf['order_by']
     );
-  $page['super_order_by'] = true;
+    $page['super_order_by'] = true;
+
+  }
+  else
+  {
+    pwg_unset_session_var('image_order');
+    $page['super_order_by'] = false;
+  }
 }
 

trunk/index.php

@@ -261 +261 @@
 
   $orders = get_category_preferred_image_orders();
-  for ($i = 0; $i < count($orders); $i++)
-  {
-    if ($orders[$i][2])
+  foreach ($orders as $order_id => $order)
+  {
+    if ($order[2])
     {
       $template->append(
         'image_orders',
         array(
-          'DISPLAY' => $orders[$i][0],
-          'URL' => add_url_params( duplicate_index_url(), array('image_order'=>$i) ),
-          'SELECTED' => ($order_idx==$i ? true:false),
+          'DISPLAY' => $order[0],
+          'URL' => add_url_params(
+            duplicate_index_url(),
+            array('image_order' => $order_id)
+            ),
+          'SELECTED' => ($order_idx == $order_id ? true:false),
           )
         );

trunk/install/piwigo_structure.sql

@@ -151 +151 @@
   `image_id` mediumint(8) unsigned NOT NULL default '0',
   `category_id` smallint(5) unsigned NOT NULL default '0',
+  `rank` mediumint(8) unsigned default NULL,
   PRIMARY KEY  (`image_id`,`category_id`),
   KEY `image_category_i1` (`category_id`)