Virtual categories management

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

2 files changed, 76 insertions, 16 deletions

diff --git a/template/default/admin/cat_list.vtp b/template/default/admin/cat_list.vtp
index 12fe855a0..74e09c211 100644
--- a/template/default/admin/cat_list.vtp
+++ b/template/default/admin/cat_list.vtp
@@ -1,36 +1,67 @@
+<!--VTP_errors-->
+<div class="errors">
+  <div class="errors_title">{#errors_title}</div>
+  <ul>
+    <!--VTP_li-->
+    <li>{#content}</li>
+    <!--/VTP_li-->
+  </ul>
+</div>
+<!--/VTP_errors-->
 <table style="width:100%;">
+<tr>
+  <td colspan="8" style="text-align:center;padding-top:10px;padding-bottom:10px;">
+  <form action="" method="post">
+    {#cat_add} <input type="text" name="virtual_name" />
+    {#cat_parent}
+    <select name="associate">
+      <!--VTP_associate_cat-->
+      <option value="{#value}">{#content}</option>
+      <!--/VTP_associate_cat-->
+    </select>
+   <input type="submit" value="{#submit}" name="submit" />
+  </form>
+  </td>
+</tr>
 <!--VTP_cat-->
 <tr>
-  <{#td} style="width:40%;text-align:left;">
+  <{#td} style="width:50%;text-align:left;">
     {#indent}<img src="../template/{#user_template}/admin/images/puce.gif" alt="&gt;" />
-    &nbsp;{#name} [ dir : {#dir} ]
+    &nbsp;{#name} [
+    <!--VTP_storage-->
+    dir : {#dir}
+    <!--/VTP_storage-->
+    <!--VTP_virtual-->
+    <span style="color:blue;">{#cat_virtual}</span>
+    <!--/VTP_virtual-->
+    ]
     <span style="color:red;font-weight:normal;"> {#invisible} <span style="font-weight:bold;">{#private}</span></span>
   </{#td}>
-  <{#td} style="text-align:center;">
-    <div style="margin-left:3px;margin-right:3px;">{#nb_picture}</div>
-  </{#td}>
   <{#td} class="{#class}"
-         style="width:10%;white-space:nowrap;text-align:center;">
-    <a href="{#edit_url}">{#cat_edit}</a>
-  </{#td}>
-  <{#td} class="{#class}"
-         style="width:10%;white-space:nowrap;text-align:center;">
+         style="width:1px;white-space:nowrap;text-align:center;">
     <!--VTP_up-->
-    <a href="{#up_url}">{#cat_up}</a>
+    <a href="{#up_url}"><img src="../template/{#user_template}/admin/images/arrow_up.gif" alt="{#cat_up}" title="{#cat_up}" style="border:none;" /></a>
     <!--/VTP_up-->
     <!--VTP_no_up-->
-    <span style="color:darkgray;">{#cat_up}</span>
+    <a href="{#last_url}"><img src="../template/{#user_template}/admin/images/arrow_last.gif" alt="{#cat_last}" title="{#cat_last}" style="border:none;" /></a>
     <!--/VTP_no_up-->
   </{#td}>
   <{#td} class="{#class}"
-         style="width:10%;white-space:nowrap;text-align:center;">
+         style="width:1px;white-space:nowrap;text-align:center;">
     <!--VTP_down-->
-    <a href="{#down_url}">{#cat_down}</a>
+    <a href="{#down_url}"><img src="../template/{#user_template}/admin/images/arrow_down.gif" alt="{#cat_down}" title="{#cat_down}" style="border:none;" /></a>
     <!--/VTP_down-->
     <!--VTP_no_down-->
-    <span style="color:darkgray;">{#cat_down}</span>
+    <a href="{#first_url}"><img src="../template/{#user_template}/admin/images/arrow_first.gif" alt="{#cat_first}" title="{#cat_first}" style="border:none;" /></a>
     <!--/VTP_no_down-->
   </{#td}>
+  <{#td} class="{#class}" style="width:1px;text-align:center;">
+    <div style="margin-left:3px;margin-right:3px;">{#nb_picture}</div>
+  </{#td}>
+  <{#td} class="{#class}"
+         style="width:10%;white-space:nowrap;text-align:center;">
+    <a href="{#edit_url}">{#cat_edit}</a>
+  </{#td}>
   <{#td} class="{#class}"
          style="width:10%;white-space:nowrap;text-align:center;">
     <!--VTP_image_info-->
@@ -58,6 +89,15 @@
     <span style="color:darkgray;">{#cat_update}</span>
     <!--/VTP_no_update-->
   </{#td}>
+  <{#td} class="{#class}"
+         style="width:10%;white-space:nowrap;text-align:center;">
+    <!--VTP_delete-->
+    <a href="{#delete_url}">{#delete}</a>
+    <!--/VTP_delete-->
+    <!--VTP_no_delete-->
+    <span style="color:darkgray;">{#delete}</span>
+    <!--/VTP_no_delete-->
+  </{#td}>
 <tr>
 <!--/VTP_cat-->
 </table>
\ No newline at end of file
diff --git a/template/default/admin/cat_modify.vtp b/template/default/admin/cat_modify.vtp
index 392919bf6..6293871a0 100644
--- a/template/default/admin/cat_modify.vtp
+++ b/template/default/admin/cat_modify.vtp
@@ -5,7 +5,15 @@
 <form action="{#form_action}" method="post">
   <table style="width:100%;">
     <tr>
-      <th colspan="2">{#editcat_title1} "{#cat:name}" [ {#cat:dir} ]</th>
+      <th colspan="2">{#editcat_title1} "{#cat:name}" [
+        <!--VTP_storage-->
+        dir : {#dir}
+        <!--/VTP_storage-->
+        <!--VTP_virtual-->
+        <span style="color:blue;">{#cat_virtual}</span>
+        <!--/VTP_virtual-->
+        ]
+      </th>
     </tr>
     <!--VTP_server-->
     <tr>
@@ -52,6 +60,18 @@
       </td>
     </tr>
     <!--/VTP_uploadable-->
+    <!--VTP_parent-->
+    <tr>
+      <td>{#cat_parent}</td>
+      <td class="row2">
+        <select name="associate">
+          <!--VTP_associate_cat-->
+          <option value="{#value}"{#selected}>{#content}</option>
+          <!--/VTP_associate_cat-->
+        </select>
+      </td>
+    </tr>
+    <!--/VTP_parent-->
     <tr>
       <td colspan="2">&nbsp;</td>
     </tr>