adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-11 11:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue 0000684: History [Search] - Add a thumbnail display

Browse Source 
o Display choice can be selected
  o Display choice is saved on on cookie
  o Small improvement picture link (hoverbox on all the link, alt&title on classic mode)
  o New cookie functions and use


Enhance computing method of script_basename function.

http://forum.phpwebgallery.net/viewtopic.php?pid=58258#p58258

Merge BSF 1988:1989 into branch-1_7

git-svn-id: http://piwigo.org/svn/trunk@1992 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-05-01 13:57:52 +00:00
parent f1494f1893
commit 20c284546f
8 changed files with 234 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/history.php
+64 -25
View File
@@ -28,11 +28,6 @@
* Display filtered history lines
*/
// echo '<pre>$_POST:
// '; print_r($_POST); echo '</pre>';
// echo '<pre>$_GET:
// '; print_r($_GET); echo '</pre>';
// +-----------------------------------------------------------------------+
// | functions |
// +-----------------------------------------------------------------------+
@@ -59,6 +54,7 @@ else
}
$types = array('none', 'picture', 'high', 'other');
$display_thumbnails = array('no_display_thumbnail', 'display_thumbnail_classic', 'display_thumbnail_hoverbox');
// +-----------------------------------------------------------------------+
// | Check Access and exit when user status is not ok |
@@ -114,6 +110,10 @@ if (isset($_POST['submit']))
);
}
$search['fields']['display_thumbnail'] = $_POST['display_thumbnail'];
// Display choise are also save to one cookie
pwg_set_cookie_var('history_display_thumbnail', $_POST['display_thumbnail']);
// TODO manage inconsistency of having $_POST['image_id'] and
// $_POST['filename'] simultaneously
@@ -560,37 +560,52 @@ SELECT
'image_id' => $line['image_id'],
)
);
// <a class="thumbnail" href="#thumb">(1258)<span><img src="./galleries/category/thumbnail/th-dsc1258.png"></span></a>
$element = array(
'id' => $line['image_id'],
'file' => $file_of_image[$line['image_id']],
'path' => $path_of_image[$line['image_id']],
'tn_ext' => $tn_ext_of_image[$line['image_id']],
);
$image_string = '';
if (!isset($conf['history_no_thumb']) or $conf['history_no_thumb']) {
$thumb_mode = "over";
if (isset($conf['history_no_hover']) and $conf['history_no_hover']) {
$thumb_mode = "thumbnail";
}
$image_string = '<a class="'.$thumb_mode.'" href="#thumb">'
.'('.$line['image_id'].') <span><img src="'
. get_thumbnail_url( $element )
.'"></span></a><a href="'.$picture_url.'">';
}
else {
$image_string= '<a href="'.$picture_url.'">';
$image_string.= '('.$line['image_id'].')';
}
$image_title = '('.$line['image_id'].')';
if (isset($label_of_image[$line['image_id']]))
{
$image_string.= ' '.$label_of_image[$line['image_id']];
$image_title.= ' '.$label_of_image[$line['image_id']];
}
else
{
$image_string.= ' unknown filename';
$image_title.= ' unknown filename';
}
$image_string = '';
switch ($page['search']['fields']['display_thumbnail'])
{
case 'no_display_thumbnail':
{
$image_string= '<a href="'.$picture_url.'">'.$image_title.'</a>';
break;
}
case 'display_thumbnail_classic':
{
$image_string =
'<a class="thumbnail" href="'.$picture_url.'">'
.'<span><img src="'.get_thumbnail_url($element)
.'" alt="'.$image_title.'" title="'.$image_title.'">'
.'</span></a>';
break;
}
case 'display_thumbnail_hoverbox':
{
$image_string =
'<a class="over" href="'.$picture_url.'">'
.'<span><img src="'.get_thumbnail_url($element)
.'" alt="'.$image_title.'" title="'.$image_title.'">'
.'</span>'.$image_title.'</a>';
break;
}
}
}
@@ -726,6 +741,8 @@ if (isset($page['search']))
$form['image_id'] = @$page['search']['fields']['image_id'];
$form['filename'] = @$page['search']['fields']['filename'];
$form['display_thumbnail'] = @$page['search']['fields']['display_thumbnail'];
}
else
{
@@ -735,6 +752,9 @@ else
$form['start_month'] = $form['end_month'] = date('n');
$form['start_day'] = $form['end_day'] = date('j');
$form['types'] = $types;
// Hoverbox by default
$form['display_thumbnail'] =
pwg_get_cookie_var('history_display_thumbnail', $display_thumbnails[2]);
}
// start date
@@ -809,7 +829,26 @@ while ($row = mysql_fetch_array($result))
)
);
}
foreach ($display_thumbnails as $display_thumbnail)
{
$selected = '';
if ($display_thumbnail === $form['display_thumbnail'])
{
$selected = 'selected="selected"';
}
$template->assign_block_vars(
'display_thumbnail',
array(
'VALUE' => $display_thumbnail,
'CONTENT' => l10n($display_thumbnail),
'SELECTED' => $selected,
)
);
}
// +-----------------------------------------------------------------------+
// | html code display |
// +-----------------------------------------------------------------------+