- on picture.php, related categories under the element are displayed in

  global_rank order

- when adding a new virtual category, initializes its global_rank

- bug fixed : in admin/cat_list, false next rank

- in admin/cat_modify, complete directory is calculated only if category is
  not virtual

- admin/picture_modify rewritten : graphically nearer to admin/cat_modify,
  virtual associations are back

- update_category partially rewritten : take an array of categories in
  parameter, becomes optionnaly recursive, use the set_random_representant
  function, set a random representant for categories with elements and no
  representant

- bug fixed : on a search results screen, elements belonging to more than 1
  category were shown more than once

- bug fixed : in admin/cat_modify, changing a value in a textefield and
  hitting enter was setting a new random representant


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

3 files changed, 92 insertions, 73 deletions

diff --git a/template/default/admin/cat_list.tpl b/template/default/admin/cat_list.tpl
index b33771222..39fbc3b20 100644
--- a/template/default/admin/cat_list.tpl
+++ b/template/default/admin/cat_list.tpl
@@ -52,7 +52,7 @@
 <tr>
 <!-- END category -->
 </table>
-<form action="" method="post">
+<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" />
diff --git a/template/default/admin/cat_modify.tpl b/template/default/admin/cat_modify.tpl
index c9b9749b3..8344b269d 100644
--- a/template/default/admin/cat_modify.tpl
+++ b/template/default/admin/cat_modify.tpl
@@ -13,6 +13,10 @@
       <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%;">
     <!-- BEGIN server -->
     <tr>
       <td style="width:50%;"><strong>{L_REMOTE_SITE}</strong></td>
@@ -28,7 +32,7 @@
 	<!-- BEGIN storage -->
 	<tr>
       <td><strong>{L_STORAGE}</strong></td>
-      <td class="row1">{CATEGORY_DIR}</td>
+      <td class="row1">{storage.CATEGORY_DIR}</td>
     </tr>
 	<!-- END storage -->
     <tr>
diff --git a/template/default/admin/picture_modify.tpl b/template/default/admin/picture_modify.tpl
index 41ee6630f..9d2237905 100644
--- a/template/default/admin/picture_modify.tpl
+++ b/template/default/admin/picture_modify.tpl
@@ -7,78 +7,55 @@
 </ul>
 </div>
 <!-- END errors -->
-<div class="admin">{TITLE_IMG} [ {DIR_IMG} &gt; {FILE_IMG} ]</div>
-<form method="post" action="{F_ACTION}">
+<div class="admin">{TITLE_IMG}</div>
+<form action="{F_ACTION}" method="POST">
   <table style="width:100%;">
