- new : maintenance screen in administration. There you can update

  categories informations (number of images, date of the last added
  element), update images informations (path, average rate), purge obsolete
  sessions, purge history.

- new : ability to have random representative for categories. This
  configuration parameter is set to false by default.

- new : ability to set an element as representative of a category without
  belonging to the category. Thus, administrator can choose representative
  even for empty categories.

- improvement : semantically superior design for category edition screen by
  regrouping fields in fieldsets. The improved screen contains action
  buttons as in category list screen.

- new : ability to move a virtual category (ie change its parent category).

- bug fixed : the sync_users function checks all user children tables
  (access, cache, group association).


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

5 files changed, 135 insertions, 60 deletions

diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index db93f7ca9..8c72195d2 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -20,6 +20,7 @@
   <li><a class="adminMenu" href="{U_PHPINFO}">{L_PHPINFO}</a></li>
   <li><a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a></li>
   <li><a class="adminMenu" href="{U_CAT_UPDATE}">{L_UPDATE}</a></li>
+  <li><a class="adminMenu" href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
 </ul>
 </div>
 <div class="titreMenu">{L_CONFIGURATION}</div>
@@ -41,6 +42,9 @@
   <li><a class="adminMenu" href="{U_CAT_COMMENTS}">{L_CAT_COMMENTS}</a></li>
   <li><a class="adminMenu" href="{U_CAT_VISIBLE}">{L_CAT_VISIBLE}</a></li>
   <li><a class="adminMenu" href="{U_CAT_STATUS}">{L_CAT_STATUS}</a></li>
+  <!-- BEGIN representative -->
+  <li><a class="adminMenu" href="{representative.URL}">{lang:Representatve}</a></li>
+  <!-- END representative -->
 </ul>
 </div>
 <div class="titreMenu">{L_IMAGES}</div>
@@ -91,8 +95,9 @@
     </ul>
   </div>
   <!-- END infos -->
-
-  <div align="center">{ADMIN_CONTENT}{ADMIN_CONTENT_2}</div>
+  <div id="adminMain">
+    {ADMIN_CONTENT}{ADMIN_CONTENT_2}
+  </div>
 </div>
 	</td>
   </tr>
diff --git a/template/default/admin/cat_modify.tpl b/template/default/admin/cat_modify.tpl
index e83f587d4..c2ddfc7ee 100644
--- a/template/default/admin/cat_modify.tpl
+++ b/template/default/admin/cat_modify.tpl
@@ -1,82 +1,130 @@
-<div class="admin">{CATEGORIES_NAV}</div>
+<h2>{CATEGORIES_NAV}</h2>
+
+<ul class="categoryActions">
+  <li><a href="{U_JUMPTO}" title="{lang:jump to category}"><img src="./template/default/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
+  <!-- BEGIN elements -->
+  <li><a href="{elements.URL}" title="{lang:manage category elements}"><img src="./template/default/theme/category_elements.png" alt="{lang:elements}" /></a></li>
+  <!-- END elements -->
+  <li><a href="{U_CHILDREN}" title="{lang:manage sub-categories}"><img src="./template/default/theme/category_children.png" alt="{lang:sub-categories}" /></a></li>
+  <!-- BEGIN permissions -->
+  <li><a href="{permissions.URL}" title="{lang:edit category permissions}" ><img src="./template/default/theme/category_permissions.png" alt="{lang:permissions}" /></a></li>
+  <!-- END permissions -->
+  <!-- BEGIN delete -->
+  <li><a href="{delete.URL}" title="{lang:delete category}"><img src="./template/default/theme/category_delete.png" alt="{lang:delete}" /></a></li>
+  <!-- END delete -->
+</ul>
+
 <form action="{F_ACTION}" method="POST">
-<table style="width:100%;">
-    <!-- BEGIN representant -->
-    <tr>
-      <td style="width:50%;" align="center">
-        <a href="{representant.URL}"><img src="{representant.SRC}" alt="" class="miniature" /></a>
-      </td>
-      <td class="row1"><input type="submit" name="set_random_representant" value="{L_SET_RANDOM_REPRESENTANT}" class="bouton" /></td>
-    </tr>
-    <!-- END representant -->
-  </table>
-</form>
-<form action="{F_ACTION}" method="POST">
-<table style="width:100%;">
+
+<fieldset>
+  <legend>{lang:Informations}</legend>
+  <table>
     <!-- BEGIN server -->
     <tr>
