- elements batch management : element_set page becomes the frontend to

  element_set_global and element_set_unit, infos_images (after a long time
  of use) become deprecated : the more powerful element_set is used
  instead. Consequently, batch management concerns caddie but also "normal
  categories".

- refactoring code in admin.php to include the sub-file (clearer)

- caddie : function fill_caddie replaces the code in category.php and can be
  used in admin/element_set.php

- caddie : caddie table is added in delete_elements function


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

3 files changed, 29 insertions, 8 deletions

diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index 953e15f80..5c86bfdd7 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -49,7 +49,7 @@
   <li><a class="adminMenu" href="{U_WAITING}">{L_WAITING}</a></li>
   <li><a class="adminMenu" href="{U_THUMBNAILS}">{L_THUMBNAILS}</a></li>
   <li><a class="adminMenu" href="{U_COMMENTS}">{L_COMMENTS}</a></li>
-  <li><a class="adminMenu" href="{U_SET}">Caddie</a></li>
+  <li><a class="adminMenu" href="{U_CADDIE}">Caddie</a></li>
 </ul>
 </div>
 <div class="titreMenu">{L_IDENTIFY}</div>
diff --git a/template/default/admin/element_set_global.tpl b/template/default/admin/element_set_global.tpl
index d3abb16ad..edaba7b87 100644
--- a/template/default/admin/element_set_global.tpl
+++ b/template/default/admin/element_set_global.tpl
@@ -1,3 +1,5 @@
+<div class="admin">{CATEGORY_TITLE}</div>
+
 <p style="text-align:center;">
   global mode 
   | <a href="{U_UNIT_MODE}">unit mode</a>
@@ -10,8 +12,16 @@
   <legend>Caddie management</legend>
 
   <ul style="list-style-type:none;">
+
+    <!-- BEGIN in_caddie -->
     <li><input type="radio" name="caddie_action" value="empty_all" /> Empty caddie</li>
     <li><input type="radio" name="caddie_action" value="empty_selected" /> Take selected elements out of caddie</li>
+    <!-- END in_caddie -->
+
+    <!-- BEGIN not_in_caddie -->
+    <li><input type="radio" name="caddie_action" value="add_selected" /> Add selected elements to caddie</li>
+    <!-- END not_in_caddie -->
+  
   </ul>
 
   <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" class="bouton" /></p>
@@ -23,13 +33,20 @@
   <legend>Display options</legend>
 
   <p>elements per line :
-      <a href="{U_ELEMENTS_LINE}&amp;display=4">4</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=5">5</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=6">6</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=7">7</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=8">8</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=9">9</a>
-    | <a href="{U_ELEMENTS_LINE}&amp;display=10">10</a>
+      <a href="{U_COLS}&amp;cols=4">4</a>
+    | <a href="{U_COLS}&amp;cols=5">5</a>
+    | <a href="{U_COLS}&amp;cols=6">6</a>
+    | <a href="{U_COLS}&amp;cols=7">7</a>
+    | <a href="{U_COLS}&amp;cols=8">8</a>
+    | <a href="{U_COLS}&amp;cols=9">9</a>
+    | <a href="{U_COLS}&amp;cols=10">10</a>
+  </p>
+
+  <p>elements per page :
+      <a href="{U_DISPLAY}&amp;display=20">20</a>
+    | <a href="{U_DISPLAY}&amp;display=50">50</a>
+    | <a href="{U_DISPLAY}&amp;display=100">100</a>
+    | <a href="{U_DISPLAY}&amp;display=all">all</a>
   </p>
 
 </fieldset>
@@ -140,6 +157,8 @@
 
   <legend>Elements</legend>
 
+  <div class="navigationBar">{NAV_BAR}</div>
+
   <!-- BEGIN thumbnails -->
   <table valign="top" align="center" class="thumbnail">
     <!-- BEGIN line -->
diff --git a/template/default/admin/element_set_unit.tpl b/template/default/admin/element_set_unit.tpl
index 28ada6196..48dac9046 100644
--- a/template/default/admin/element_set_unit.tpl
+++ b/template/default/admin/element_set_unit.tpl
@@ -1,3 +1,5 @@
+<div class="admin">{CATEGORY_TITLE}</div>
+
 <p style="text-align:center;">
   <a href="{U_GLOBAL_MODE}">global mode</a>
   | unit mode