Feature 1533: Change "General" by "Options" in Configuration menu.

Change "Default Display" tab by "Guest Settings" tab.
Add display tab in Configuration/Option menu.

Allow to activate/deactivate a lot of display features:

On main page:
# Display only recently posted images
# Sort order
# Display all elements in all sub-categories
# Display a calendar by posted date
# Display a calendar by creation date
# Slideshow

On photo page:
# Show file metadata
# slideshow
# Add this image to your favorites
# Navigation Bar
# Navigation Thumbnails

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

4 files changed, 140 insertions, 7 deletions

diff --git a/admin/configuration.php b/admin/configuration.php
index 433397554..b8dc57433 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -75,6 +75,20 @@ $comments_checkboxes = array(
     'email_admin_on_comment_deletion'
   );
 
+$display_checkboxes = array(
+    'menubar_filter_icon',
+    'index_sort_order_input',
+    'index_flat_icon',
+    'index_posted_date_icon',
+    'index_created_date_icon',
+    'index_slideshow_icon',
+    'picture_metadata_icon',
+    'picture_slideshow_icon',
+    'picture_favorite_icon',
+    'picture_navigation_icons',
+    'picture_navigation_thumb',
+  );
+
 //------------------------------ verification and registration of modifications
 if (isset($_POST['submit']) and !is_adviser())
 {
@@ -131,6 +145,14 @@ if (isset($_POST['submit']) and !is_adviser())
       // Never go here
       break;
     }
+    case 'display' :
+    {
+      foreach( $display_checkboxes as $checkbox)
+      {
+        $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
+      }
+      break;
+    }
   }
 
   // updating configuration if no error found
@@ -174,10 +196,11 @@ $template->set_filename('config', 'configuration.tpl');
 $tabsheet = new tabsheet();
 // TabSheet initialization
 $tabsheet->add('main', l10n('Main'), $conf_link.'main');
+$tabsheet->add('display', l10n('Display'), $conf_link.'display');
 $tabsheet->add('history', l10n('History'), $conf_link.'history');
 $tabsheet->add('comments', l10n('Comments'), $conf_link.'comments');
 $tabsheet->add('upload', l10n('Upload'), $conf_link.'upload');
-$tabsheet->add('default', l10n('Default display'), $conf_link.'default');
+$tabsheet->add('default', l10n('Guest Settings'), $conf_link.'default');
 // TabSheet selection
 $tabsheet->select($page['section']);
 // Assign tabsheet to template
@@ -298,6 +321,20 @@ switch ($page['section'])
     $template->assign('default', array());
     break;
   }
+  case 'display' :
+  {
+    foreach ($display_checkboxes as $checkbox)
+    {
+      $template->append(
+          'display',
+          array(
+            $checkbox => $conf[$checkbox]
+            ),
+          true
+        );
+    }
+    break;
+  }
 }
 
 //----------------------------------------------------------- sending html code
diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
index 499e11e20..aa9f4fae1 100644
--- a/admin/themes/default/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -126,14 +126,18 @@ FORM#categoryPermissions LI {
 FIELDSET#mainConfCheck SPAN.property,
 FIELDSET#historyConf SPAN.property,
 FIELDSET#commentsConf SPAN.property,
-FIELDSET#uploadConf SPAN.property {
+FIELDSET#uploadConf SPAN.property,
+FIELDSET#indexDisplayConf SPAN.property,
+FIELDSET#pictureDisplayConf SPAN.property {
 	float: right;
 	text-align: left;
 }
 FIELDSET#mainConfCheck INPUT,
 FIELDSET#historyConf INPUT,
 FIELDSET#commentsConf INPUT,
-FIELDSET#uploadConf INPUT {
+FIELDSET#uploadConf INPUT,
+FIELDSET#indexDisplayConf INPUT,
+FIELDSET#pictureDisplayConf INPUT {
 	float: none;
 }
 
@@ -145,12 +149,16 @@ FIELDSET#mainConf TEXTAREA.description {
 }
 
 FIELDSET#mainConfCheck SPAN.property,
