New: jQuery and Accordion Admin menus

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

3 files changed, 8 insertions, 25 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index a22e4e7f6..7a2fcdea8 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -593,26 +593,14 @@ $conf['recent_post_dates'] = array(
   );
 
 // +-----------------------------------------------------------------------+
-// | Set default admin layout                                              |
+// | Set admin layout                                                      |
 // +-----------------------------------------------------------------------+
 
-// Must be user setable in future
-// Default value of admin layout
-// Step 1, default_admin_layout is not defined
-//        null value, user_layout is used for admin layout
-//        defined value, this value are used for admin layout
-// Next on step 2, default_admin_layout will be used
-//                 if there are not checked like admin layout
-// stored on user informations
-//$conf['default_admin_layout']='yoga/dark';
+$conf['admin_layout'] = 'yoga/admin';
 
 // should we load the active plugins ? true=Yes, false=No
 $conf['enable_plugins']=true;
 
-// +-----------------------------------------------------------------------+
-// | Set default for Web Service                                           |
-// +-----------------------------------------------------------------------+
-
 // Web services are allowed (true) or completely forbidden (false)
 $conf['allow_web_services'] = true;
 
@@ -624,20 +612,18 @@ $conf['ws_max_images_per_page'] = 500;
 // if connected on member authorization basis
 $conf['ws_access_control'] = false;
 
-// On Access control true
 // Additionnal controls are made based on Web Service Access Table
-
 // Max returned rows number ( > 0 )
-  $conf['ws_allowed_limit'] = array(1,2,3,5,10,25);
+$conf['ws_allowed_limit'] = array(1,2,3,5,10,25);
 
 // By default can be delayed by 0, 1, 2, 3, 5, 7, 14 or 30 days
 // 0 it's Now(), don't remove that one
-  $conf['ws_postponed_start'] = array(0,1,2,3,5,7,14,30); /* In days */
+$conf['ws_postponed_start'] = array(0,1,2,3,5,7,14,30); /* In days */
 
 // By default 10, 5, 2, 1 year(s) or 6, 3, 1 month(s)
 // or 15, 10, 7, 5, 1, 0 day(s)
 // 0 it's temporary closed (Useful for one access)
-  $conf['ws_durations'] = array(3650,1825,730,365,182,91,30,15,10,7,5,1,0);
+$conf['ws_durations'] = array(3650,1825,730,365,182,91,30,15,10,7,5,1,0);
 
 // +-----------------------------------------------------------------------+
 // | Filter                                                                |
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 624e84934..6a4948aa9 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -868,6 +868,7 @@ function url_is_remote($url)
  */
 function get_pwg_themes()
 {
+  global $conf;
   $themes = array();
 
   $template_dir = PHPWG_ROOT_PATH.'template';
@@ -876,6 +877,7 @@ function get_pwg_themes()
   {
     foreach (get_dirs($template_dir.'/'.$template.'/theme') as $theme)
     {
+      if ( ($template.'/'.$theme) != $conf['admin_layout'] )
       array_push($themes, $template.'/'.$theme);
     }
   }
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 4272b3d3b..cdf751979 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -205,12 +205,7 @@ function build_user( $user_id, $use_cache )
   if (is_admin($user['status']))
   {
     list($user['admin_template'], $user['admin_theme']) =
-      explode
-      (
-        '/',
-        isset($conf['default_admin_layout']) ? $conf['default_admin_layout']
-                                             : $user['template']
-      );
+      explode ('/', $conf['admin_layout']);
   }
 
   list($user['template'], $user['theme']) = explode('/', $user['template']);