Changeset 11279 for trunk

Timestamp:

Jun 9, 2011, 4:32:20 PM (13 years ago)

Author:

mistic100

Message:

feature:2317 move order config to Admin->Config->Options
first try, may has issues with very specials params

Location:

trunk

Files:

• admin/configuration.php (modified) (4 diffs)
• admin/themes/default/template/configuration.tpl (modified) (1 diff)
• install/config.sql (modified) (1 diff)
• install/db/106-database.php (added)
• language/en_UK/admin.lang.php (modified) (4 diffs)
• language/en_UK/help/configuration.html (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)
• language/fr_FR/help/configuration.html (modified) (1 diff)

trunk/admin/configuration.php

@@ -101 +101 @@
     'privacy_level',
   );
+  
+$order_options = array(
+    ' ORDER BY date_available DESC, file ASC, id ASC' => 'date_available DESC, file ASC, id ASC',
+    ' ORDER BY file DESC, date_available DESC' => 'file DESC, date_available DESC',
+    'custom' => l10n('Custom'),
+  );
 
 //------------------------------ verification and registration of modifications
@@ -111 +117 @@
     case 'main' :
     {
+      $order_regex = '#^(( *)(id|file|name|date_available|date_creation|hit|average_rate|comment|author|filesize|width|height|high_filesize|high_width|high_height) (ASC|DESC),{1}){1,}$#';
+      // process 'order_by_perso' string
+      if ($_POST['order_by'] == 'custom' AND !empty($_POST['order_by_perso']))
+      {
+        $_POST['order_by'] = str_ireplace(
+          array('order by ', 'asc', 'desc'),
+          array(null, 'ASC', 'DESC'),
+          trim($_POST['order_by_perso'])
+          );
+        
+        if (preg_match($order_regex, $_POST['order_by'].','))
+        {
+          $_POST['order_by'] = ' ORDER BY '.$_POST['order_by'];
+        }
+        else
+        {
+          array_push($page['errors'], l10n('Invalid order string').' « '.$_POST['order_by'].' »');
+        }
+      }
+      else if ($_POST['order_by'] == 'custom')
+      {
+        array_push($page['errors'], l10n('Invalid order string'));
+      }
+      // process 'order_by_inside_category_perso' string
+      if ($_POST['order_by_inside_category'] == 'as_order_by')
+      {
+        $_POST['order_by_inside_category'] = $_POST['order_by'];
+      }
+      else if ($_POST['order_by_inside_category'] == 'custom' AND !empty($_POST['order_by_inside_category_perso']))
+      {
+        $_POST['order_by_inside_category'] = str_ireplace(
+          array('order by ', 'asc', 'desc'),
+          array(null, 'ASC', 'DESC'),
+          trim($_POST['order_by_inside_category_perso'])
+          );
+        
+        if (preg_match($order_regex, $_POST['order_by_inside_category'].','))
+        {
+          $_POST['order_by_inside_category'] = ' ORDER BY '.$_POST['order_by_inside_category'];
+        }
+        else
+        {
+          array_push($page['errors'], l10n('Invalid order string').' « '.$_POST['order_by_inside_category'].' »');
+        }
+      }
+      else if ($_POST['order_by_inside_category'] == 'custom')
+      {
+        array_push($page['errors'], l10n('Invalid order string'));
+      }
+      
       if (empty($_POST['gallery_locked']) and $conf['gallery_locked'])
       {
@@ -235 +291 @@
   case 'main' :
   {
+    // process 'order_by' string
+    if (array_key_exists($conf['order_by'], $order_options))
+    {
+      $order_by_selected = $conf['order_by'];
+      $order_by_perso = null;
+    }
+    else
+    {
+      $order_by_selected = 'custom';
+      $order_by_perso = str_replace(' ORDER BY ', null, $conf['order_by']);
+    }
+    // process 'order_by_inside_category' string
+    if ($conf['order_by_inside_category'] == $conf['order_by'])
+    {
+      $order_by_inside_category_selected = 'as_order_by';
+      $order_by_inside_category_perso = null;
+    }
+    else if (array_key_exists($conf['order_by_inside_category'], $order_options))
+    {
+      $order_by_inside_category_selected = $conf['order_by_inside_category'];
+      $order_by_inside_category_perso = null;
+    }
+    else
+    {
+      $order_by_inside_category_selected = 'custom';
+      $order_by_inside_category_perso = str_replace(' ORDER BY ', null, $conf['order_by_inside_category']);
+    }
+     
     $template->assign(
       'main',
@@ -246 +330 @@
           ),
         'week_starts_on_options_selected' => $conf['week_starts_on'],
+        'order_by_options' => $order_options,
+        'order_by_selected' => $order_by_selected,
+        'order_by_perso' => $order_by_perso,
+        'order_by_inside_category_options' => 
+          array_merge(
+            array('as_order_by'=>l10n('As default order')), 
+            $order_options
+            ),
+        'order_by_inside_category_selected' => $order_by_inside_category_selected,
+        'order_by_inside_category_perso' => $order_by_inside_category_perso,
         ));
 

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

@@ -90 +90 @@
 
     <li>
-      <label>
-        <span class="property">
-          {'Week starts on'|@translate}
-          {html_options name="week_starts_on" options=$main.week_starts_on_options selected=$main.week_starts_on_options_selected}
-        </span>
-      </label>
-    </li>
+      &nbsp;
+      <span class="property">
+        {'Week starts on'|@translate}
+        {html_options name="week_starts_on" options=$main.week_starts_on_options selected=$main.week_starts_on_options_selected}
+      </span>
+    </li>
+    
+    <li>
+      &nbsp;
+      <span class="property">
+        {'Default photos order'|@translate}
+        {html_options name="order_by" options=$main.order_by_options selected=$main.order_by_selected}
+        <input type="text" name="order_by_perso" size="40" value="{$main.order_by_perso}" 
+            {if $main.order_by_selected != 'custom'}style="display:none;"{/if}/>
+      </span>
+    </li>
+    <li>
+      &nbsp;
+      <span class="property">
+        {'Default photos order inside album'|@translate}
+        {html_options name="order_by_inside_category" options=$main.order_by_inside_category_options selected=$main.order_by_inside_category_selected}
+        <input type="text" name="order_by_inside_category_perso" size="40" value="{$main.order_by_inside_category_perso}" 
+            {if $main.order_by_inside_category_selected != 'custom'}style="display:none;"{/if}>
+      </span>
+    </li>
+    
+{footer_script require='jquery'}{literal}
+jQuery(document).ready(function () {
+  $('select[name="order_by"]').change(function () {
+    if ($(this).val() == 'custom') {
+      $('input[name="order_by_perso"]').show();
+    } else {
+      $('input[name="order_by_perso"]').hide();
+    }
+  });
+  $('select[name="order_by_inside_category"]').change(function () {
+    if ($(this).val() == 'custom') {
+      $('input[name="order_by_inside_category_perso"]').show();
+    } else {
+      $('input[name="order_by_inside_category_perso"]').hide();
+    }
+  });
+});
+{/literal}{/footer_script}
   </ul>
 </fieldset>

trunk/install/config.sql

@@ -52 +52 @@
 INSERT INTO piwigo_config (param,value,comment) VALUES ('week_starts_on','monday','Monday may not be the first day of the week');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('updates_ignored','a:3:{s:7:"plugins";a:0:{}s:6:"themes";a:0:{}s:9:"languages";a:0:{}}','Extensions ignored for update');
+INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by',' ORDER BY date_available DESC, file ASC, id ASC','default photo order');
+INSERT INTO piwigo_config (param,value,comment) VALUES ('order_by_inside_category',' ORDER BY date_available DESC, file ASC, id ASC','default photo order inside category');
 INSERT INTO piwigo_config (param,value) VALUES ('upload_form_websize_resize','true');
 INSERT INTO piwigo_config (param,value) VALUES ('upload_form_websize_maxwidth','800');

trunk/language/en_UK/admin.lang.php

@@ -151 +151 @@
 $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";
@@ -203 +204 @@
 $lang['created'] = "created";
 $lang['Current name'] = "Current name";
+$lang['Custom'] = "Custom";
 $lang['Database synchronization with files'] = "Database synchronization with files";
 $lang['Database'] = "Database";
@@ -210 +212 @@
 $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";
@@ -359 +363 @@
 $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";

trunk/language/en_UK/help/configuration.html

@@ -34 +34 @@
 
   <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>

trunk/language/fr_FR/admin.lang.php

@@ -843 +843 @@
 $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é";
 ?>

trunk/language/fr_FR/help/configuration.html

@@ -34 +34 @@
 
   <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>