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

improvement of picture title on picture page, drop boxes on index page ...

Browse Source 
sharpening uses a zider scale range 

git-svn-id: http://piwigo.org/svn/trunk@13115 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2012-02-12 10:02:59 +00:00
parent 9469de7482
commit a1833e40a2
9 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/include/image.class.php
View File

@@ -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
(

6
include/category_default.inc.php
View File

@@ -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,

4
include/config_default.inc.php
View File

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

1
picture.php
View File

@@ -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'],

2
template-extension/distributed/samples/my-picture.tpl
View File

@@ -26,9 +26,7 @@
{$LEVEL_SEPARATOR}{$current.TITLE}
</div>
<div class="imageNumber">{$PHOTO}</div>
{if $SHOW_PICTURE_NAME_ON_TITLE }
<h2>{$current.TITLE}</h2>
{/if}
</div>
{if !empty($PLUGIN_PICTURE_BEFORE)}{$PLUGIN_PICTURE_BEFORE}{/if}

7
themes/default/template/index.tpl
View File

@@ -8,8 +8,8 @@
<span class="pwg-icon pwg-icon-sort">&nbsp;</span><span class="pwg-button-text">{'Sort order'|@translate}</span>
</a>
<div id="sortOrderBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()">
{'Sort order'|@translate}:
{foreach from=$image_orders item=image_order}<br>
{'Sort order'|@translate}<hr>
{foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
{if $image_order.SELECTED}
<span>{$image_order.DISPLAY}</span>
{else}
@@ -39,7 +39,8 @@ function toggleSortOrderBox() {
<span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span>
</a>
<div id="derivativeSwitchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()">
{foreach from=$image_derivatives item=image_derivative name=deriv_loop}{if !$smarty.foreach.deriv_loop.first}<br>{/if}
{'Photo sizes'|@translate}<hr>
{foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
{if $image_derivative.SELECTED}
<span>{$image_derivative.DISPLAY}</span>
{else}

5
themes/default/template/picture.tpl
View File

@@ -12,12 +12,9 @@
<div id="imageHeaderBar">
<div class="browsePath">
{$SECTION_TITLE} {$LEVEL_SEPARATOR}{$current.TITLE}
{$SECTION_TITLE} {$LEVEL_SEPARATOR} <h2>{$current.TITLE}</h2>
</div>
<div class="imageNumber">{$PHOTO}</div>
{if $SHOW_PICTURE_NAME_ON_TITLE}
<h2>{$current.TITLE}</h2>
{/if}
</div>
<div id="imageToolBar">

4
themes/default/template/slideshow.tpl
View File

@@ -3,11 +3,9 @@
{if isset($U_SLIDESHOW_STOP) }
[ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
{/if}
<h2 class="showtitle">{$current.TITLE}</h2>
</div>
<div class="imageNumber">{$PHOTO}</div>
{if $SHOW_PICTURE_NAME_ON_TITLE }
<h2 class="showtitle">{$current.TITLE}</h2>
{/if}
</div>
<div id="imageToolBar">

14
themes/default/theme.css
View File

@@ -320,9 +320,9 @@ TD.calDayHead {
}
#imageHeaderBar H2 {
display: inline;
text-align: center;
padding: 0;
clear: both;
}
#imageToolBar {
@@ -342,7 +342,7 @@ TD.calDayHead {
padding: 0.2em;
position: absolute;
left: 5px;
top: 10%;
top: 12%;
}
#derivativeSwitchBox, #sortOrderBox {
@@ -357,12 +357,6 @@ TD.calDayHead {
position: relative; /*so that the drivative switch link is positioned relative to us*/
}
#theImage>IMG {
display: block;
margin: 0 auto;
border: 0;
}
#imageInfos {
position: relative;
min-height: 120px;
@@ -465,10 +459,6 @@ A.pwg-state-default:hover {
border-bottom: 0; /*reset above for icons*/
}
IMG {
border: 0;
}
#copyright {
clear: both;
font-size: 83%;