- 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

2 files changed, 3 insertions, 12 deletions

diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index 3504b16ab..e971f0f95 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -38,6 +38,7 @@
 <ul class="menu">
   <li><a class="adminMenu" href="{U_CATEGORIES}">{L_MANAGE}</a></li>
   <li><a class="adminMenu" href="{U_UPLOAD}">{L_UPLOAD}</a></li>
+  <li><a class="adminMenu" href="{U_CAT_OPTIONS}">{L_CAT_OPTIONS}</a></li>
 </ul>
 </div>
 <div class="titreMenu">{L_IMAGES}</div>
diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl
index 26605c14b..0d90e356b 100644
--- a/template/default/admin/configuration.tpl
+++ b/template/default/admin/configuration.tpl
@@ -51,12 +51,7 @@
     <td colspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td width="70%"><strong>{comments.L_CONF_SHOW_COMMENTS}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_SHOW_COMMENTS_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="show_comments" value="true" {comments.SHOW_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="show_comments" value="false" {comments.SHOW_COMMENTS_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{comments.L_CONF_COMMENTS_ALL}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_COMMENTS_ALL_INFO}</span></td>
+    <td width="70%"><strong>{comments.L_CONF_COMMENTS_ALL}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_COMMENTS_ALL_INFO}</span></td>
 	<td class="row1"><input type="radio" class="radio" name="comments_forall" value="true" {comments.COMMENTS_ALL_YES} />{L_YES}&nbsp;&nbsp;
 	<input type="radio" class="radio" name="comments_forall" value="false" {comments.COMMENTS_ALL_NO} />{L_NO}</td>
   </tr>
@@ -116,12 +111,7 @@
     <td colspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td width="70%"><strong>{upload.L_CONF_UPLOAD}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_UPLOAD_INFO}</span></td>
-	<td class="row1"><input type="radio" class="radio" name="upload_available" value="true" {upload.UPLOAD_YES} />{L_YES}&nbsp;&nbsp;
-	<input type="radio" class="radio" name="upload_available" value="false" {upload.UPLOAD_NO} />{L_NO}</td>
-  </tr>
-  <tr>
-    <td><strong>{upload.L_CONF_MAXSIZE}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_MAXSIZE_INFO}</span></td>
+    <td width="70%"><strong>{upload.L_CONF_MAXSIZE}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_MAXSIZE_INFO}</span></td>
 	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxfilesize" value="{upload.UPLOAD_MAXSIZE}" /></td>
   </tr>
   <tr>