- categories management : new display with icon for actions (delete,

  sub-categories, elements, edit, jump to, permissions)

- categories management : semantic HTML layout (using common lists)

- categories management : new way to order categories of the same level : a
  text field let the admin reorder all categories at once.


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

7 files changed, 66 insertions, 38 deletions

diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl
index f6e30b042..7463845ce 100644
--- a/template/default/admin/cat_list.tpl
+++ b/template/default/admin/cat_list.tpl
@@ -1,43 +1,42 @@
 <div class="admin">{CATEGORIES_NAV}</div>
-<table style="width:100%;">
-<!-- BEGIN category -->
-<tr>
-  <td style="width:1px;padding:5px;"><img src="{category.CATEGORY_IMG_SRC}" alt="{category.CATEGORY_IMG_ALT}" title="{category.CATEGORY_IMG_TITLE}" /></td>
-  <td style="width:60%;text-align:left;"><a class="titreImg" href="{category.U_CATEGORY}">{category.CATEGORY_NAME}</a>
-    <br />
-	<!-- BEGIN storage -->
-    {L_STORAGE} : {category.CATEGORY_DIR} - 
-    <!-- END storage -->
-	{L_NB_IMG} : {category.CATEGORY_NB_IMG}
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <a href="{category.U_MOVE_UP}">{L_MOVE_UP}</a><br />
-	<a href="{category.U_MOVE_DOWN}">{L_MOVE_DOWN}</a>
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <a href="{category.U_CAT_EDIT}">{L_EDIT}</a>
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <!-- BEGIN image_info -->
-    <a href="{category.U_INFO_IMG}">{L_INFO_IMG}</a>
-    <!-- END image_info -->
-    <!-- BEGIN no_image_info -->
-    <span style="color:darkgray;">{L_INFO_IMG}</span>
-    <!-- END no_image_info -->
-  </td>
-  <td class="row1" style="width:10%;white-space:nowrap;text-align:center;">
-    <!-- BEGIN virtual -->
-    <a href="{category.U_CAT_DELETE}">{L_DELETE}</a>
-    <!-- END virtual -->
-    <!-- BEGIN storage -->
-    <span style="color:darkgray;">{L_DELETE}</span>
-    <!-- END storage -->
-  </td>
-<tr>
-<!-- END category -->
-</table>
+
+<form id="categoryOrdering" action="" method="post">
+
+  <ul>
+
+    <!-- BEGIN category -->
+    <li> <!-- category {category.ID} -->
+
+      <ul class="categoryActions">
+        <li><a href="{category.U_JUMPTO}" title="{lang:jump to category}"><img src="./template/default/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li> 
+        <li><a href="{category.U_EDIT}" title="{lang:edit category informations}"><img src="./template/default/theme/category_edit.png" alt="{lang:edit}"/></a></li>
+        <!-- BEGIN elements -->
+        <li><a href="{category.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="{category.U_CHILDREN}" title="{lang:manage sub-categories}"><img src="./template/default/theme/category_children.png" alt="{lang:sub-categories}" /></a></li> 
+        <!-- BEGIN delete -->
+        <li><a href="{category.delete.URL}" title="{lang:delete category}"><img src="./template/default/theme/category_delete.png" alt="{lang:delete}" /></a></li>
+        <!-- END delete -->
+      </ul>
+
+      <p><strong>{category.NAME}</strong></p>
+
+      <p>
+        <label>
+          {lang:Position} :
+          <input type="text" size="4" name="catOrd[{category.ID}]" maxlength="4" value="{category.RANK}" />
+        </label>
+      </p>
+
+    </li>
+    <!-- END category -->
+
+  <p><input name="submitOrder" type="submit" class="bouton" value="{lang:Save order}" /></p>
+
+</form>
+
 <form action="{F_ACTION}" method="post">
   {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
   <input type="hidden" name="rank" value="{NEXT_RANK}"/>
-  <input type="submit" value="{L_SUBMIT}" class="bouton" name="submit" />
+  <input type="submit" value="{L_SUBMIT}" class="bouton" name="submitAdd" />
 </form>
diff --git a/template/default/default.css b/template/default/default.css
index e8e63c8a5..f02f33ce3 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -383,6 +383,35 @@ label:hover {
 }
 
 /**
+ * Categories management
+ */
+
+form#categoryOrdering>ul {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+form#categoryOrdering>ul>li {
+  border: 1px solid grey;
+  padding: 0px 5px;
+  margin-bottom: 5px;
+}
+
+form#categoryOrdering ul.categoryActions {
+  float: right;
+  margin-top: 5px;
+}
+
+ul.categoryActions>li {
+  display: inline;
+}
+
+ul.categoryActions a img {
+  border: none;
+}
+
+/**
  * Errors box in administration
  */
 #errors {
diff --git a/template/default/theme/category_children.png b/template/default/theme/category_children.png
new file mode 100644
index 000000000..c8d9b36b0
--- /dev/null
+++ b/template/default/theme/category_children.png
diff --git a/template/default/theme/category_delete.png b/template/default/theme/category_delete.png
new file mode 100644
index 000000000..abedfe810
--- /dev/null
+++ b/template/default/theme/category_delete.png
diff --git a/template/default/theme/category_edit.png b/template/default/theme/category_edit.png
new file mode 100644
index 000000000..57bd43af0
--- /dev/null
+++ b/template/default/theme/category_edit.png
diff --git a/template/default/theme/category_elements.png b/template/default/theme/category_elements.png
new file mode 100644
index 000000000..9b5229a41
--- /dev/null
+++ b/template/default/theme/category_elements.png
diff --git a/template/default/theme/category_jump-to.png b/template/default/theme/category_jump-to.png
new file mode 100644
index 000000000..1763b90aa
--- /dev/null
+++ b/template/default/theme/category_jump-to.png