-      <td style="width:50%;"><strong>{L_REMOTE_SITE}</strong></td>
-      <td class="row1">{server.SITE_URL}</td>
+      <td><strong>{L_REMOTE_SITE}</strong></td>
+      <td>{server.SITE_URL}</td>
     </tr>
     <!-- END server -->
+    <!-- BEGIN storage -->
     <tr>
-      <td style="width:50%;"><strong>{L_EDIT_NAME}</strong></td>
-      <td class="row1">
-        <input type="text" name="name" value="{CAT_NAME}" maxlength="60"/>
-      </td>
-    </tr>
-	<!-- BEGIN storage -->
-	<tr>
       <td><strong>{L_STORAGE}</strong></td>
       <td class="row1">{storage.CATEGORY_DIR}</td>
     </tr>
-	<!-- END storage -->
+    <!-- END storage -->
+    <tr>
+      <td><strong>{L_EDIT_NAME}</strong></td>
+      <td>
+        <input type="text" name="name" value="{CAT_NAME}" maxlength="60"/>
+      </td>
+    </tr>
     <tr>
       <td><strong>{L_EDIT_COMMENT}</strong></td>
-      <td class="row1">
+      <td>
         <textarea name="comment" rows="3" cols="50" >{CAT_COMMENT}</textarea>
       </td>
     </tr>
-	<tr class="admin">
-	  <th colspan="2">{L_EDIT_CAT_OPTIONS}</th>
-	</tr>
+  </table>
+</fieldset>
+
+<!-- BEGIN move -->
+<fieldset>
+  <legend>{lang:Move}</legend>
+  {lang:Parent category}
+  <select name="parent">
+    <!-- BEGIN parent_option -->
+    <option class="{move.parent_option.CLASS}" {move.parent_option.SELECTED} value="{move.parent_option.VALUE}">{move.parent_option.OPTION}</option>
+    <!-- END parent_option -->
+  </select>  
+</fieldset>
+<!-- END move -->
+
+<fieldset>
+  <legend>{lang:Options}</legend>
+  <table>
     <tr>
-      <td><strong>{L_EDIT_STATUS}&nbsp;:</strong><br /><span class="small">{L_EDIT_STATUS_INFO}</span></td>
-      <td class="row1">
-	  <input type="radio" class="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}&nbsp;&nbsp;
-	  <input type="radio" class="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
+      <td><strong>{L_EDIT_STATUS}</strong><br /><span class="small">{L_EDIT_STATUS_INFO}</span></td>
+      <td>
+	  <input type="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}
+	  <input type="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
       </td>
     </tr>
     <tr>
-      <td><strong>{L_EDIT_LOCK}&nbsp;:</strong><br /><span class="small">{L_EDIT_LOCK_INFO}</span></td>
-      <td class="row1">
-	  <input type="radio" class="radio" name="visible" value="false" {LOCKED} />{L_YES}&nbsp;&nbsp;
-	  <input type="radio" class="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
+      <td><strong>{L_EDIT_LOCK}</strong><br /><span class="small">{L_EDIT_LOCK_INFO}</span></td>
+      <td>
+	  <input type="radio" name="visible" value="false" {LOCKED} />{L_YES}
+	  <input type="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
       </td>
     </tr>
     <tr>
-      <td><strong>{L_EDIT_COMMENTABLE}&nbsp;:</strong><br /><span class="small">{L_EDIT_COMMENTABLE_INFO}</span></td>
-      <td class="row1">
-          <input type="radio" class="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}&nbsp;&nbsp;
-          <input type="radio" class="radio" name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
+      <td><strong>{L_EDIT_COMMENTABLE}</strong><br /><span class="small">{L_EDIT_COMMENTABLE_INFO}</span></td>
+      <td>
+          <input type="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}
+          <input type="radio"  name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
       </td>
     </tr>
     <!-- BEGIN upload -->
     <tr>
