- differentiation of links "up to thumbnails" and "home"

git-svn-id: http://piwigo.org/svn/trunk@588 68402e56-0260-453c-a942-63ccdbb3a9ee

language/en_UK.iso-8859-1/common.lang.php

@@ -300,5 +300,6 @@ $lang['standard_deviation'] = 'STD';
 $lang['random_cat'] = 'random pictures';
 $lang['random_cat_hint'] = 'Displays a set of random pictures';
 $lang['picture_high'] = 'Click on the picture to see it in high definition';
-
+$lang['up_hint'] = 'Up to the thumbnails';
+$lang['up_alt'] = 'up';
 ?>

picture.php

@@ -168,6 +168,7 @@ foreach (array('prev', 'current', 'next') as $i)
     $picture[$i]['src'] = $cat_directory.$row['file'];
     // if we are working on the "current" element, we search if there is a
     // high quality picture
+    // FIXME : with remote pictures, this "remote fopen" takes long...
     if ($i == 'current')
     {
       if (@fopen($cat_directory.'pwg_high/'.$row['file'], 'r'))
@@ -202,11 +203,11 @@ foreach (array('prev', 'current', 'next') as $i)
   $picture[$i]['url'].= '&image_id='.$row['id'];
 }
 
-$url_home = PHPWG_ROOT_PATH.'category.php?cat='.$page['cat'].'&';
-$url_home.= 'num='.$page['num']; 
+$url_up = PHPWG_ROOT_PATH.'category.php?cat='.$page['cat'].'&';
+$url_up.= 'num='.$page['num']; 
 if ( $page['cat'] == 'search' )
 {
-  $url_home.= "&search=".$_GET['search'];
+  $url_up.= "&search=".$_GET['search'];
 }
 
 $url_admin = PHPWG_ROOT_PATH.'admin.php?page=picture_modify';
@@ -273,8 +274,8 @@ if ( isset( $_GET['add_fav'] ) )
     {
       // there is no favorite picture anymore we redirect the user to the
       // category page
-      $url = add_session_id( $url_home );
-      redirect( $url );
+      $url = add_session_id($url_up);
+      redirect($url);
     }
     else if (!$has_prev)
     {
@@ -461,8 +462,11 @@ $template->assign_vars(array(
   'L_DOWNLOAD_HINT' => $lang['download_hint'],
   'L_PICTURE_METADATA' => $lang['picture_show_metadata'],
   'L_PICTURE_HIGH' => $lang['picture_high'],
+  'L_UP_HINT' => $lang['up_hint'],
+  'L_UP_ALT' => $lang['up_alt'],
   
-  'U_HOME' => add_session_id($url_home),
+  'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php'),
+  'U_UP' => add_session_id($url_up),
   'U_METADATA' => add_session_id($url_metadata),
   'U_ADMIN' => add_session_id($url_admin),
   'U_SLIDESHOW'=> add_session_id($url_slide),

template/default/picture.tpl

@@ -9,8 +9,8 @@
 
 <div id="imgBarMenu">
 <div class="imgMenu" id="left">
-  <a href="{U_HOME}" title="{L_HOME}">
-	<img src="template/default/theme/categories.gif" alt="{L_HOME}" />
+  <a href="{U_UP}" title="{L_UP_HINT}">
+	<img src="template/default/theme/categories.gif" alt="{L_UP_ALT}" />
   </a>
 </div>
 <div class="imgMenu" id="left">