feature deleted: code for categories link was too complicated for such a

simple fature. Replaced by static association. Links are not persistent
anymore.

modification removed: #image_category.is_storage replaced by
#images.storage_category_id as in branche 1.5..


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

1 files changed, 16 insertions, 45 deletions

diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index 8101e7ffa..3212d190e 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
@@ -140,16 +140,16 @@
 <form action="{F_ACTION}" method="POST" id="links">
   
 <fieldset>
-  <legend>{lang:Create a destination category}</legend>
+  <legend>{lang:Link all category elements to a new category}</legend>
 
   <table>
     <tr>
-      <td>{lang:virtual category name}</td>
+      <td>{lang:Virtual category name}</td>
       <td><input type="text" name="virtual_name"></td>
     </tr>
 
     <tr>
-      <td>{lang:parent category}</td>
+      <td>{lang:Parent category}</td>
       <td>
         <select class="categoryList" name="parent">
           <!-- BEGIN category_option_parent -->
@@ -160,7 +160,7 @@
     </tr>
   </table>
 
-  <p style="text-align:center;">
+  <p>
     <input type="submit" value="{lang:Submit}" name="submitAdd" {TAG_INPUT_ENABLED}/>
     <input type="reset" value="{lang:Reset}" name="reset" />
   </p>  
@@ -168,55 +168,26 @@
 </fieldset>
 
 <fieldset>
-  <legend>{lang:Source/destination links}</legend>
+  <legend>{lang:Link all category elements to some existing categories}</legend>
 
-  <table class="doubleSelect">
+  <table>
     <tr>
+      <td>{lang:Categories}</td>
       <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;" {TAG_INPUT_ENABLED}/></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 class="categoryList" name="destinations[]" multiple="multiple" size="5">
+          <!-- BEGIN category_option_destination -->
+          <option {category_option_destination.SELECTED} value="{category_option_destination.VALUE}">{category_option_destination.OPTION}</option>
+          <!-- END category_option_destination -->
         </select>
-        <p><input type="submit" value="&laquo;" name="destination_trueify" style="font-size:15px;" {TAG_INPUT_ENABLED}/></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;" {TAG_INPUT_ENABLED}/></p>
-      </td>
+  <p>
+    <input type="submit" value="{lang:Submit}" name="submitDestinations" {TAG_INPUT_ENABLED}/>
+    <input type="reset" value="{lang:Reset}" name="reset" />
+  </p>  
 
-      <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;" {TAG_INPUT_ENABLED}/></p>
-      </td>
-    </tr>
-  </table>
-  
 </fieldset>
+
 </form>