aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-05-15 20:46:43 +0000
committerplegall <plg@piwigo.org>2006-05-15 20:46:43 +0000
commitb593bf2fc485b04d6cc83a60e4111c243e3fbf3a (patch)
tree84bfda4ee1be433bca4b61a481d0c3c692e459a7 /template
parent1df6aa874f88970579d56ab88df46cad4764d7e0 (diff)
bug 377 fixed: the correction of bug 357 was made too quickly... instead of
having two forms, a reordering of the fieldset fixes bug 357 without creating bug 377. improvement: taken from trunk and made by chrisaga, no need to set the number of columns, it's automatic jsut as in the thumbnails public display. git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1307 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'template')
-rw-r--r--template/yoga/admin/element_set_global.tpl95
1 files changed, 38 insertions, 57 deletions
diff --git a/template/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index afe4a735c..494be1a49 100644
--- a/template/yoga/admin/element_set_global.tpl
+++ b/template/yoga/admin/element_set_global.tpl
@@ -8,53 +8,42 @@
| <a href="{U_UNIT_MODE}">{lang:unit mode}</a>
</p>
-<form action="{F_ACTION}" method="post">
-
<fieldset>
- <legend>{lang:Caddie management}</legend>
-
- <ul style="list-style-type:none;">
-
- <!-- BEGIN in_caddie -->
- <li><label><input type="radio" name="caddie_action" value="empty_all" /> {lang:Empty caddie}</label></li>
- <li><label><input type="radio" name="caddie_action" value="empty_selected" /> {lang:Take selected elements out of caddie}</label></li>
- <!-- END in_caddie -->
-
- <!-- BEGIN not_in_caddie -->
- <li><input type="radio" name="caddie_action" value="add_selected" /> {lang:Add selected elements to caddie}</li>
- <!-- END not_in_caddie -->
-
- </ul>
+ <legend>{lang:Display options}</legend>
- <p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" {TAG_INPUT_ENABLED}/></p>
+ <p>{lang: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">{lang:all}</a>
+ </p>
</fieldset>
-</form>
-
<form action="{F_ACTION}" method="post">
<fieldset>
- <legend>{lang:Display options}</legend>
+ <legend>{lang:Elements}</legend>
- <p>{lang:elements per line}:
- <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>
+ <div class="navigationBar">{NAV_BAR}</div>
- <p>{lang: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">{lang:all}</a>
- </p>
+ <!-- BEGIN thumbnails -->
+ <ul class="thumbnails">
+ <!-- BEGIN thumbnail -->
+ <li><span class="wrap1"><span class="wrap2">
+ <label>
+ <img src="{thumbnails.thumbnail.SRC}"
+ alt="{thumbnails.thumbnail.ALT}"
+ title="{thumbnails.thumbnail.TITLE}"
+ class="thumbLink" />
+ <input type="checkbox" name="selection[]" value="{thumbnails.thumbnail.ID}" />
+ </label>
+ </li>
+ <!-- END thumbnail -->
+ </ul>
+ <!-- END thumbnails -->
</fieldset>
@@ -156,30 +145,22 @@
<fieldset>
- <legend>{lang:Elements}</legend>
+ <legend>{lang:Caddie management}</legend>
- <div class="navigationBar">{NAV_BAR}</div>
+ <ul style="list-style-type:none;">
- <!-- BEGIN thumbnails -->
- <!--table valign="top" align="center" class="thumbnail"-->
- <table class="thumbnail">
- <!-- BEGIN line -->
- <tr>
- <!-- BEGIN thumbnail -->
- <td class="thumbnail">
- <label>
- <img src="{thumbnails.line.thumbnail.SRC}"
- alt="{thumbnails.line.thumbnail.ALT}"
- title="{thumbnails.line.thumbnail.TITLE}"
- class="thumbLink" />
- <input type="checkbox" name="selection[]" value="{thumbnails.line.thumbnail.ID}" />
- </label>
- </td>
- <!-- END thumbnail -->
- </tr>
- <!-- END line -->
- </table>
- <!-- END thumbnails -->
+ <!-- BEGIN in_caddie -->
+ <li><label><input type="radio" name="caddie_action" value="empty_all" /> {lang:Empty caddie}</label></li>
+ <li><label><input type="radio" name="caddie_action" value="empty_selected" /> {lang:Take selected elements out of caddie}</label></li>
+ <!-- END in_caddie -->
+
+ <!-- BEGIN not_in_caddie -->
+ <li><label><input type="radio" name="caddie_action" value="add_selected" /> {lang:Add selected elements to caddie}</label></li>
+ <!-- END not_in_caddie -->
+
+ </ul>
+
+ <p><input type="submit" value="{L_SUBMIT}" name="submit_caddie" {TAG_INPUT_ENABLED}/></p>
</fieldset>