[popups] Make the folder/album thumbnail popups respect the global

popup settings.  Should (partially?) resolve #376.
This commit is contained in:
Solomon Peachy 2008-09-11 20:36:30 -04:00
parent 09522ea807
commit 1f199e1834
2 changed files with 6 additions and 5 deletions

View File

@ -16,6 +16,7 @@ For further information about Photo Organizer, see its web site at:
[fix] Rotating images could lead to a blank page. [#377]
[fix] Two memcache-related bugs.
[misc] When deleting a photo, return to the folder listing. [#379]
[fix] Album/Folder thumbnails respect the global popup flag [#376]
2.36 (August 17, 2008)

View File

@ -203,7 +203,7 @@ function display_popup_delay_combo($identifier, $popup_delay, $popup_enabled) {
print emit_option('f', $strings['generic']['disabled'], $popup_enabled == 'f');
for ($i=100; $i <= 2000; $i+=100) {
print emit_option($i, "$i ".$strings['generic']['msec'], $i == $popup_delay);
print emit_option($i, "$i ".$strings['generic']['msec'], (($i == $popup_delay) && !$popup_enabled));
}
print "</select>";
}
@ -1405,7 +1405,7 @@ function display_albums($database, $album_id, $owner_user_id, $owner_user_type,
} else {
$tt = "";
if ($album['thumb_ver']) {
if (($po_options['popup_enable'] == 't') && $album['thumb_ver']) {
$tt .= "<div class=\"hide_tooltip\" id=\"album_tip_$album[identifier]\">";
$tt .= "<img src=\"".generate_link('image', '', array('ver'=>$album['thumb_ver'], 'size'=>1)) ."\" alt=\"\" />";
$tt .= "</div>\n";
@ -1582,7 +1582,7 @@ order by $sql_query_order_by_string");
$trash = $folder;
} else {
$tt = "";
if ($folder['thumb_ver']) {
if (($po_options['popup_enable'] == 't') && $folder['thumb_ver']) {
$tt .= "<div class=\"hide_tooltip\" id=\"folder_tip_$folder[identifier]\">";
$tt .= "<img src=\"".generate_link('image', '', array('ver'=>$folder['thumb_ver'], 'size'=>1)) ."\" alt=\"\" />";
$tt .= "</div>\n";
@ -1654,7 +1654,7 @@ function display_folder_with_users($database, $my_user_id, $folder_list, $uri =
$folder = pg_fetch_assoc($folder_list, $i);
$tt = "";
if ($folder['thumb_ver']) {
if (($po_options['popup_enable'] == 't') && $folder['thumb_ver']) {
$tt .= "<div class=\"hide_tooltip\" id=\"folder_tip_$folder[identifier]\">";
$tt .= "<img src=\"".generate_link('image', '', array('ver'=>$folder['thumb_ver'], 'size'=>1)) ."\" alt=\"\" />";
$tt .= "</div>\n";
@ -1708,7 +1708,7 @@ function display_album_with_users($database, $my_user_id, $album_list, $uri = ""
print "<tr>\n";
$tt = "";
if ($album['thumb_ver']) {
if (($po_options['popup_enable'] == 't') && $album['thumb_ver']) {
$tt .= "<div class=\"hide_tooltip\" id=\"album_tip_$album[album_id]\">";
$tt .= "<img src=\"".generate_link('image', '', array('ver'=>$album['thumb_ver'], 'size'=>1)) ."\" alt=\"\" />";
$tt .= "</div>\n";