From a1833e40a2d81135bf72fb59abeb76c39030d5a5 Mon Sep 17 00:00:00 2001 From: rvelices Date: Sun, 12 Feb 2012 10:02:59 +0000 Subject: improvement of picture title on picture page, drop boxes on index page ... sharpening uses a zider scale range git-svn-id: http://piwigo.org/svn/trunk@13115 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/image.class.php | 4 ++-- include/category_default.inc.php | 6 ++---- include/config_default.inc.php | 4 ---- picture.php | 1 - template-extension/distributed/samples/my-picture.tpl | 2 -- themes/default/template/index.tpl | 7 ++++--- themes/default/template/picture.tpl | 5 +---- themes/default/template/slideshow.tpl | 4 +--- themes/default/theme.css | 14 ++------------ 9 files changed, 12 insertions(+), 35 deletions(-) diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 86ef35a69..2781ba984 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -265,8 +265,8 @@ class pwg_image /** Returns a normalized convolution kernel for sharpening*/ static function get_sharpen_matrix($amount) { - // Amount should be in the range of 18-10 - $amount = round(abs(-18 + ($amount * 0.08)), 2); + // Amount should be in the range of 24-10 + $amount = round(abs(-24 + ($amount * 0.14)), 2); $matrix = array ( diff --git a/include/category_default.inc.php b/include/category_default.inc.php index 454d1e1e5..444ffd826 100644 --- a/include/category_default.inc.php +++ b/include/category_default.inc.php @@ -37,7 +37,7 @@ $selection = array_slice( if (count($selection) > 0) { - $rank_of = array_flip($page['items']); + $rank_of = array_flip($selection); $query = ' SELECT * @@ -48,8 +48,7 @@ SELECT * while ($row = pwg_db_fetch_assoc($result)) { $row['rank'] = $rank_of[ $row['id'] ]; - - array_push($pictures, $row); + $pictures[] = $row; } usort($pictures, 'rank_compare'); @@ -113,7 +112,6 @@ foreach ($pictures as $row) $desc = render_element_description($row); $tpl_var = array_merge( $row, array( - 'TN_SRC' => DerivativeImage::thumb_url($row), 'TN_ALT' => htmlspecialchars(strip_tags($name)), 'TN_TITLE' => get_thumbnail_title($row, $name, $desc), 'URL' => $url, diff --git a/include/config_default.inc.php b/include/config_default.inc.php index dad6e9b20..d09ebf302 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -193,10 +193,6 @@ $conf['header_notes'] = array(); // show_thumbnail_caption : on thumbnails page, show thumbnail captions ? $conf['show_thumbnail_caption'] = true; -// show_picture_name_on_title : on picture presentation page, show picture -// name ? -$conf['show_picture_name_on_title'] = true; - // display_fromto: display the date creation bounds of a // category. $conf['display_fromto'] = false; diff --git a/picture.php b/picture.php index a31a3d94f..6763ee881 100644 --- a/picture.php +++ b/picture.php @@ -717,7 +717,6 @@ $template->assign( array( 'SECTION_TITLE' => $page['title'], 'PHOTO' => $title_nb, - 'SHOW_PICTURE_NAME_ON_TITLE' => $conf['show_picture_name_on_title'], 'IS_HOME' => ('categories'==$page['section'] and !isset($page['category']) ), 'LEVEL_SEPARATOR' => $conf['level_separator'], diff --git a/template-extension/distributed/samples/my-picture.tpl b/template-extension/distributed/samples/my-picture.tpl index 0bf9e0fa3..990bca190 100644 --- a/template-extension/distributed/samples/my-picture.tpl +++ b/template-extension/distributed/samples/my-picture.tpl @@ -26,9 +26,7 @@ {$LEVEL_SEPARATOR}{$current.TITLE}
{$PHOTO}
- {if $SHOW_PICTURE_NAME_ON_TITLE }

{$current.TITLE}

- {/if} {if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if} diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl index 519e1a732..2502e42b1 100644 --- a/themes/default/template/index.tpl +++ b/themes/default/template/index.tpl @@ -8,8 +8,8 @@  {'Sort order'|@translate}