- admin/cat_options page added : manage options for the whole categories

  tree (uploadable, commentable). status and visible will be soon added

- admin.php : $conf_link var to avoid lines longer than 79 characters

- config.upload_available configuration parameter disappear : it's simpler
  to manage with cat_options

- config.show_comments idem : new column categories.commentable, each
  categories can be commentable or not

- categories.site_id becomes a nullable column : a virtual category does
  belong to no site

- function display_select_categories has a new argument : $CSS_classes array
  to optionnaly assign a CSS class to each category in the select field

- added informations in include/config.inc.php for setting default value of :

  - categories.visible
  - categories.status
  - categories.uploadable
  - categories.commentable

- 2 new indexes images_i3(average_rate) and images_i4(hit) : optimizes best
  rated and most visited categories


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

1 files changed, 15 insertions, 6 deletions

diff --git a/admin.php b/admin.php
index 192648256..9dd06ba8e 100644
--- a/admin.php
+++ b/admin.php
@@ -132,6 +132,12 @@ switch ( $_GET['page'] )
    $page_valide = true;
    break;
  }
+ case 'cat_options' :
+ {
+   $title = $lang['title_cat_options'];
+   $page_valide = true;
+   break;
+ }
  default:
    $title = $lang['title_default']; break;
 }
@@ -159,6 +165,7 @@ if ( mysql_num_rows( $result ) > 0 )
 }
 
 $link_start = PHPWG_ROOT_PATH.'admin.php?page=';
+$conf_link = $link_start.'configuration&section=';
 //----------------------------------------------------- template initialization
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 $template->set_filenames( array('admin'=>'admin.tpl') );
@@ -192,13 +199,14 @@ $template->assign_vars(array(
   'L_GROUPS'=>$lang['groups'],
   'L_AUTH'=>$lang['permissions'],
   'L_UPDATE'=>$lang['update'],
+  'L_CAT_OPTIONS'=>$lang['cat_options_menu'],
   
-  'U_CONFIG_GENERAL'=>add_session_id($link_start.'configuration&section=general' ),
-  'U_CONFIG_COMMENTS'=>add_session_id($link_start.'configuration&section=comments' ),
-  'U_CONFIG_DISPLAY'=>add_session_id($link_start.'configuration&section=default' ),
-  'U_CONFIG_UPLOAD'=>add_session_id($link_start.'configuration&section=upload' ),
-  'U_CONFIG_SESSION'=>add_session_id($link_start.'configuration&section=session' ),
-  'U_CONFIG_METADATA'=>add_session_id($link_start.'configuration&section=metadata' ),
+  'U_CONFIG_GENERAL'=>add_session_id($conf_link.'general' ),
+  'U_CONFIG_COMMENTS'=>add_session_id($conf_link.'comments' ),
+  'U_CONFIG_DISPLAY'=>add_session_id($conf_link.'default' ),
+  'U_CONFIG_UPLOAD'=>add_session_id($conf_link.'upload' ),
+  'U_CONFIG_SESSION'=>add_session_id($conf_link.'session' ),
+  'U_CONFIG_METADATA'=>add_session_id($conf_link.'metadata' ),
   'U_SITES'=>add_session_id($link_start.'remote_site'),
   'U_PHPINFO'=>add_session_id($link_start.'admin_phpinfo' ),
   'U_USERS'=>add_session_id($link_start.'user_search' ),
@@ -211,6 +219,7 @@ $template->assign_vars(array(
   'U_THUMBNAILS'=>add_session_id($link_start.'thumbnail' ),
   'U_HISTORY'=>add_session_id($link_start.'stats' ),
   'U_FAQ'=>add_session_id($link_start.'help' ),
+  'U_CAT_OPTIONS'=>add_session_id($link_start.'cat_options'),
   'U_RETURN'=>add_session_id(PHPWG_ROOT_PATH.'category.php')
   ));