-FIELDSET#historyConf SPAN.property {
+FIELDSET#historyConf SPAN.property,
+FIELDSET#indexDisplayConf SPAN.property,
+FIELDSET#pictureDisplayConf SPAN.property {
 	width: 90%;
 }
 FIELDSET#mainConfCheck INPUT,
 FIELDSET#historyConf INPUT,
-FIELDSET#commentsConf INPUT {
+FIELDSET#commentsConf INPUT,
+FIELDSET#indexDisplayConf INPUT,
+FIELDSET#pictureDisplayConf INPUT {
 	margin-left: 5%;
 }
 FIELDSET#uploadConf SELECT {
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index dca3cda6c..23da23182 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -81,8 +81,7 @@ jQuery().ready(function(){ldelim}
     <dt class="rdion"><span>{'Configuration'|@translate}&nbsp;</span></dt>
     <dd>
       <ul>
-        <li><a href="{$U_CONFIG_GENERAL}">{'General'|@translate}</a></li>
-        <li><a href="{$U_CONFIG_DISPLAY}">{'Default display'|@translate}</a></li>
+        <li><a href="{$U_CONFIG_GENERAL}">{'Options'|@translate}</a></li>
         <li><a href="{$U_CONFIG_MENUBAR}">{'Menu'|@translate}</a></li>
         <li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
         <li><a href="{$U_CONFIG_THEMES}">{'Themes'|@translate}</a></li>
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 9d7e3008d..82b80f8c3 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -202,6 +202,95 @@
 {$PROFILE_CONTENT}
 {/if}
 
+{if isset($display)}
+<fieldset id="indexDisplayConf">
+  <legend>{'Main Page'|@translate}</legend>
+  <ul>
+    <li>
+      <label>
+        <span class="property">{'display only recently posted images'|@translate|@ucfirst}</span>
+        <input type="checkbox" name="menubar_filter_icon" {if ($display.menubar_filter_icon)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'Sort order'|@translate}</span>
+        <input type="checkbox" name="index_sort_order_input" {if ($display.index_sort_order_input)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'display all elements in all sub-categories'|@translate|@ucfirst}</span>
+        <input type="checkbox" name="index_flat_icon" {if ($display.index_flat_icon)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'display a calendar by posted date'|@translate|@ucfirst}</span>
+        <input type="checkbox" name="index_posted_date_icon" {if ($display.index_posted_date_icon)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'display a calendar by creation date'|@translate|@ucfirst}</span>
+        <input type="checkbox" name="index_created_date_icon" {if ($display.index_created_date_icon)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'slideshow'|@translate|@ucfirst}</span>
+        <input type="checkbox" name="index_slideshow_icon" {if ($display.index_slideshow_icon)}checked="checked"{/if}>
+      </label>
+    </li>
+  </ul>
+</fieldset>
+
+<fieldset id="pictureDisplayConf">
+  <legend>{'Photo Page'|@translate}</legend>
+  <ul>
+    <li>
+      <label>
+        <span class="property">{'Show file metadata'|@translate}</span>
+        <input type="checkbox" name="picture_metadata_icon" {if ($display.picture_metadata_icon)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'slideshow'|@translate}</span>
+        <input type="checkbox" name="picture_slideshow_icon" {if ($display.picture_slideshow_icon)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'add this image to your favorites'|@translate|@ucfirst}</span>
+        <input type="checkbox" name="picture_favorite_icon" {if ($display.picture_favorite_icon)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'Navigation Bar'|@translate|@ucfirst}</span>
+        <input type="checkbox" name="picture_navigation_icons" {if ($display.picture_navigation_icons)}checked="checked"{/if}>
+      </label>
+    </li>
+
+    <li>
+      <label>
+        <span class="property">{'Navigation Thumbnails'|@translate|@ucfirst}</span>
+        <input type="checkbox" name="picture_navigation_thumb" {if ($display.picture_navigation_thumb)}checked="checked"{/if}>
+      </label>
+    </li>
+  </ul>
+</fieldset>
+{/if}
+
 {if !isset($default)}
   <p>
     <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>