- Change of the picture page behavior to be able to open the full size image in a new window

- Minor modification for template migration
- Rename of script.js in scripts.js


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

13 files changed, 42 insertions, 63 deletions

diff --git a/about.php b/about.php
index 7e13d604c..03520020a 100644
--- a/about.php
+++ b/about.php
@@ -39,7 +39,7 @@ $template->set_filenames(array('about'=>'about.tpl'));
 $template->assign_vars(array(
 	'PAGE_TITLE' => $title,
 	'L_ABOUT' => $lang['about_message'],
-	'L_RETURN' =>  $lang['about_return'], 
+	'L_RETURN' =>  $lang['return_main_page'], 
 	'U_RETURN' => add_session_id(PHPWG_ROOT_PATH.'category.php?'.$_SERVER['QUERY_STRING'])
 	)
 	);
diff --git a/admin.php b/admin.php
index 509031bde..f302dab33 100644
--- a/admin.php
+++ b/admin.php
@@ -42,27 +42,9 @@ switch ( $_GET['page'] )
  case 'user_modify':
    $title = $lang['title_modify'];        $page_valide = true; break;
  case 'user_search':
-  /* if ( !is_numeric( $_GET['user_id'] ) ) $_GET['user_id'] = -1;
-   $query = 'SELECT status,username';
-   $query.= ' FROM '.USERS_TABLE;
-   $query.= ' WHERE id = '.$_GET['user_id'];
-   $query.= ';';
-   $result = mysql_query( $query );
-   if ( mysql_num_rows( $result ) > 0 )
-   {
-     $row = mysql_fetch_array( $result );
-     $page['user_status']   = $row['status'];
-     if ( $row['username'] == 'guest' ) $row['username'] = $lang['guest'];
-     $page['user_username'] = $row['username'];
-     $page_valide = true;
-     $title = $lang['title_user_perm'].' "'.$page['user_username'].'"';
-   }
-   else
-   {
-     $page_valide = false;
-   }*/
-   $title = $lang['title_user_perm'];
-   //.' '.$_POST['username'];
+   $username='';
+   if (isset($_POST['username'])) $username=$_POST['username'];
+   $title = $lang['title_user_perm'].' '.$username;
    $page_valide = true; break;
  case 'group_list' :
    $title = $lang['title_groups'];        $page_valide = true; break;
diff --git a/admin/images/monthly_visits.img.php b/admin/images/global_stats.img.php
index 21a89ef8f..21a89ef8f 100644
--- a/admin/images/monthly_visits.img.php
+++ b/admin/images/global_stats.img.php
diff --git a/admin/stats.php b/admin/stats.php
index c98c38968..d06ad5dc0 100644
--- a/admin/stats.php
+++ b/admin/stats.php
@@ -30,14 +30,14 @@ if( !defined("PHPWG_ROOT_PATH") )
 }
 include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
 
-$url_img_monthly_report = PHPWG_ROOT_PATH.'/admin/images/monthly_visits.img.php';
+$url_img_global_report = PHPWG_ROOT_PATH.'admin/images/global_stats.img.php';
 //----------------------------------------------------- template initialization
 $template->set_filenames( array('stats'=>'admin/stats.tpl') );
 
 $template->assign_vars(array(
   'L_STAT_TITLE'=>$lang['stats_last_days'],
   'L_STAT_MONTHLY_ALT'=>$lang['stats_pages_seen_graph_title'],
-  'IMG_MONTHLY_REPORT'=>add_session_id($url_img_monthly_report)
+  'IMG_MONTHLY_REPORT'=>add_session_id($url_img_global_report)
   ));
 
 //---------------------------------------------------------------- log  history
diff --git a/admin/user_search.php b/admin/user_search.php
index 2fd21d9c4..9c8189443 100644
--- a/admin/user_search.php
+++ b/admin/user_search.php
@@ -64,11 +64,9 @@ if ( isset( $_POST['submit'] ) )
     }
   }
   check_favorites( $_GET['user_id'] );
-  synchronize_user( $_GET['user_id'] );
 }
 
 $user_id = (!empty($userdata['id']))?$userdata['id']:'';