-    <tr valign="top">
-      <td style="width:1px;">
-	  <a href="{URL_IMG}" class="thumbnail"><img src="{TN_URL_IMG}" alt="" class="miniature" /></a>
-	  </td>
-      <td>
-        <table>
-          <tr>
-            <td>{L_UPLOAD_NAME} :</td>
-            <td><input type="text" name="name" value="{NAME_IMG}" /> [ {L_DEFAULT} : {DEFAULT_NAME_IMG} ]</td>
-          </tr>
-          <tr>
-            <td>{L_FILE} :</td>
-            <td>{FILE_IMG}</td>
-          </tr>
-          <tr>
-            <td>{L_SIZE} :</td>
-            <td>{SIZE_IMG}</td>
-          </tr>
-          <tr>
-            <td>{L_FILESIZE} :</td>
-            <td>{FILESIZE_IMG}</td>
-          </tr>
-          <tr>
-            <td>{L_REGISTRATION_DATE} :</td>
-            <td>{REGISTRATION_DATE_IMG}</td>
-          </tr>
-          <tr>
-            <td>{L_AUTHOR} :</td>
-            <td><input type="text" name="author" value="{AUTHOR_IMG}" /></td>
-          </tr>
-          <tr>
-            <td>{L_CREATION_DATE} :</td>
-            <td><input type="text" name="date_creation" value="{CREATION_DATE_IMG}" /></td>
-          </tr>
-          <tr>
-            <td>{L_KEYWORDS} :</td>
-            <td><input type="text" name="keywords" value="{KEYWORDS_IMG}" size="50" /></td>
-          </tr>
-          <tr>
-            <td>{L_COMMENT} :</td>
-            <td><textarea name="comment" rows="5" cols="50" style="overflow:auto">{COMMENT_IMG}</textarea></td>
-          </tr>
-          <tr>
-            <td valign="top">{L_CATEGORIES} :</td>
-            <td>
-              <select style="width:280px" name="cat_data[]" multiple="multiple" size="5">
-				  {ASSOCIATED_CATEGORIES}
-			  </select>
-			</td>
-		  </tr>
-          <tr><td colspan="2">&nbsp;</td></tr>
-                <tr>
-                  <td>{L_INFOIMAGE_ASSOCIATE}</td>
-				  <td>
-                    <!-- BEGIN associate_LOV -->
-                    <select name="associate">
-                      <!-- BEGIN associate_cat -->
-                      <option value="{associate_LOV.associate_cat.VALUE_CAT}">{associate_LOV.associate_cat.VALUE_CONTENT}</option>
-                      <!-- END associate_cat -->
-                    </select>
-                    <!-- END associate_LOV -->
-                    <!-- BEGIN associate_text -->
-                    <input type="text" name="associate" />
-                    <!-- END associate_text -->
-                    </select>
-                  </td>
-                </tr>
-              </table>
-      </td>
+    <tr>
+      <td colspan="2" align="center"><a href="{URL_IMG}" class="thumbnail"><img src="{TN_URL_IMG}" alt="" class="miniature" /></a></td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_UPLOAD_NAME}</strong></td>
+      <td class="row1"><input type="text" name="name" value="{NAME_IMG}" /> [ {L_DEFAULT} : {DEFAULT_NAME_IMG} ]</td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_FILE}</strong></td>
+      <td class="row1">{FILE_IMG}</td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_SIZE}</strong></td>
+      <td class="row1">{SIZE_IMG}</td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_FILESIZE}</strong></td>
+      <td class="row1">{FILESIZE_IMG}</td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_REGISTRATION_DATE}</strong></td>
+      <td class="row1">{REGISTRATION_DATE_IMG}</td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_PATH}</strong></td>
+      <td class="row1">{PATH_IMG}</td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_STORAGE_CATEGORY}</strong></td>
+      <td class="row1">{STORAGE_CATEGORY_IMG}</td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_AUTHOR}</strong></td>
+      <td class="row1"><input type="text" name="author" value="{AUTHOR_IMG}" /></td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_CREATION_DATE}</strong></td>
+      <td class="row1"><input type="text" name="date_creation" value="{CREATION_DATE_IMG}" /></td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_KEYWORDS}</strong></td>
+      <td class="row1"><input type="text" name="keywords" value="{KEYWORDS_IMG}" size="50" /></td>
+    </tr>
+    <tr>
+      <td style="width:50%;"><strong>{L_COMMENT}</strong></td>
+      <td class="row1"><textarea name="comment" rows="5" cols="50" style="overflow:auto">{COMMENT_IMG}</textarea></td>
     </tr>
     <tr>
       <td colspan="2"><div style="margin-bottom:0px">&nbsp;</div></td>
@@ -86,7 +63,45 @@
     <tr>
       <td colspan="2" align="center">
         <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
+        <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
       </td>
     </tr>
   </table>
 </form>
+
+<form name="form1" method="post" action="{F_ACTION}" style="text-align:center;width:800px;">
+
+  <div style="clear:both;"></div>
+
+  <div style="height:auto;">
+
+    <div style="float:left;padding:10px;width:300px;">
+      <span class="titreMenu">{L_CAT_ASSOCIATED}</span><br />
+      <select style="height:auto;width:280px" name="cat_associated[]" multiple="multiple" size="10">
+        <!-- BEGIN associated_option -->
+        <option class="{associated_option.CLASS}" {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
+        <!-- END associated_option -->
+      </select>
+    </div>
+
+    <div style="float:left;padding-top:80px;padding-bottom:80px;text-align:center;width:160px;" >
+      <input type="submit" value="&larr;" name="associate" style="font-size:15px;" class="bouton" /><br/>
+      <input type="submit" value="&rarr;" name="dissociate" style="font-size:15px;" class="bouton" />
+    </div>
+
+    <div style="float:right;padding:10px;width:300px;">
+      <span class="titreMenu">{L_CAT_DISSOCIATED}</span><br />
+      <select style="width:280px" name="cat_dissociated[]" multiple="multiple" size="10">
+        <!-- BEGIN dissociated_option -->
+        <option class="{dissociated_option.CLASS}" {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
+        <!-- END dissociated_option -->
+      </select>
+    </div>
+
+  </div>
+
+  <div style="clear:both;"></div>
+
+  <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
+
+</form>