-      <td><strong>{L_EDIT_UPLOADABLE}&nbsp;:</strong><br /><span class="small">{L_EDIT_UPLOADABLE_INFO}</span></td>
-      <td class="row1">
-          <input type="radio" class="radio" name="uploadable" value="true" {UPLOADABLE_TRUE} />{L_YES}&nbsp;&nbsp;
-          <input type="radio" class="radio" name="uploadable" value="false" {UPLOADABLE_FALSE} />{L_NO}
+      <td><strong>{L_EDIT_UPLOADABLE}</strong><br /><span class="small">{L_EDIT_UPLOADABLE_INFO}</span></td>
+      <td>
+          <input type="radio" name="uploadable" value="true" {UPLOADABLE_TRUE} />{L_YES}
+          <input type="radio" name="uploadable" value="false" {UPLOADABLE_FALSE} />{L_NO}
       </td>
     </tr>
     <!-- END upload -->
+  </table>
+</fieldset>
+
+<p style="text-align:center;">
+  <input type="submit" value="{L_SUBMIT}" name="submit" />
+  <input type="reset" value="{lang:Reset}" name="reset" />
+</p>
+
+<!-- BEGIN representant -->
+<fieldset>
+  <legend>{lang:Representant}</legend>
+  <table>
     <tr>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-    <tr>
-      <td colspan="2" align="center">
-        <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
+      <td align="center">
+        <!-- BEGIN picture -->
+        <a href="{representant.picture.URL}"><img src="{representant.picture.SRC}" alt="" class="miniature" /></a>
+        <!-- END picture -->
+
+        <!-- BEGIN random -->
+        <img src="./template/default/theme/category_representant_random.png" alt="{lang:Random picture}" class="miniature" />
+        <!-- END random -->
+      </td>
+      <td>
+        <!-- BEGIN set_random --> 
+        <p><input type="submit" name="set_random_representant" value="{L_SET_RANDOM_REPRESENTANT}" /></p>
+        <!-- END set_random -->
+
+        <!-- BEGIN delete_representant -->
+        <p><input type="submit" name="delete_representant" value="{lang:Delete Representant}" /></p>
+        <!-- END delete_representant -->
       </td>
     </tr>
   </table>
+</fieldset>
+<!-- END representant -->
+
 </form>
diff --git a/template/default/admin/maintenance.tpl b/template/default/admin/maintenance.tpl
new file mode 100644
index 000000000..cb8f506ff
--- /dev/null
+++ b/template/default/admin/maintenance.tpl
@@ -0,0 +1,9 @@
+<ul>
+  <li><a href="{U_MAINT_CATEGORIES}">{lang:update categories informations}</a></li>
+  <li><a href="{U_MAINT_IMAGES}">{lang:update images informations}</a></li>
+  <li><a href="{U_MAINT_HISTORY}">{lang:purge history}</a></li>
+  <li><a href="{U_MAINT_SESSIONS}">{lang:purge sessions}</a></li>
+<!--
+  <li><a href="{U_FEEDS}">{lang:purge obsolete notification feed}</a></li>
+-->
+</ul>
diff --git a/template/default/default.css b/template/default/default.css
index 3169c6a64..5091b7431 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -50,15 +50,6 @@ h1 /* H1 tag style (admin side only) */
 	font-weight: bold;
 }
 
-h2 /* H2 tag style (admin side only) */
-{
-	font-family: Arial, Helvetica, sans-serif;
-	text-decoration:none; 
-	line-height:	120%; 
-	font-size:12px;
-	font-weight: bold;
-}
-
 .titreMenu /* Menu titles */
 {
   font-size:12px;
@@ -365,6 +356,16 @@ input,select,textarea
   font-size:12px;
 }
 
+div#adminMain {
+  text-align: left;
+}
+
+div#adminMain h2 {
+  background-color: #3f3f3f;
+  text-align: center;
+  font-size: 120%;
+}
+
 div.adminMenu{ margin:10px 50px 10px 50px; }
 
 .admin 
@@ -413,6 +414,10 @@ form#categoryOrdering ul.categoryActions {
   margin-top: 5px;
 }
 
+div#adminMain>ul.categoryActions {
+  text-align: center;
+}
+
 ul.categoryActions>li {
   display: inline;
 }
@@ -490,3 +495,11 @@ FORM#categoryPermissions LI {
   display:inline;
   white-space: nowrap;
 }
+
+fieldset {
+  border: 1px solid gray;
+}
+
+fieldset>legend {
+  margin: 5px;
+}
diff --git a/template/default/theme/category_representant_random.png b/template/default/theme/category_representant_random.png
new file mode 100644
index 000000000..df0151535
--- /dev/null
+++ b/template/default/theme/category_representant_random.png