- possibility to display only a text field for a parent category

 - the bullet to the left of each category now represent a button to
   collapse or expand the category

 - for up,first,down,last, we don't show #id in url anymore


git-svn-id: http://piwigo.org/svn/branches/release-1_3@247 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 16 insertions, 10 deletions

diff --git a/template/default/admin/cat_list.vtp b/template/default/admin/cat_list.vtp
index 6aaaa9f9d..312ac4cc6 100644
--- a/template/default/admin/cat_list.vtp
+++ b/template/default/admin/cat_list.vtp
@@ -8,26 +8,32 @@
   </ul>
 </div>
 <!--/VTP_errors-->
-<table style="width:100%;">
-<tr>
-  <td colspan="8" style="text-align:center;padding-top:10px;padding-bottom:10px;">
+<div style="text-align:center;padding-top:10px;padding-bottom:5px;">
   <form action="" method="post">
     {#cat_add} <input type="text" name="virtual_name" />
     {#cat_parent}
+    <!--VTP_associate_LOV-->
     <select name="associate">
       <!--VTP_associate_cat-->
       <option value="{#value}">{#content}</option>
       <!--/VTP_associate_cat-->
     </select>
+    <!--/VTP_associate_LOV-->
+    <!--VTP_associate_text-->
+      <input type="text" name="associate" />
+    <!--/VTP_associate_text-->
    <input type="submit" value="{#submit}" name="submit" />
   </form>
-  </td>
-</tr>
+</div>
+<table style="width:100%;">
 <!--VTP_cat-->
 <tr>
   <{#td} style="width:50%;text-align:left;">
     <a name="{#id}"></a>
-    {#indent}<img src="../template/{#user_template}/admin/images/puce.gif" alt="&gt;" />
+    {#indent}
+    <!--VTP_bullet_collapsed--><a href="{#link}"><img src="../template/{#user_template}/admin/images/collapsed.gif" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_collapsed-->
+    <!--VTP_bullet_expanded--><a href="{#link}"><img src="../template/{#user_template}/admin/images/expanded.gif" style="border:none;" alt="&gt;" /></a><!--/VTP_bullet_expanded-->
+    <!--VTP_bullet_wo_link--><img src="../template/{#user_template}/admin/images/collapsed.gif" style="border:none;" alt="&gt;" /><!--/VTP_bullet_wo_link-->
     &nbsp;{#name} [
     <!--VTP_storage-->
     dir : {#dir}
@@ -41,19 +47,19 @@
   <{#td} class="{#class}"
          style="width:1px;white-space:nowrap;text-align:center;">
     <!--VTP_up-->
-    <a href="{#up_url}#{#id}"><img src="../template/{#user_template}/admin/images/arrow_up.gif" alt="{#cat_up}" title="{#cat_up}" style="border:none;" /></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-->
-    <a href="{#last_url}#{#id}"><img src="../template/{#user_template}/admin/images/arrow_last.gif" alt="{#cat_last}" title="{#cat_last}" style="border:none;" /></a>
+    <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:1px;white-space:nowrap;text-align:center;">
     <!--VTP_down-->
-    <a href="{#down_url}#{#id}"><img src="../template/{#user_template}/admin/images/arrow_down.gif" alt="{#cat_down}" title="{#cat_down}" style="border:none;" /></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-->
-    <a href="{#first_url}#{#id}"><img src="../template/{#user_template}/admin/images/arrow_first.gif" alt="{#cat_first}" title="{#cat_first}" style="border:none;" /></a>
+    <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;">