new feature: source/destination links between categories. Will we keep this

feature? Code is complicated and very few people will understand how it
works...

modification: #images.storage_category_id replaced by
#image_category.is_storage

improvement: many code refactoring to improve readibility

improvement: virtual category creation code was moved to a dedicated
function in order to be called from admin/cat_list.php and
admin/cat_modify.php (create a new destination category)


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

2 files changed, 84 insertions, 1 deletions

diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index 971f84393..b19577dc2 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
@@ -45,7 +45,6 @@
 <form id="addVirtual" action="{F_ACTION}" method="post">
   <p>
     {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
-    <input type="hidden" name="rank" value="{NEXT_RANK}"/>
     <input type="submit" value="{L_SUBMIT}" name="submitAdd" />
   </p>
 </form>
diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index c1a4b1d5a..8e08baafd 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
@@ -136,3 +136,87 @@
 <!-- END representant -->
 
 </form>
+
+<form action="{F_ACTION}" method="POST" id="links">
+  
+<fieldset>
+  <legend>{lang:Create a destination category}</legend>
+
+  <table>
+    <tr>
+      <td>{lang:virtual category name}</td>
+      <td><input type="text" name="virtual_name"></td>
+    </tr>
+
+    <tr>
+      <td>{lang:parent category}</td>
+      <td>
+        <select class="categoryList" name="parent">
+          <!-- BEGIN category_option_parent -->
+          <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
+          <!-- END category_option_parent -->
+        </select>
+      </td>
+    </tr>
+  </table>
+
+  <p style="text-align:center;">
+    <input type="submit" value="{lang:Submit}" name="submitAdd" />
+    <input type="reset" value="{lang:Reset}" name="reset" />
+  </p>  
+
+</fieldset>
+
+<fieldset>
+  <legend>{lang:Source/destination links}</legend>
+
+  <table class="doubleSelect">
+    <tr>
+      <td>
+        <h3>{lang:Destination categories}</h3>
+        <select class="categoryList" name="destination_true[]" multiple="multiple" size="30">
+          <!-- BEGIN destination_option_true -->
+          <option {destination_option_true.SELECTED} value="{destination_option_true.VALUE}">{destination_option_true.OPTION}</option>
+          <!-- END destination_option_true -->
+        </select>
+        <p><input type="submit" value="&raquo;" name="destination_falsify" style="font-size:15px;"/></p>
+      </td>
+
+      <td>
+        <h3>{lang:Non destination categories}</h3>
+        <select class="categoryList" name="destination_false[]" multiple="multiple" size="30">
+          <!-- BEGIN destination_option_false -->
+          <option {destination_option_false.SELECTED} value="{destination_option_false.VALUE}">{destination_option_false.OPTION}</option>
+          <!-- END destination_option_false -->
+        </select>
+        <p><input type="submit" value="&laquo;" name="destination_trueify" style="font-size:15px;" /></p>
+      </td>
+    </tr>
+  </table>
+
+  <table class="doubleSelect">
+    <tr>
+      <td>
+        <h3>{lang:Source categories}</h3>
+        <select class="categoryList" name="source_true[]" multiple="multiple" size="30">
+          <!-- BEGIN source_option_true -->
+          <option {source_option_true.SELECTED} value="{source_option_true.VALUE}">{source_option_true.OPTION}</option>
+          <!-- END source_option_true -->
+        </select>
+        <p><input type="submit" value="&raquo;" name="source_falsify" style="font-size:15px;"/></p>
+      </td>
+
+      <td>
+        <h3>{lang:Non source categories}</h3>
+        <select class="categoryList" name="source_false[]" multiple="multiple" size="30">
+          <!-- BEGIN source_option_false -->
+          <option {source_option_false.SELECTED} value="{source_option_false.VALUE}">{source_option_false.OPTION}</option>
+          <!-- END source_option_false -->
+        </select>
+        <p><input type="submit" value="&laquo;" name="source_trueify" style="font-size:15px;" /></p>
+      </td>
+    </tr>
+  </table>
+  
+</fieldset>
+</form>