Changeset 5079

Timestamp:

Mar 7, 2010, 10:09:26 PM (14 years ago)

Author:

Gotcha

Message:

Trunk merge r5076 from bug:1119
bug:1119

Location:

trunk

Files:

• admin/cat_list.php (modified) (1 diff)
• admin/template/goto/cat_list.tpl (modified) (2 diffs)
• language/en_UK/admin.lang.php (modified) (2 diffs)
• language/fr_FR/admin.lang.php (modified) (2 diffs)

trunk/admin/cat_list.php

@@ -133 +133 @@
     );
 }
+// sort categories alpha-numerically reverse
+else if (isset($_POST['submitOrderAlphaNumReverse']))
+{
+  $query = '
+SELECT id, name
+  FROM '.CATEGORIES_TABLE.'
+  WHERE id_uppercat '.
+    (!isset($_GET['parent_id']) ? 'IS NULL' : '= '.$_GET['parent_id']).'
+;';
+  $result = pwg_query($query);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    $categories[ $row['id'] ] = strtolower($row['name']);
+  }
+
+  arsort($categories, SORT_REGULAR);
+  save_categories_order(array_keys($categories));
+
+  array_push(
+    $page['infos'],
+    l10n('Categories ordered alphanumerically reverse')
+    );
+}
 
 // +-----------------------------------------------------------------------+

trunk/admin/template/goto/cat_list.tpl

@@ -42 +42 @@
     <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED}>
     <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED}>
+        <input class="submit" name="submitOrderAlphaNumReverse" type="submit" value="{'Order alphanumerically reverse'|@translate}" {$TAG_INPUT_ENABLED}>
   </p>
   <ul class="categoryUl">
@@ -86 +87 @@
     <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED}>
     <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED}>
+        <input class="submit" name="submitOrderAlphaNumReverse" type="submit" value="{'Order alphanumerically reverse'|@translate}" {$TAG_INPUT_ENABLED}>
   </p>
 

trunk/language/en_UK/admin.lang.php

@@ -67 +67 @@
 $lang['Categories authorized thanks to group associations'] = 'Categories authorized thanks to group associations';
 $lang['Categories manual order was saved'] = 'Categories manual order was saved';
-$lang['Categories ordered alphanumerically'] = 'Categories ordered alphanumerically';
+$lang['Categories ordered alphanumerically'] = 'Categories ascending alphanumerically ordered';
+$lang['Categories ordered alphanumerically reverse'] = 'Categories descending alphanumerically ordered';
 $lang['Category elements associated to the following categories: %s'] = 'Category elements associated to the following categories: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Check for upgrade failed for unknown reasons.';
@@ -132 +133 @@
 $lang['Operating system'] = 'Operating system';
 $lang['Options'] = 'Options';
-$lang['Order alphanumerically'] = 'Order alphanumerically';
+$lang['Order alphanumerically'] = 'Categories sorted in ascending order ⇓';
+$lang['Order alphanumerically inverse'] = 'Categories sorted in descending order ⇑';
 $lang['Other private categories'] = 'Other private categories';
 $lang['Page banner'] = 'Page banner';

trunk/language/fr_FR/admin.lang.php

@@ -67 +67 @@
 $lang['Categories authorized thanks to group associations'] = 'Catégories accessibles grâce à l\'appartenance aux groupes';
 $lang['Categories manual order was saved'] = 'L\'ordre manuel des catégories a été sauvegardé';
-$lang['Categories ordered alphanumerically'] = 'Catégories ordonnées alphabético-numériquement';
+$lang['Categories ordered alphanumerically'] = 'Catégories triées par ordre croissant alphabético-numériquement.';
+$lang['Categories ordered alphanumerically reverse'] = 'Catégories triées par ordre décroissant alphabético-numériquement.';
 $lang['Category elements associated to the following categories: %s'] = 'Les éléments de la catégorie ont été associés aux catégories suivantes : %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'La vérification de la dernière version sur le serveur a échouée pour une raison inconnue.';
@@ -132 +133 @@
 $lang['Operating system'] = 'Système d\'exploitation';
 $lang['Options'] = 'Options';
-$lang['Order alphanumerically'] = 'Ordonner alphabético-numériquement';
+$lang['Order alphanumerically'] = 'Trier par ordre croissant ⇓';
+$lang['Order alphanumerically reverse'] = 'Trier par ordre décroissant ⇑';
 $lang['Other private categories'] = 'Autres catégories privées';
 $lang['Page banner'] = 'Bannière des pages';