iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 377 fixed: the correction of bug 357 was made too quickly... instead of

Browse Source 
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
This commit is contained in:
plegall
2006-05-15 20:46:43 +00:00
parent 1df6aa874f
commit b593bf2fc4
2 changed files with 41 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
admin/element_set_global.php
View File

@@ -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;
}
}
}

99
template/yoga/admin/element_set_global.tpl
View File

@@ -8,47 +8,10 @@
| <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>
<p style="text-align:center;"><input type="submit" value="{L_SUBMIT}" name="submit_caddie" {TAG_INPUT_ENABLED}/></p>
</fieldset>
</form>
<form action="{F_ACTION}" method="post">
<fieldset>
<legend>{lang:Display options}</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>
<p>{lang:elements per page}:
<a href="{U_DISPLAY}&amp;display=20">20</a>
| <a href="{U_DISPLAY}&amp;display=50">50</a>
@@ -58,6 +21,32 @@
</fieldset>
<form action="{F_ACTION}" method="post">
<fieldset>
<legend>{lang:Elements}</legend>
<div class="navigationBar">{NAV_BAR}</div>
<!-- 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>
<fieldset>
<legend>{lang:Form}</legend>
@@ -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>