- improvement : screen admin/picture_modify rewritten. Presentation copied

  from admin/cat_modify : fieldsets regroup fields. Ability to synchronize
  metadata for the displayed item.

- bug 110 fixed : "return to element view from element edition fails
  depending on permissions". If a reachable (for the connected admin)
  category is available, a "jump to" link is displayed, by default, using
  the category given in URL.

- bug fixed : in mass_updates function, the first item of $fields['update']
  has not always 0 for id (as in any array).

- modification : get_keywords function understands spaces as separator,
  allow less than 3 chars keywords, allow quotes.

- new : ability to allow HTML in picture or category description (false by
  default)


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

4 files changed, 137 insertions, 68 deletions

diff --git a/template/default/admin/cat_perm.tpl b/template/default/admin/cat_perm.tpl
index 0cddb2549..b71cdedc9 100644
--- a/template/default/admin/cat_perm.tpl
+++ b/template/default/admin/cat_perm.tpl
@@ -1,4 +1,6 @@
-<h1>{TITLE}</h1>
+<h1>{lang:Manage permissions for a category}</h1>
+
+<h2>{CATEGORIES_NAV}</h2>
 
 <form action="{F_ACTION}" method="post" id="categoryPermissions">
 
diff --git a/template/default/admin/picture_modify.tpl b/template/default/admin/picture_modify.tpl
index f16dce412..d59c69f59 100644
--- a/template/default/admin/picture_modify.tpl
+++ b/template/default/admin/picture_modify.tpl
@@ -1,75 +1,131 @@
 <h1>{lang:title_picmod}</h1>
 
-<div class="admin">{TITLE_IMG}</div>
-<form action="{F_ACTION}" method="POST">
-  <table style="width:100%;">
-    <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>
-    </tr>
-    <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>
+<img src="{TN_SRC}" alt="{lang:thumbnail}" class="thumbnail" />
+
+<ul class="categoryActions">
+  <!-- BEGIN jumpto -->
+  <li><a href="{jumpto.URL}" title="{lang:jump to image}"><img src="./template/default/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
+  <!-- END jumpto -->
+  <li><a href="{U_SYNC}" title="{lang:synchronize metadata}"><img src="./template/default/theme/sync_metadata.png" alt="{lang:synchronize}" /></a></li>
+</ul>
+
+<form action="{F_ACTION}" method="post">
+
+  <fieldset>
+    <legend>{lang:Informations}</legend>
+
+    <table>
+
+      <tr>
+        <td><strong>{lang:Path}</strong></td>
+        <td>{PATH}</td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Registration date}</strong></td>
+        <td>{REGISTRATION_DATE}</td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Dimensions}</strong></td>
+        <td>{DIMENSIONS}</td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Filesize}</strong></td>
+        <td>{FILESIZE}</td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Storage category}</strong></td>
+        <td>{STORAGE_CATEGORY}</td>
+      </tr>
+
+      <!-- BEGIN links -->
+      <tr>
+        <td><strong>{lang:Linked categories}</strong></td>
+        <td>
+          <ul>
+            <!-- BEGIN category -->
+            <li>{links.category.NAME}</li>
+            <!-- END category -->
+          </ul>
+        </td>
+      </tr>
+      <!-- END links -->
+
+    </table>
+
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:Properties}</legend>
+
+    <table>
+
+      <tr>
+        <td><strong>{lang:Name}</strong></td>
+        <td><input type="text" name="name" value="{NAME}" /></td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Author}</strong></td>
+        <td><input type="text" name="author" value="{AUTHOR}" /></td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Creation date}</strong></td>
+        <td>
+          <label><input type="radio" name="date_creation_action" value="unset" /> unset</label>
+          <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> set to
+          <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_day">
+            <!-- BEGIN date_creation_day -->
+            <option {date_creation_day.SELECTED} value="{date_creation_day.VALUE}">{date_creation_day.OPTION}</option>
+            <!-- END date_creation_day -->
+          </select>
+          <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_month">
+            <!-- BEGIN date_creation_month -->
+            <option {date_creation_month.SELECTED} value="{date_creation_month.VALUE}">{date_creation_month.OPTION}</option>
+            <!-- END date_creation_month -->
+          </select>
+          <input onmousedown="document.getElementById('date_creation_action_set').checked = true;"
+                 name="date_creation_year"
+                 type="text"
+                 size="4"
+                 maxlength="4"
+                 value="{DATE_CREATION_YEAR_VALUE}" />
+        </td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Keywords}</strong></td>
+        <td><input type="text" name="keywords" value="{KEYWORDS}" size="50" /></td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Description}</strong></td>
+        <td><textarea name="description" rows="5" cols="50" style="overflow:auto">{DESCRIPTION}</textarea></td>
+      </tr>
+
+    </table>
+
+    <p style="text-align:center;">
+      <input type="submit" value="{lang:Submit}" name="submit" />
+      <input type="reset" value="{lang:Reset}" name="reset" />
+    </p>
+
+  </fieldset>
+
 </form>
 
-<form name="form1" method="post" action="{F_ACTION}">
+<form id="associations" method="post" action="{F_ACTION}#associations">
   <fieldset>
     <legend>{lang:Association to categories}</legend>
 
     <table class="doubleSelect">
       <tr>
         <td>
-          <h3>{L_CAT_ASSOCIATED}</h3>
+          <h3>{lang:Associated}</h3>
           <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30">
             <!-- BEGIN associated_option -->
             <option {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
@@ -79,7 +135,7 @@
         </td>
 
         <td>
-          <h3>{L_CAT_DISSOCIATED}</h3>
+          <h3>{lang:Dissociated}</h3>
           <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30">
             <!-- BEGIN dissociated_option -->
             <option {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
@@ -93,14 +149,14 @@
   </fieldset>
 </form>
 
-<form name="form2" method="post" action="{F_ACTION}">
+<form id="representation" method="post" action="{F_ACTION}#representation">
   <fieldset>
     <legend>{lang:Representation of categories}</legend>
 
     <table class="doubleSelect">
       <tr>
         <td>
-          <h3>{L_REPRESENTS}</h3>
+          <h3>{lang:Represents}</h3>
           <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30">
             <!-- BEGIN elected_option -->
             <option {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
@@ -110,7 +166,7 @@
         </td>
 
         <td>
-          <h3>{L_DOESNT_REPRESENT}</h3>
+          <h3>{lang:Does not represent}</h3>
           <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30">
             <!-- BEGIN dismissed_option -->
             <option {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
diff --git a/template/default/default.css b/template/default/default.css
index ac65a076b..2b7ad8bbb 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -426,6 +426,11 @@ form#categoryOrdering ul.categoryActions {
   margin-top: 5px;
 }
 
+ul.categoryActions {
+  margin: 5px;
+  padding: 5px;
+}
+
 div.titrePage ul.categoryActions {
   float: right;
   margin: 0;
@@ -604,4 +609,10 @@ div#adminMain>fieldset {
 
 fieldset>legend {
   font-style: italic;
-}
\ No newline at end of file
+}
+
+div#adminMain img.thumbnail {
+  border: 1px solid white;
+  margin: 0 auto;
+  display: block;
+}
diff --git a/template/default/theme/sync_metadata.png b/template/default/theme/sync_metadata.png
new file mode 100644
index 000000000..36050cf3d
--- /dev/null
+++ b/template/default/theme/sync_metadata.png