aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorz0rglub <z0rglub@piwigo.org>2004-09-24 08:37:29 +0000
committerz0rglub <z0rglub@piwigo.org>2004-09-24 08:37:29 +0000
commitbb8189ea750fdde2b489abd563034e0efb32db20 (patch)
tree01f3163e95590078de65ab7acfe7c01ae38de0bc
parent1d40fed0044e4eb40b323d16a10192237eba7b29 (diff)
add support of a third size picture in "high" sub-directory
git-svn-id: http://piwigo.org/svn/trunk@536 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--language/en_UK.iso-8859-1/common.lang.php2
-rw-r--r--picture.php38
-rw-r--r--template/default/picture.tpl7
3 files changed, 37 insertions, 10 deletions
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index a9632b586..d857fca8e 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -293,4 +293,6 @@ $lang['rates'] = 'rates';
$lang['standard_deviation'] = 'STD';
$lang['random_cat'] = 'random pictures';
$lang['random_cat_hint'] = 'Displays a set of random pictures';
+$lang['picture_high'] = 'See high quality picture';
+$lang['picture_high_alt'] = 'high';
?> \ No newline at end of file
diff --git a/picture.php b/picture.php
index 473571448..ec476eefb 100644
--- a/picture.php
+++ b/picture.php
@@ -164,6 +164,15 @@ foreach (array('prev', 'current', 'next') as $i)
if ($picture[$i]['is_picture'])
{
$picture[$i]['src'] = $cat_directory.$row['file'];
+ // if we are working on the "current" element, we search if there is a
+ // high quality picture
+ if ($i == 'current')
+ {
+ if (@fopen($cat_directory.'high/'.$row['file'], 'r'))
+ {
+ $picture[$i]['high'] = $cat_directory.'high/'.$row['file'];
+ }
+ }
}
// if picture is not a file, we need the download link
@@ -209,7 +218,8 @@ $url_admin = PHPWG_ROOT_PATH.'admin.php?page=picture_modify';
$url_admin.= '&amp;cat_id='.$page['cat'];
$url_admin.= '&amp;image_id='.$_GET['image_id'];
-$url_slide = $picture['current']['url'].'&amp;slideshow='.$conf['slideshow_period'];
+$url_slide = $picture['current']['url'];
+$url_slide.= '&amp;slideshow='.$conf['slideshow_period'];
//----------------------------------------------------------- rate registration
if (isset($_GET['rate'])
and $conf['rate']
@@ -386,7 +396,7 @@ $title_img = $picture['current']['name'];
$title_nb = '';
if (is_numeric( $page['cat'] ))
{
- $title_img = replace_space(get_cat_display_name( $page['cat_name'], " &gt; "));
+ $title_img = replace_space(get_cat_display_name($page['cat_name'],' &gt; '));
$n = $page['num'] + 1;
$title_nb = $n.'/'.$page['cat_nb_images'];
}
@@ -456,6 +466,8 @@ $template->assign_vars(array(
'L_DOWNLOAD' => $lang['download'],
'L_DOWNLOAD_HINT' => $lang['download_hint'],
'L_PICTURE_METADATA' => $lang['picture_show_metadata'],
+ 'L_PICTURE_HIGH' => $lang['picture_high'],
+ 'L_PICTURE_HIGH_ALT' => $lang['picture_high_alt'],
'U_HOME' => add_session_id($url_home),
'U_METADATA' => add_session_id($url_metadata),
@@ -464,21 +476,27 @@ $template->assign_vars(array(
'U_ADD_COMMENT' => add_session_id(str_replace( '&', '&amp;', $_SERVER['REQUEST_URI'] ))
)
);
-//-------------------------------------------------------- upper menu management
+//------------------------------------------------------- upper menu management
// download link if file is not a picture
if (!$picture['current']['is_picture'])
{
- $template->assign_block_vars('download', array(
- 'U_DOWNLOAD' => $picture['current']['download']
- ));
+ $template->assign_block_vars(
+ 'download',
+ array('U_DOWNLOAD' => $picture['current']['download']));
}
else
{
- $template->assign_block_vars('ecard', array(
- 'U_ECARD' => $picture['current']['url']
- ));
+ $template->assign_block_vars(
+ 'ecard',
+ array('U_ECARD' => $picture['current']['url']));
+}
+// display a high quality link if present
+if (isset($picture['current']['high']))
+{
+ $template->assign_block_vars(
+ 'high',
+ array('U_HIGH' => $picture['current']['high']));
}
-
//------------------------------------------------------- favorite manipulation
if ( !$user['is_the_guest'] )
{
diff --git a/template/default/picture.tpl b/template/default/picture.tpl
index 7a39e34be..2dc9c9e00 100644
--- a/template/default/picture.tpl
+++ b/template/default/picture.tpl
@@ -23,6 +23,13 @@
<img src="template/default/theme/metadata.gif" alt="{L_PICTURE_METADATA}" />
</a>
</div>
+<!-- BEGIN high -->
+<div class="imgMenu" id="left">
+ <a href="{high.U_HIGH}" title="{L_PICTURE_HIGH}">
+ <img src="template/default/theme/high.gif" alt="{L_PICTURE_HIGH_ALT}" />
+ </a>
+</div>
+<!-- END high -->
<!-- BEGIN favorite -->
<div class="imgMenu" id="right">
<a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}">