-  
 $template->set_filenames( array('user'=>'admin/user_perm.tpl') );
 $template->assign_vars(array(
   'L_SELECT_USERNAME'=>$lang['Select_username'],
@@ -76,8 +74,8 @@ $template->assign_vars(array(
   'L_FIND_USERNAME'=>$lang['Find_username'],
   'L_AUTH_USER'=>$lang['permuser_only_private'],
   'L_SUBMIT'=>$lang['submit'],
-  'L_AUTHORIZED'=>$lang['permuser_authorized'],
-  'L_FORBIDDEN'=>$lang['permuser_forbidden'],
+  'L_AUTHORIZED'=>$lang['authorized'],
+  'L_FORBIDDEN'=>$lang['forbidden'],
   'L_PARENT_FORBIDDEN'=>$lang['permuser_parent_forbidden'],
 
   'F_SEARCH_USER_ACTION' => add_session_id(PHPWG_ROOT_PATH.'admin.php?page=user_search'),
diff --git a/include/script.js b/include/scripts.js
index 7821299c6..43fb86644 100644
--- a/include/script.js
+++ b/include/scripts.js
@@ -26,3 +26,7 @@ for( i=0; i<len; i++)
 }
 }
 
+function phpWGOpenWindow(theURL,winName,features) 
+{
+  window.open(theURL,winName,features);
+}
\ No newline at end of file
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index d857fca8e..72ef8ca75 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -33,7 +33,7 @@ $lang_info['direction'] = 'ltr';
 $lang_info['code'] = 'en';
 
 // Main words 
-$lang['gallery_index'] = 'Gallery index';
+$lang['gallery_index'] = 'Home';
 $lang['category'] = 'Category';
 $lang['categories'] = 'Categories';
 $lang['thumbnail'] = 'Thumbnail';
@@ -184,7 +184,6 @@ $lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Inform
   <li>Technicaly, PhpWebGallery is fully developped with PHP (the elePHPant) with a MySQL database (the SQuirreL).</li>
   <li>If you have any suggestions or comments, please visit <a href="http://www.phpwebgallery.net" style="text-decoration:underline">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net" style="text-decoration:underline">forum</a>.</li>
 </ul>';
-$lang['about_return'] = 'Back';
 $lang['ident_page_title'] = 'Identification';
 $lang['ident_title'] = 'Identification';
 $lang['ident_register'] = 'Register';
@@ -193,7 +192,6 @@ $lang['ident_guest_visit'] = 'Go through the gallery as a visitor';
 
 $lang['previous_image'] = 'Previous';
 $lang['next_image'] = 'Next';
-$lang['back'] = 'Click on the image to go back to the thumbnails page';
 $lang['info_image_title'] = 'Image information';
 $lang['link_info_image'] = 'Modify information';
 $lang['true_size'] = 'Real size';
@@ -293,6 +291,5 @@ $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';
+$lang['picture_high'] = 'Click on the picture to see it in high definition';
 ?>
\ No newline at end of file
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index 960338f46..4f45c2356 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -33,7 +33,7 @@ $lang_info['direction'] = 'ltr';
 $lang_info['code'] = 'fr';
 
 // Main words 
-$lang['gallery_index'] = 'Racine de la galerie';
+$lang['gallery_index'] = 'Accueil';
 $lang['category'] = 'Catégorie';
 $lang['categories'] = 'Catégories';
 $lang['thumbnail'] = 'Miniature';
@@ -199,7 +199,6 @@ $lang['ident_guest_visit'] = 'Parcourir la galerie en tant que visiteur';
 		
 $lang['previous_image'] = 'Précédent';
 $lang['next_image'] = 'Suivant';
-$lang['back'] = 'Cliquez sur l\'image pour revenir à la page des miniatures';
 $lang['info_image_title'] = 'Informations';
 $lang['link_info_image'] = 'Modifier les informations de cette image';
 $lang['true_size'] = 'Taille réelle';
@@ -312,4 +311,5 @@ $lang['never_rated'] = 'Vous n\'avez jamais voté pour cette image';
 $lang['no_rate'] = 'Aucun vote';
 $lang['rates'] = 'Votes';
 $lang['standard_deviation'] = 'STD';
+$lang['picture_high'] = 'Cliquez sur l\'image pour la voir en haute résolution';
 ?>
\ No newline at end of file
diff --git a/picture.php b/picture.php
index ec476eefb..e55fde22f 100644
--- a/picture.php
+++ b/picture.php
@@ -450,12 +450,11 @@ $template->assign_vars(array(
   'WIDTH_IMG' => $picture_size[0],
   'HEIGHT_IMG' => $picture_size[1],
 
+  'L_HOME' => $lang['gallery_index'],
   'L_SLIDESHOW' => $lang['slideshow'],
-  'L_TIME' => $lang['period_seconds'],
   'L_STOP_SLIDESHOW' => $lang['slideshow_stop'],
   'L_PREV_IMG' =>$lang['previous_image'].' : ',
   'L_ADMIN' =>$lang['link_info_image'],
-  'L_BACK' =>$lang['back'],
   'L_COMMENT_TITLE' =>$lang['comments_title'],
   'L_ADD_COMMENT' =>$lang['comments_add'],
   'L_DELETE_COMMENT' =>$lang['comments_del'],
@@ -467,7 +466,6 @@ $template->assign_vars(array(
   '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),
@@ -493,9 +491,16 @@ else
 // display a high quality link if present
 if (isset($picture['current']['high']))
 {
-  $template->assign_block_vars(
-    'high',
-    array('U_HIGH' => $picture['current']['high']));
+  $full_size = @getimagesize($picture['current']['high']);
+  $full_width = $full_size[0];
+  $full_height = $full_size[1];
+  $uuid = uniqid(rand());
+  $template->assign_block_vars('high', array(
+    'U_HIGH' => $picture['current']['high'],
+	'UUID'=>$uuid,
+	'WIDTH_IMG'=>($full_width + 16),
+	'HEIGHT_IMG'=>($full_height + 16)
+	));
 }
 //------------------------------------------------------- favorite manipulation
 if ( !$user['is_the_guest'] )
diff --git a/template/default/admin/user_perm.tpl b/template/default/admin/user_perm.tpl
index bd5bb43d2..c55c85446 100644
--- a/template/default/admin/user_perm.tpl
+++ b/template/default/admin/user_perm.tpl
@@ -8,11 +8,11 @@
 </form>
 <!-- END search -->
 <!-- BEGIN permission -->
-<div class="admin">{L_AUTH_USER}</div>
+<div class="admin">{L_AUTH_USER} {USERNAME}</div>
 <form action="{F_AUTH_ACTION}" method="POST">
   <ul class="menu">
     <!-- BEGIN category -->
-        <li> <a href="{permission.category.CAT_URL}"><span style="color:{#color}">{permission.category.CAT_NAME}</span></a>
+        <li> <a href="{permission.category.CAT_URL}">{permission.category.CAT_NAME}</a>
         <!-- BEGIN parent_forbidden -->
         {L_PARENT_FORBIDDEN}&nbsp;-&nbsp;
         <!-- END parent_forbidden -->
diff --git a/template/default/category.tpl b/template/default/category.tpl
index be7d0cf1c..7b4353e2c 100644
--- a/template/default/category.tpl
+++ b/template/default/category.tpl
@@ -1,4 +1,4 @@
-<div align="center" style="padding:10px;"><img src="template/default/images/logo.jpg" width="360" height="100"></div>
+<div style="padding:3px;"><img src="template/default/images/logo.jpg"></div>
 <table style="width:100%;">
   <tr>
     <td valign="top" style="padding:10px;width:1%;">
@@ -61,7 +61,7 @@
 	  <div class="home">
 			<div class="titrePage">{TITLE}</div>
 			<!-- BEGIN calendar -->
-                          <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
+               <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
 			  <div class="navigationBar">{calendar.MONTHS_NAV_BAR}</div>
 			<!-- END calendar -->
 			<!-- BEGIN thumbnails -->
@@ -76,9 +76,6 @@
 					   title="{thumbnails.line.thumbnail.IMAGE_TITLE}"
 					   class="thumbLink" />
 				  <br />
-				  <!-- BEGIN bullet -->
-				  <img src="./template/default/theme/collapsed.gif" style="border:none;" alt="&gt;" />
-				  <!-- END bullet -->
 				  <span class="{thumbnails.line.thumbnail.IMAGE_STYLE}">{thumbnails.line.thumbnail.IMAGE_NAME}</span></a>
 				  {thumbnails.line.thumbnail.IMAGE_TS}
 				  <!-- BEGIN nb_comments -->
diff --git a/template/default/default.css b/template/default/default.css
index d17a4645b..11c2bfba1 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -2,14 +2,14 @@
 #gauche,#droite
 {
   float:left;
-  width:18%;
+  width:30%;
   text-align:left;
 }
 
 #centre
 {
   float:left;
-  width:64%;
+  width:40%;
   text-align:center;
 }
 
@@ -187,6 +187,7 @@ ul.menu {
 {
   border: 1px solid #000000;
   background-color:#555555;
+  display:block;
 }
 
 .home
diff --git a/template/default/picture.tpl b/template/default/picture.tpl
index 2dc9c9e00..636963898 100644
--- a/template/default/picture.tpl
+++ b/template/default/picture.tpl
@@ -2,7 +2,7 @@
 <div class="information">{information.INFORMATION}</div>
 <!-- END information -->
 <div class="titrePage">
-  <div id="gauche">{CATEGORY}</div>
+  <div id="gauche"><a href="{U_HOME}">{L_HOME}</a> > {CATEGORY}</div>
   <div id="centre" class="nameImage">{TITLE}</div>
   <div id="droite">{PHOTO}</div>
 </div>
@@ -23,13 +23,6 @@
 	<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}">
@@ -59,10 +52,14 @@
 </div>
 <!-- END admin -->
 </div>
-
-<a href="{U_HOME}">
+<!-- BEGIN high -->
+<a href="javascript:phpWGOpenWindow('{high.U_HIGH}','{high.UUID}','scrollbars=yes,toolbar=yes,status=yes,resizable=yes,width={high.WIDTH_IMG},height={high.HEIGHT_IMG}')">
+<!-- END high -->
   <img class="image" src="{SRC_IMG}" style="width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;" alt="{ALT_IMG}"/>
+<!-- BEGIN high -->
 </a>
+<div style="text-align:center;font-weight:bold;">{L_PICTURE_HIGH}</div>
+<!-- END high -->
 <!-- BEGIN legend -->
 <div class="commentImage">{legend.COMMENT_IMG}</div>
 <!-- END legend -->
@@ -126,9 +123,7 @@
             <!-- END rate_option -->
           </div>
           <!-- END rate -->
- 
-
-          <div style="text-align:center;">{L_BACK}</div>
+         
 <table class="tablecompact">
       <!-- BEGIN comments -->
       <tr align="center" valign="middle">