Multi categories for the same picture

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

3 files changed, 121 insertions, 3 deletions

diff --git a/template/default/admin/configuration.vtp b/template/default/admin/configuration.vtp
index 240f0e408..162e530ee 100644
--- a/template/default/admin/configuration.vtp
+++ b/template/default/admin/configuration.vtp
@@ -1,6 +1,6 @@
 <!--VTP_errors-->
 <div class="errors">
-  <div class="errors_title">Erreurs</div>
+  <div class="errors_title">{#errors_title}</div>
   <ul>
     <!--VTP_li-->
     <li>{#li}</li>
diff --git a/template/default/admin/infos_image.vtp b/template/default/admin/infos_image.vtp
index d9a4e92c5..975621077 100644
--- a/template/default/admin/infos_image.vtp
+++ b/template/default/admin/infos_image.vtp
@@ -42,12 +42,13 @@
   </table>
   <table width="100%">
     <tr>
-      <th colspan="6">{#infoimage_detailed}</th>
+      <th colspan="7">{#infoimage_detailed}</th>
     </tr>
     <tr>
-      <td colspan="6" align="center">{#navigation_bar}</td>
+      <td colspan="7" align="center">{#navigation_bar}</td>
     </tr>
     <tr>
+      <td style="width:0px;">&nbsp;</td>
       <td class="row2" style="text-align:center;">{#thumbnail}</td>
       <td class="row2" style="text-align:center;">{#infoimage_title}</td>
       <td class="row2" style="text-align:center;">{#author}</td>
@@ -57,6 +58,11 @@
     </tr>
     <!--VTP_picture-->
     <tr>
+      <td style="width:0px;">
+        <div style="margin-left:2px;margin-right:2px;">
+          <input type="checkbox" name="check-{#id}" value="1" />
+        </div>
+      </td>
       <td style="text-align:center;"><a name="{#link}" href="{#url}"><img src="{#thumbnail_url}" alt="" class="miniature" title="{#filename}" /></td>
       <td style="text-align:center;">{#default_name}<br /><input type="text" name="name-{#id}" value="{#name}" maxlength="255"/></td>
       <td style="text-align:center;"><input type="text" name="author-{#id}" value="{#author}" maxlength="255"/></td>
@@ -66,6 +72,17 @@
     </tr>
     <!--/VTP_picture-->
     <tr>
+      <td colspan="6">
+        <img src="../template/{#user_template}/admin/images/arrow_up.gif" alt="&lt;" />
+        {#infoimage_associate}
+        <select name="associate">
+          <!--VTP_associate_cat-->
+          <option value="{#value}">{#content}</option>
+          <!--/VTP_associate_cat-->
+        </select>
+    </td>
+  </tr>
+    <tr>
       <td colspan="6" style="text-align:center;">
         <input type="submit" value="{#submit}" name="submit" />
       </td>
diff --git a/template/default/admin/picture_modify.vtp b/template/default/admin/picture_modify.vtp
new file mode 100644
index 000000000..79029ef75
--- /dev/null
+++ b/template/default/admin/picture_modify.vtp
@@ -0,0 +1,101 @@
+<!--VTP_errors-->
+<div class="errors">
+  <div class="errors_title">{#errors_title}</div>
+  <ul>
+    <!--VTP_li-->
+    <li>{#content}</li>
+    <!--/VTP_li-->
+  </ul>
+</div>
+<!--/VTP_errors-->
+<!--VTP_confirmation-->
+<div class="info">
+  {#picmod_update} [ <a href="{#url}">{#picmod_back}</a> ]
+</div>
+<!--/VTP_confirmation-->
+<form method="post" action="{#form_action}">
+  <table style="width:100%;">
+    <tr><th colspan="2">{#title} [ {#dir} &gt; {#f_file} ]</th></tr>
+    <tr>
+      <td colspan="2"><div style="margin-bottom:0px">&nbsp;</div></td>
+    </tr>
+    <tr valign="top">
+      <td style="width:1px;"><img src="{#thumbnail_url}" alt="" class="miniature" /></td>
+      <td>
+        <table>
+          <tr>
+            <td>{#upload_name} :</td>
+            <td><input type="text" name="name" value="{#f_name}" /> [ {#default} : {#default_name} ]</td>
+          </tr>
+          <tr>
+            <td>{#file} :</td>
+            <td>{#f_file}</td>
+          </tr>
+          <tr>
+            <td>{#size} :</td>
+            <td>{#f_size}</td>
+          </tr>
+          <tr>
+            <td>{#filesize} :</td>
+            <td>{#f_filesize}</td>
+          </tr>
+          <tr>
+            <td>{#registration_date} :</td>
+            <td>{#f_registration_date}</td>
+          </tr>
+          <tr>
+            <td>{#author} :</td>
+            <td><input type="text" name="author" value="{#f_author}" /></td>
+          </tr>
+          <tr>
+            <td>{#creation_date} :</td>
+            <td><input type="text" name="creation_date" value="{#f_creation_date}" /></td>
+          </tr>
+          <tr>
+            <td>{#keywords} :</td>
+            <td><input type="text" name="keywords" value="{#f_keywords}" size="50" /></td>
+          </tr>
+          <tr>
+            <td>{#comment} :</td>
+            <td><textarea name="comment" rows="5" cols="50" style="overflow:auto">{#f_comment}</textarea></td>
+          </tr>
+          <tr>
+            <td valign="top">{#categories} :</td>
+            <td>
+              <table>
+                <!--VTP_linked_category-->
+                <tr>
+                  <td><!--VTP_checkbox--><input type="checkbox" name="dissociate-{#id}" value="1" /><!--/VTP_checkbox--><a href="{#url}">{#name}</a> [ <a href="{#infos_images_link}">{#cat_image_info}</a> ] {#private} {#invisible}
+                </tr>
+                <!--/VTP_linked_category-->
+                <!--VTP_dissociate-->
+                <tr>
+                  <td colspan="2"><img src="../template/{#user_template}/admin/images/arrow_up.gif" alt="&lt;" /> {#dissociate}</td>
+                </tr>
+                <!--/VTP_dissociate-->
+                <tr><td colspan="2">&nbsp;</td></tr>
+                <tr>
+                  <td>{#infoimage_associate}
+                    <select name="associate">
+                      <!--VTP_associate_cat-->
+                      <option value="{#value}">{#content}</option>
+                      <!--/VTP_associate_cat-->
+                    </select>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2"><div style="margin-bottom:0px">&nbsp;</div></td>
+    </tr>
+    <tr>
+      <td colspan="2" align="center">
+        <input type="submit" name="submit" value="{#submit}">
+      </td>
+    </tr>
+  </table>
+</form>