diff options
author | plegall <plg@piwigo.org> | 2006-05-15 20:46:43 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2006-05-15 20:46:43 +0000 |
commit | b593bf2fc485b04d6cc83a60e4111c243e3fbf3a (patch) | |
tree | 84bfda4ee1be433bca4b61a481d0c3c692e459a7 /admin | |
parent | 1df6aa874f88970579d56ab88df46cad4764d7e0 (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 '')
-rw-r--r-- | admin/element_set_global.php | 16 |
1 files changed, 1 insertions, 15 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; - } } } |