improvement: tags replace keywords. Better data model, less

limitations. Each image can be associated to as many tag as needed. Tags can
contain non ASCII characters. Oriented navigation with tags by association.


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

5 files changed, 66 insertions, 15 deletions

diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index 785e312d9..6f0a58789 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -54,6 +54,7 @@
 	<li><a href="{U_COMMENTS}">{lang:comments}</a></li>
 	<li><a href="{U_RATING}">{lang:Rating}</a></li>
 	<li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
+	<li><a href="{U_TAGS}">{lang:Tags}</a></li>
       </ul>
     </dd>
 
diff --git a/template/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index 53c956d40..a4e46508c 100644
--- a/template/yoga/admin/element_set_global.tpl
+++ b/template/yoga/admin/element_set_global.tpl
@@ -83,21 +83,15 @@
     </tr>
 
     <tr>
-      <td>{lang:add keywords}</td>
-      <td><input type="text" name="add_keywords" value="" /></td>
+      <td>{lang:add tags}</td>
+      <td>{ADD_TAG_SELECTION}</td>
     </tr>
 
     <tr>
-      <td>{lang:remove keyword}</td>
-      <td>
-        <select name="remove_keyword">
-          <!-- BEGIN remove_keyword_option -->
-          <option value="{remove_keyword_option.VALUE}">{remove_keyword_option.OPTION}</option>
-          <!-- END remove_keyword_option -->
-        </select>
-      </td>
+      <td>{lang:remove tags}</td>
+      <td>{DEL_TAG_SELECTION}</td>
     </tr>
-
+    
     <tr>
       <td>{lang:author}</td>
       <td>
diff --git a/template/yoga/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl
index a5e718012..63b7fa5b6 100644
--- a/template/yoga/admin/element_set_unit.tpl
+++ b/template/yoga/admin/element_set_unit.tpl
@@ -69,8 +69,8 @@
     </tr>
 
     <tr>
-      <td><strong>{lang:Keywords}</strong></td>
-      <td><input type="text" name="keywords-{element.ID}" value="{element.KEYWORDS}" size="50" /></td>
+      <td><strong>{lang:Tags}</strong></td>
+      <td>{element.TAG_SELECTION}</td>
     </tr>
 
     <tr>
diff --git a/template/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index 2be4547dd..c10e7744e 100644
--- a/template/yoga/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
@@ -99,10 +99,11 @@
       </tr>
 
       <tr>
-        <td><strong>{lang:Keywords}</strong></td>
-        <td><input type="text" name="keywords" value="{KEYWORDS}" size="50" /></td>
+        <td><strong>{lang:Tags}</strong></td>
+        <td>{TAG_SELECTION}</td>
       </tr>
 
+      
       <tr>
         <td><strong>{lang:Description}</strong></td>
         <td><textarea name="description" class="description">{DESCRIPTION}</textarea></td>
diff --git a/template/yoga/admin/tags.tpl b/template/yoga/admin/tags.tpl
new file mode 100644
index 000000000..c39181580
--- /dev/null
+++ b/template/yoga/admin/tags.tpl
@@ -0,0 +1,55 @@
+<div class="titrePage">
+  <h2>{lang:Manage tags}</h2>
+</div>
+
+<form action="{F_ACTION}" method="post">
+
+  <!-- BEGIN edit_tags -->
+  <input type="hidden" name="edit_list" value="{edit_tags.LIST}" />
+
+  <fieldset>
+    <legend>{lang:Edit tags}</legend>
+
+    <table class="table2">
+      <tr class="throw">
+        <th>{lang:Current name}</th>
+        <th>{lang:New name}</th>
+      </tr>
+      <!-- BEGIN tag -->
+      <tr>
+        <td>{edit_tags.tag.NAME}</td>
+        <td><input type="text" name="tag_name-{edit_tags.tag.ID}" value="{edit_tags.tag.NAME}" /></td>
+      </tr>
+      <!-- END tag -->
+    </table>
+
+    <p>
+      <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED} />
+      <input type="reset" value="{lang:Reset}" />
+    </p>
+  </fieldset>
+  <!-- END edit_tags -->
+
+  <fieldset>
+    <legend>{lang:Add a tag}</legend>
+
+    <label>
+      {lang:New tag}
+      <input type="text" name="add_tag" />
+    </label>
+    
+    <p><input type="submit" name="add" value="{lang:Submit}" {TAG_INPUT_ENABLED}/></p>
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:Tag selection}</legend>
+    
+    {TAG_SELECTION}
+
+    <p>
+      <input type="submit" name="edit" value="{lang:Edit selected tags}" {TAG_INPUT_ENABLED}/>
+      <input type="submit" name="delete" value="{lang:Delete selected tags}" {TAG_INPUT_ENABLED}/>
+    </p>
+  </fieldset>
+
+</form>