From 28dcfea993edd4e4ff9eb06e49ec6b2ef326396d Mon Sep 17 00:00:00 2001 From: gweltas Date: Fri, 1 Oct 2004 22:50:50 +0000 Subject: - 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 --- about.php | 2 +- admin.php | 24 +----- admin/images/global_stats.img.php | 121 ++++++++++++++++++++++++++++++ admin/images/monthly_visits.img.php | 121 ------------------------------ admin/stats.php | 4 +- admin/user_search.php | 6 +- include/script.js | 28 ------- include/scripts.js | 32 ++++++++ language/en_UK.iso-8859-1/common.lang.php | 7 +- language/fr_FR.iso-8859-1/common.lang.php | 4 +- picture.php | 17 +++-- template/default/admin/user_perm.tpl | 4 +- template/default/category.tpl | 7 +- template/default/default.css | 5 +- template/default/picture.tpl | 21 ++---- 15 files changed, 191 insertions(+), 212 deletions(-) create mode 100644 admin/images/global_stats.img.php delete mode 100644 admin/images/monthly_visits.img.php delete mode 100644 include/script.js create mode 100644 include/scripts.js 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/global_stats.img.php b/admin/images/global_stats.img.php new file mode 100644 index 000000000..21a89ef8f --- /dev/null +++ b/admin/images/global_stats.img.php @@ -0,0 +1,121 @@ + | +// | branch : BSF (Best So Far) | +// +-----------------------------------------------------------------------+ +// | file : $RCSfile$ +// | last update : $Date$ +// | last modifier : $Author$ +// | revision : $Revision$ +// +-----------------------------------------------------------------------+ +// | This program is free software; you can redistribute it and/or modify | +// | it under the terms of the GNU General Public License as published by | +// | the Free Software Foundation | +// | | +// | This program is distributed in the hope that it will be useful, but | +// | WITHOUT ANY WARRANTY; without even the implied warranty of | +// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | +// | General Public License for more details. | +// | | +// | You should have received a copy of the GNU General Public License | +// | along with this program; if not, write to the Free Software | +// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | +// | USA. | +// +-----------------------------------------------------------------------+ +//----------------------------------------------------------- include +define('PHPWG_ROOT_PATH','../../'); +define('IN_ADMIN', true); +include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); +include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' ); +include_once( 'phpBarGraph.php' ); + +//------------------------------------------------ variable definition +$outputFormat = "png"; +$legend = $lang['stats_pages_seen_graph_title']; +$imageHeight = 256; +$imageWidth = 320; +$sql = "SELECT DISTINCT COUNT(*), MONTH(date) + FROM phpwg_history + WHERE (date > DATE_SUB(CURRENT_DATE(), INTERVAL 12 MONTH)) + GROUP BY DATE_FORMAT(date,'%Y-%m') DESC;"; + +//------------------------------------------------ Image definition +$image = ImageCreate($imageWidth, $imageHeight); +//$image = ImageCreateTrueColor($imageWidth, $imageHeight); +// Fill it with your favorite background color.. +$backgroundColor = ImageColorAllocate($image, 184, 184, 184); +ImageFill($image, 0, 0, $backgroundColor); +$white = ImageColorAllocate($image, 0, 0, 0); + +// Interlace the image.. +Imageinterlace($image, 1); + +// Create a new BarGraph.. +$myBarGraph = new PhpBarGraph; +$myBarGraph->SetX(10); // Set the starting x position +$myBarGraph->SetY(10); // Set the starting y position +$myBarGraph->SetWidth($imageWidth-20); // Set how wide the bargraph will be +$myBarGraph->SetHeight($imageHeight-20); // Set how tall the bargraph will be +$myBarGraph->SetNumOfValueTicks(3); // Set this to zero if you don't want to show any. These are the vertical bars to help see the values. + + +// You can try uncommenting these lines below for different looks. + +// $myBarGraph->SetShowLabels(false); // The default is true. Setting this to false will cause phpBarGraph to not print the labels of each bar. + $myBarGraph->SetShowValues(false); // The default is true. Setting this to false will cause phpBarGraph to not print the values of each bar. +// $myBarGraph->SetBarBorder(false); // The default is true. Setting this to false will cause phpBarGraph to not print the border of each bar. +// $myBarGraph->SetShowFade(false); // The default is true. Setting this to false will cause phpBarGraph to not print each bar as a gradient. +// $myBarGraph->SetShowOuterBox(false); // The default is true. Setting this to false will cause phpBarGraph to not print the outside box. +$myBarGraph->SetBarSpacing(5); // The default is 10. This changes the space inbetween each bar. + + +// Add Values to the bargraph.. +$result = mysql_query($sql) +or die(mysql_errno().": ".mysql_error()."
".$sql); + +//$monthes =array_fill(1,12,0); +$monthes =array(); +$date = getdate(); +$current_month = $date['mon']; +for ($i=0;$i<12;$i++) +{ + $monthes[(($current_month-$i+11)%12)+1]=0; +} + +while ($r = mysql_fetch_row($result)) +{ + if (!$monthes[$r[1]]) $monthes[$r[1]]= $r[0]; +} +$monthes = array_reverse($monthes,true); +while (list ($key,$value) = each($monthes)) +{ + $nls_key = substr($lang['month'][$key],0,3); + $myBarGraph->AddValue($nls_key, $value); +} + +//$myBarGraph->SetDebug(true); +// Set the colors of the bargraph.. +$myBarGraph->SetStartBarColor("6666ff"); // This is the color on the top of every bar. +$myBarGraph->SetEndBarColor("2222aa"); // This is the color on the bottom of every bar. This is not used when SetShowFade() is set to false. +$myBarGraph->SetLineColor("000000"); // This is the color all the lines and text are printed out with. + +// Print the BarGraph to the image.. +$myBarGraph->DrawBarGraph($image); +Imagestring($image, 2, 2, $imageHeight-14, $legend, $white); + +//------------------------------------------------ Image output +if ($outputFormat == "png") +{ + header("Content-type: image/png"); + ImagePNG($image); +} +else if ($outputFormat == "jpg") +{ + header("Content-type: image/jpeg"); + Imagejpeg($image); +} +// Destroy the image. +Imagedestroy($image); +?> \ No newline at end of file diff --git a/admin/images/monthly_visits.img.php b/admin/images/monthly_visits.img.php deleted file mode 100644 index 21a89ef8f..000000000 --- a/admin/images/monthly_visits.img.php +++ /dev/null @@ -1,121 +0,0 @@ - | -// | branch : BSF (Best So Far) | -// +-----------------------------------------------------------------------+ -// | file : $RCSfile$ -// | last update : $Date$ -// | last modifier : $Author$ -// | revision : $Revision$ -// +-----------------------------------------------------------------------+ -// | This program is free software; you can redistribute it and/or modify | -// | it under the terms of the GNU General Public License as published by | -// | the Free Software Foundation | -// | | -// | This program is distributed in the hope that it will be useful, but | -// | WITHOUT ANY WARRANTY; without even the implied warranty of | -// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | -// | General Public License for more details. | -// | | -// | You should have received a copy of the GNU General Public License | -// | along with this program; if not, write to the Free Software | -// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | -// | USA. | -// +-----------------------------------------------------------------------+ -//----------------------------------------------------------- include -define('PHPWG_ROOT_PATH','../../'); -define('IN_ADMIN', true); -include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); -include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' ); -include_once( 'phpBarGraph.php' ); - -//------------------------------------------------ variable definition -$outputFormat = "png"; -$legend = $lang['stats_pages_seen_graph_title']; -$imageHeight = 256; -$imageWidth = 320; -$sql = "SELECT DISTINCT COUNT(*), MONTH(date) - FROM phpwg_history - WHERE (date > DATE_SUB(CURRENT_DATE(), INTERVAL 12 MONTH)) - GROUP BY DATE_FORMAT(date,'%Y-%m') DESC;"; - -//------------------------------------------------ Image definition -$image = ImageCreate($imageWidth, $imageHeight); -//$image = ImageCreateTrueColor($imageWidth, $imageHeight); -// Fill it with your favorite background color.. -$backgroundColor = ImageColorAllocate($image, 184, 184, 184); -ImageFill($image, 0, 0, $backgroundColor); -$white = ImageColorAllocate($image, 0, 0, 0); - -// Interlace the image.. -Imageinterlace($image, 1); - -// Create a new BarGraph.. -$myBarGraph = new PhpBarGraph; -$myBarGraph->SetX(10); // Set the starting x position -$myBarGraph->SetY(10); // Set the starting y position -$myBarGraph->SetWidth($imageWidth-20); // Set how wide the bargraph will be -$myBarGraph->SetHeight($imageHeight-20); // Set how tall the bargraph will be -$myBarGraph->SetNumOfValueTicks(3); // Set this to zero if you don't want to show any. These are the vertical bars to help see the values. - - -// You can try uncommenting these lines below for different looks. - -// $myBarGraph->SetShowLabels(false); // The default is true. Setting this to false will cause phpBarGraph to not print the labels of each bar. - $myBarGraph->SetShowValues(false); // The default is true. Setting this to false will cause phpBarGraph to not print the values of each bar. -// $myBarGraph->SetBarBorder(false); // The default is true. Setting this to false will cause phpBarGraph to not print the border of each bar. -// $myBarGraph->SetShowFade(false); // The default is true. Setting this to false will cause phpBarGraph to not print each bar as a gradient. -// $myBarGraph->SetShowOuterBox(false); // The default is true. Setting this to false will cause phpBarGraph to not print the outside box. -$myBarGraph->SetBarSpacing(5); // The default is 10. This changes the space inbetween each bar. - - -// Add Values to the bargraph.. -$result = mysql_query($sql) -or die(mysql_errno().": ".mysql_error()."
".$sql); - -//$monthes =array_fill(1,12,0); -$monthes =array(); -$date = getdate(); -$current_month = $date['mon']; -for ($i=0;$i<12;$i++) -{ - $monthes[(($current_month-$i+11)%12)+1]=0; -} - -while ($r = mysql_fetch_row($result)) -{ - if (!$monthes[$r[1]]) $monthes[$r[1]]= $r[0]; -} -$monthes = array_reverse($monthes,true); -while (list ($key,$value) = each($monthes)) -{ - $nls_key = substr($lang['month'][$key],0,3); - $myBarGraph->AddValue($nls_key, $value); -} - -//$myBarGraph->SetDebug(true); -// Set the colors of the bargraph.. -$myBarGraph->SetStartBarColor("6666ff"); // This is the color on the top of every bar. -$myBarGraph->SetEndBarColor("2222aa"); // This is the color on the bottom of every bar. This is not used when SetShowFade() is set to false. -$myBarGraph->SetLineColor("000000"); // This is the color all the lines and text are printed out with. - -// Print the BarGraph to the image.. -$myBarGraph->DrawBarGraph($image); -Imagestring($image, 2, 2, $imageHeight-14, $legend, $white); - -//------------------------------------------------ Image output -if ($outputFormat == "png") -{ - header("Content-type: image/png"); - ImagePNG($image); -} -else if ($outputFormat == "jpg") -{ - header("Content-type: image/jpeg"); - Imagejpeg($image); -} -// Destroy the image. -Imagedestroy($image); -?> \ No newline at end of file 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/script.js deleted file mode 100644 index 7821299c6..000000000 --- a/include/script.js +++ /dev/null @@ -1,28 +0,0 @@ -function SelectAll( formulaire ) -{ -len = formulaire.elements.length; -var i=0; -for( i = 0; i < len; i++) -{ - if ( formulaire.elements[i].type=='checkbox' - && formulaire.elements[i].name != 'copie') - { - formulaire.elements[i].checked = true; - } -} -} - -function Inverser( formulaire ) -{ -len = formulaire.elements.length; -var i=0; -for( i=0; i \ 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 $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 @@ -
{L_AUTH_USER}
+
{L_AUTH_USER} {USERNAME}
    -
  • {permission.category.CAT_NAME} +
  • {permission.category.CAT_NAME} {L_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 @@ -
    +
    @@ -61,7 +61,7 @@
    {TITLE}
    -
    {calendar.YEARS_NAV_BAR}
    +
    {calendar.YEARS_NAV_BAR}
    {calendar.MONTHS_NAV_BAR}
    @@ -76,9 +76,6 @@ title="{thumbnails.line.thumbnail.IMAGE_TITLE}" class="thumbLink" />
    - - > - {thumbnails.line.thumbnail.IMAGE_NAME} {thumbnails.line.thumbnail.IMAGE_TS} 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 @@
    {information.INFORMATION}
    -
    {CATEGORY}
    +
    {L_HOME} > {CATEGORY}
    {TITLE}
    {PHOTO}
    @@ -23,13 +23,6 @@ {L_PICTURE_METADATA}
    - - - - - + + + {ALT_IMG} + +
    {L_PICTURE_HIGH}
    +
    {legend.COMMENT_IMG}
    @@ -126,9 +123,7 @@ - - -
    {L_BACK}
    + -- cgit v1.2.3