aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-05-15 20:53:08 +0000
committerplegall <plg@piwigo.org>2006-05-15 20:53:08 +0000
commit82e74dc53f0f3ac13b50ee563fed4213911994aa (patch)
treee89676a850c89d772b16b8a001ae82f664c46120
parentf231c5fd003545299b03d63445afa3f77665083e (diff)
merge -r1306:1307 from branch 1.6 into trunk
git-svn-id: http://piwigo.org/svn/trunk@1308 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/element_set_global.php16
-rw-r--r--template/yoga/admin/element_set_global.tpl89
2 files changed, 37 insertions, 68 deletions
diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index 041cbe0cf..1c1013727 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -205,7 +205,6 @@ $template->assign_vars(
'L_SUBMIT'=>$lang['submit'],
- 'U_COLS'=>$base_url.get_query_string_diff(array('cols')),
'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')),
'U_UNIT_MODE'
@@ -339,8 +338,6 @@ $template->assign_vars(array('DATE_CREATION_YEAR_VALUE'=>$year));
// | global mode thumbnails |
// +-----------------------------------------------------------------------+
-$page['cols'] = !empty($_GET['cols']) ? intval($_GET['cols']) : 5;
-
// how many items to display on this page
if (!empty($_GET['display']))
{
@@ -382,10 +379,6 @@ SELECT id,path,tn_ext
if (mysql_num_rows($result) > 0)
{
$template->assign_block_vars('thumbnails', array());
- // first line
- $template->assign_block_vars('thumbnails.line', array());
- // current row displayed
- $row_number = 0;
}
while ($row = mysql_fetch_array($result))
@@ -393,7 +386,7 @@ SELECT id,path,tn_ext
$src = get_thumbnail_src($row['path'], @$row['tn_ext']);
$template->assign_block_vars(
- 'thumbnails.line.thumbnail',
+ 'thumbnails.thumbnail',
array(
'ID' => $row['id'],
'SRC' => $src,
@@ -401,13 +394,6 @@ SELECT id,path,tn_ext
'TITLE' => 'TODO'
)
);
-
- // create a new line ?
- if (++$row_number == $page['cols'])
- {
- $template->assign_block_vars('thumbnails.line', array());
- $row_number = 0;
- }
}
}
diff --git a/template/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index b62243e30..bfd136089 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,27 +145,21 @@
<fieldset>
- <legend>{lang:Elements}</legend>
+ <legend>{lang:Caddie management}</legend>
- <div class="navigationBar">{NAV_BAR}</div>
+ <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 thumbnails -->
- <ul class="thumbnails">
- <!-- BEGIN line -->
- <!-- BEGIN thumbnail -->
- <li><span class="wrap1"><span class="wrap2">
- <label>
- <img src="{thumbnails.line.thumbnail.SRC}"
- alt="{thumbnails.line.thumbnail.ALT}"
- title="{thumbnails.line.thumbnail.TITLE}"
- class="thumbnail" />
- <input type="checkbox" name="selection[]" value="{thumbnails.line.thumbnail.ID}" />
- </label>
- </span></span></li>
- <!-- END thumbnail -->
- <!-- END line -->
+ <!-- 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>
- <!-- END thumbnails -->
+
+ <p><input type="submit" value="{L_SUBMIT}" name="submit_caddie" {TAG_INPUT_ENABLED}/></p>
</fieldset>