feature:2317 move order config to Admin->Config->Options

first try, may has issues with very specials params

git-svn-id: http://piwigo.org/svn/trunk@11279 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 43 insertions, 5 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 4457cdecb..1a06d530b 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -150,6 +150,7 @@ $lang['Apply to sub-albums'] = "Apply to sub-albums";
 $lang['Are you sure to install this upgrade? You must verify if this version does not need uninstallation.'] = "Are you sure you want to install this upgrade? You must verify if this version does not need prior uninstallation.";
 $lang['Are you sure you want to delete this plugin?'] = "Are you sure you want to delete this plugin?";
 $lang['Are you sure you want to install this plugin?'] = "Are you sure you want to install this plugin?";
+$lang['As default order'] = "As default order";
 $lang['Associate to album'] = "Associate to album";
 $lang['associate to group'] = "associate to group";
 $lang['Associated'] = "Associated";
@@ -202,6 +203,7 @@ $lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Cr
 $lang['Create this site'] = "Create this site";
 $lang['created'] = "created";
 $lang['Current name'] = "Current name";
+$lang['Custom'] = "Custom";
 $lang['Database synchronization with files'] = "Database synchronization with files";
 $lang['Database'] = "Database";
 $lang['Date'] = "Date";
@@ -209,6 +211,8 @@ $lang['Day'] = "Day";
 $lang['Deactivate'] = "Deactivate";
 $lang['Deactivate all'] = "Deactivate all";
 $lang['Default display'] = "Default display";
+$lang['Default photos order'] = "Default photos order";
+$lang['Default photos order inside album'] = "Default photos order inside album";
 $lang['Default user cannot be deleted'] = "Default user cannot be deleted";
 $lang['Default user does not exist'] = "The default user does not exist";
 $lang['default values'] = "default values";
@@ -358,6 +362,7 @@ $lang['Install'] = "Install";
 $lang['Installed Languages'] = 'Installed Languages';
 $lang['Installed Themes'] = "Installed Themes";
 $lang['Instructions to use Piwigo'] = "Instructions to use Piwigo";
+$lang['Invalid order string'] = 'Invalid order string';
 $lang['Invert'] = 'Invert';
 $lang['IP'] = "IP";
 $lang['JPEG files or ZIP archives with JPEG files inside please.'] = 'JPEG files or ZIP archives with JPEG files inside please.';
diff --git a/language/en_UK/help/configuration.html b/language/en_UK/help/configuration.html
index 7fb8d537d..a2a913627 100644
--- a/language/en_UK/help/configuration.html
+++ b/language/en_UK/help/configuration.html
@@ -33,6 +33,20 @@ page.</li>
   <li><strong>Mail address is mandatory for all users</strong>: mail address will be checked on registration or profile update, except if the action is done by an administrator.</li>
 
   <li><strong>Email admins when a new user registers</strong>: administrators will be notified by mail for each registration.</li>
+  
+  <li><strong>Default photos order</strong>: You can define a personalized order by selecting &laquo;Personalized&raquo; in the drop-down menu. This field must respect the SQL syntax, example: <i>date_available DESC, file ASC, id ASC</i><br>
+    Available fields:
+    <ul style="font-size:0.85em;">
+      <li><b>date_available</b>: date of the adding to the gallery</li>
+      <li><b>file</b>: name of the file</li>
+      <li><b>id</b>: identifier</li>
+      <li><b>date_creation</b>: date of element creation</li>
+      <li><b>name</b>: name of the picture</li>
+      <li><b>hit</b>: number of visits</li>
+      <li><b>average_rate</b>: average rate on the picture</li>
+    </ul>
+    Don't forgot to specify the order for each field with these keywords : <i>ASC</i> and <i>DESC</i>
+  </li>
 
 </ul>
 
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index edc122917..b551498ca 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -842,9 +842,14 @@ $lang['Height'] = 'Hauteur';
 $lang['Follow Orientation'] = "Respecter l'orientation";
 $lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'Si vous voulez régénérer des miniatures, merci de vous rendre dans la <a href="%s">Gestion par lot</a>.';
 $lang['Graphics Library'] = 'Bibliothèque graphique';
-$lang['Show menubar'] = "Afficher le menu";
-$lang['No results'] = "Pas de résultat";
-$lang['Type in a search term'] = "Entrez un terme de recherche";
-$lang['Searching...'] = "Recherche...";
-$lang['new'] = "nouveau";
+$lang['Show menubar'] = 'Afficher le menu';
+$lang['No results'] = 'Pas de résultat';
+$lang['Type in a search term'] = 'Entrez un terme de recherche';
+$lang['Searching...'] = 'Recherche...';
+$lang['new'] = 'nouveau';
+$lang['Default photos order'] = "Ordre par défaut des photos";
+$lang['Default photos order inside album'] = "Ordre par défaut des photos dans un album";
+$lang['Invalid order string'] = 'Chaîne SQL incorrecte';
+$lang['As default order'] = "Comme l'ordre par défaut";
+$lang['Custom'] = "Personnalisé";
 ?>
\ No newline at end of file
diff --git a/language/fr_FR/help/configuration.html b/language/fr_FR/help/configuration.html
index 45c29066a..e5c7a8eb3 100644
--- a/language/fr_FR/help/configuration.html
+++ b/language/fr_FR/help/configuration.html
@@ -33,6 +33,20 @@ galerie.</li>
   <li><strong>L'adresse mail est obligatoire pour tous les utilisateurs</strong>: L'adresse mail sera vérifié lors des inscriptions ou de la mise à jour des profils sauf si l'action est effectuée dans la partie administration.</li>
 
   <li><strong>Notifier les administrateurs lors de l'inscription d'un utilisateur</strong>: Les administrateurs recevront un courriel à chaque inscription.</li>
+  
+  <li><strong>Ordre par défaut des photos</strong>: Vous pouvez définir un ordre personnalisé et selectionant &laquo;Personnalisé&raquo; dans la liste déroulante. Ce champ doit respecter la syntaxe SQL, exemple: <i>date_available DESC, file ASC, id ASC</i><br>
+    Liste des champs utilisables :
+    <ul style="font-size:0.85em;">
+      <li><b>date_available</b>: date d'ajout à la galerie</li>
+      <li><b>file</b>: nom du fichier</li>
+      <li><b>id</b>: identifiant</li>
+      <li><b>date_creation</b>: date de création</li>
+      <li><b>name</b>: nom de l'image</li>
+      <li><b>hit</b>: nombre de visites</li>
+      <li><b>average_rate</b>: note globale</li>
+    </ul>
+    N'oubliez pas pour chaque champ de spécifier l'ordre avec les mots clefs <i>ASC</i> et <i>DESC</i>
+  </li>
 
 </ul>