From 4106c2a524aee09776998ceb21ea4fd350128f1b Mon Sep 17 00:00:00 2001 From: gweltas Date: Thu, 23 Sep 2004 16:42:11 +0000 Subject: - New template for picture.tpl - Creation of a menu bar in the picture display git-svn-id: http://piwigo.org/svn/trunk@531 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/config.inc.php | 2 +- picture.php | 194 ++++++++++++++++------------------ template/default/default.css | 128 ++++++++++++++-------- template/default/footer.tpl | 33 +++--- template/default/header.tpl | 4 +- template/default/picture.tpl | 185 +++++++++++++++++--------------- template/default/theme/categories.gif | Bin 0 -> 976 bytes template/default/theme/download.gif | Bin 0 -> 1028 bytes template/default/theme/eCard.gif | Bin 0 -> 961 bytes template/default/theme/metadata.gif | Bin 0 -> 1020 bytes template/default/theme/properties.gif | Bin 0 -> 1010 bytes template/default/theme/slideshow.gif | Bin 0 -> 1017 bytes 12 files changed, 294 insertions(+), 252 deletions(-) create mode 100644 template/default/theme/categories.gif create mode 100644 template/default/theme/download.gif create mode 100644 template/default/theme/eCard.gif create mode 100644 template/default/theme/metadata.gif create mode 100644 template/default/theme/properties.gif create mode 100644 template/default/theme/slideshow.gif diff --git a/include/config.inc.php b/include/config.inc.php index 67b65cf80..1e4c4dcc5 100644 --- a/include/config.inc.php +++ b/include/config.inc.php @@ -43,7 +43,7 @@ $conf['order_by'] = ' ORDER BY date_available DESC, file ASC, id ASC'; $conf['nb_image_row'] = array(4,5,6,7,8); $conf['nb_row_page'] = array(2,3,4,5,6,7,10,20,1000); -$conf['slideshow_period'] = array(2,5,10); +$conf['slideshow_period'] = 4; $conf['last_days'] = array(1,2,3,10,30,365); // $conf['file_ext'] lists all extensions (case insensitive) allowed for diff --git a/picture.php b/picture.php index c69d4838e..a8c166efe 100644 --- a/picture.php +++ b/picture.php @@ -193,7 +193,8 @@ foreach (array('prev', 'current', 'next') as $i) } $picture[$i]['url'] = PHPWG_ROOT_PATH.'picture.php'; - $picture[$i]['url'].= get_query_string_diff(array('image_id','add_fav')); + $picture[$i]['url'].= get_query_string_diff(array('image_id','add_fav', + 'slideshow')); $picture[$i]['url'].= '&image_id='.$row['id']; } @@ -207,6 +208,8 @@ if ( $page['cat'] == 'search' ) $url_admin = PHPWG_ROOT_PATH.'admin.php?page=picture_modify'; $url_admin.= '&cat_id='.$page['cat']; $url_admin.= '&image_id='.$_GET['image_id']; + +$url_slide = $picture['current']['url'].'&slideshow='.$conf['slideshow_period']; //----------------------------------------------------------- rate registration if (isset($_GET['rate']) and $conf['rate'] @@ -373,7 +376,7 @@ if ( isset( $_GET['del'] ) $title = $picture['current']['name']; $refresh = 0; -if ( isset( $_GET['slideshow'] ) and $next ) +if ( isset( $_GET['slideshow'] ) and $has_next ) { $refresh= $_GET['slideshow']; $url_link = $picture['next']['url'].'&slideshow='.$refresh; @@ -385,9 +388,7 @@ if (is_numeric( $page['cat'] )) { $title_img = replace_space(get_cat_display_name( $page['cat_name'], " > ")); $n = $page['num'] + 1; - $title_nb = "Photo".' '.$n.'/'; - $title_nb.= $page['cat_nb_images']; - //$title_img.= $picture['current']['name']; + $title_nb = $n.'/'.$page['cat_nb_images']; } else if ( $page['cat'] == 'search' ) { @@ -409,6 +410,23 @@ else $picture_size = get_picture_size( $original_width, $original_height, $user['maxwidth'], $user['maxheight'] ); + +// metadata +if ($conf['show_exif'] or $conf['show_iptc']) +{ + $metadata_showable = true; +} +else +{ + $metadata_showable = false; +} + +$url_metadata = PHPWG_ROOT_PATH.'picture.php'; +$url_metadata .= get_query_string_diff(array('add_fav', 'slideshow', 'show_metadata')); +if ($metadata_showable and !isset($_GET['show_metadata'])) +{ + $url_metadata.= '&show_metadata=1'; +} include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('picture'=>'picture.tpl')); @@ -437,38 +455,77 @@ $template->assign_vars(array( 'L_COMMENT' =>$lang['comment'], 'L_DOWNLOAD' => $lang['download'], 'L_DOWNLOAD_HINT' => $lang['download_hint'], - 'L_PICTURE_SHOW_METADATA' => $lang['picture_show_metadata'], - 'L_PICTURE_HIDE_METADATA' => $lang['picture_hide_metadata'], - - 'T_DEL_IMG' =>PHPWG_ROOT_PATH.'template/'.$user['template'].'/theme/delete.gif', + 'L_PICTURE_METADATA' => $lang['picture_show_metadata'], 'U_HOME' => add_session_id($url_home), + 'U_METADATA' => add_session_id($url_metadata), 'U_ADMIN' => add_session_id($url_admin), + 'U_SLIDESHOW'=> add_session_id($url_slide), 'U_ADD_COMMENT' => add_session_id(str_replace( '&', '&', $_SERVER['REQUEST_URI'] )) ) ); - -//-------------------------------------------------------- slideshow management -if ( isset( $_GET['slideshow'] ) ) +//-------------------------------------------------------- upper menu management +// download link if file is not a picture +if (!$picture['current']['is_picture']) { - if ( !is_numeric( $_GET['slideshow'] ) ) $_GET['slideshow'] = $conf['slideshow_period'][0]; - - $template->assign_block_vars('stop_slideshow', array( - 'U_SLIDESHOW'=>add_session_id( $picture['current']['url'] ) - )); + $template->assign_block_vars('download', array( + 'U_DOWNLOAD' => $picture['current']['download'] + )); } else { - $template->assign_block_vars('start_slideshow', array()); - foreach ( $conf['slideshow_period'] as $option ) + $template->assign_block_vars('ecard', array( + 'U_ECARD' => $picture['current']['url'] + )); +} + +//------------------------------------------------------- favorite manipulation +if ( !$user['is_the_guest'] ) +{ + // verify if the picture is already in the favorite of the user + $query = 'SELECT COUNT(*) AS nb_fav'; + $query.= ' FROM '.FAVORITES_TABLE.' WHERE image_id = '.$_GET['image_id']; + $query.= ' AND user_id = '.$user['id'].';'; + $result = mysql_query( $query ); + $row = mysql_fetch_array( $result ); + if (!$row['nb_fav']) { - $template->assign_block_vars('start_slideshow.second', array( - 'SLIDESHOW_SPEED'=>$option, - 'U_SLIDESHOW'=>add_session_id( $picture['current']['url'].'&slideshow='.$option) - )); + $url = PHPWG_ROOT_PATH.'picture.php'; + $url.= get_query_string_diff(array('rate','add_fav')); + $url.= '&add_fav=1'; + + $template->assign_block_vars( + 'favorite', + array( + 'FAVORITE_IMG' => PHPWG_ROOT_PATH.'template/'.$user['template'].'/theme/favorite.gif', + 'FAVORITE_HINT' =>$lang['add_favorites_hint'], + 'FAVORITE_ALT' =>$lang['add_favorites_alt'], + 'U_FAVORITE' => $url + )); + } + else + { + $url = PHPWG_ROOT_PATH.'picture.php'; + $url.= get_query_string_diff(array('rate','add_fav')); + $url.= '&add_fav=0'; + + $template->assign_block_vars( + 'favorite', + array( + 'FAVORITE_IMG' => PHPWG_ROOT_PATH.'template/'.$user['template'].'/theme/del_favorite.gif', + 'FAVORITE_HINT' =>$lang['del_favorites_hint'], + 'FAVORITE_ALT' =>$lang['del_favorites_alt'], + 'U_FAVORITE'=> $url + )); } } +//------------------------------------ admin link for information modifications +if ( $user['status'] == 'admin' ) +{ + $template->assign_block_vars('admin', array()); +} +//-------------------------------------------------------- navigation management if ($has_prev) { $template->assign_block_vars( @@ -502,15 +559,7 @@ if (isset($picture['current']['comment']) 'COMMENT_IMG' => $picture['current']['comment'] )); } -// download link if file is not a picture -if (!$picture['current']['is_picture']) -{ - $template->assign_block_vars( - 'download', - array( - 'U_DOWNLOAD' => $picture['current']['download'] - )); -} + // author if ( !empty($picture['current']['author']) ) @@ -642,34 +691,13 @@ SELECT COUNT(rate) AS count 'VALUE' => $value )); } -//-------------------------------------------------------------------- metadata -if ($conf['show_exif'] or $conf['show_iptc']) -{ - $metadata_showable = true; -} -else -{ - $metadata_showable = false; -} -if ($metadata_showable and !isset($_GET['show_metadata'])) -{ - $url = PHPWG_ROOT_PATH.'picture.php?'.$_SERVER['QUERY_STRING']; - $url.= '&show_metadata=1'; - $template->assign_block_vars('show_metadata', array('URL' => $url)); -} +//metadata if ($metadata_showable and isset($_GET['show_metadata'])) { - $url = PHPWG_ROOT_PATH.'picture.php'; - $url.= get_query_string_diff(array('show_metadata','add_fav')); - - $template->assign_block_vars('hide_metadata', array('URL' => $url)); - include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php'); - $template->assign_block_vars('metadata', array()); - if ($conf['show_exif']) { if ($exif = @read_exif_data($picture['current']['src'])) @@ -678,7 +706,7 @@ if ($metadata_showable and isset($_GET['show_metadata'])) 'metadata.headline', array('TITLE' => 'EXIF Metadata') ); - + foreach ($conf['show_exif_fields'] as $field) { if (strpos($field, ';') === false) @@ -723,7 +751,6 @@ if ($metadata_showable and isset($_GET['show_metadata'])) } } } - if ($conf['show_iptc']) { $iptc = get_iptc_data($picture['current']['src'], @@ -755,6 +782,16 @@ if ($metadata_showable and isset($_GET['show_metadata'])) } } } +//slideshow end +if ( isset( $_GET['slideshow'] ) ) +{ + if ( !is_numeric( $_GET['slideshow'] ) ) $_GET['slideshow'] = $conf['slideshow_period']; + + $template->assign_block_vars('stop_slideshow', array( + 'U_SLIDESHOW'=>add_session_id( $picture['current']['url'] ) + )); +} + //------------------------------------------------------------------- rate form if ($conf['rate']) { @@ -806,51 +843,6 @@ SELECT rate )); } } -//------------------------------------------------------- favorite manipulation -if ( !$user['is_the_guest'] ) -{ - // verify if the picture is already in the favorite of the user - $query = 'SELECT COUNT(*) AS nb_fav'; - $query.= ' FROM '.FAVORITES_TABLE.' WHERE image_id = '.$_GET['image_id']; - $query.= ' AND user_id = '.$user['id'].';'; - $result = mysql_query( $query ); - $row = mysql_fetch_array( $result ); - if (!$row['nb_fav']) - { - $url = PHPWG_ROOT_PATH.'picture.php'; - $url.= get_query_string_diff(array('rate','add_fav')); - $url.= '&add_fav=1'; - - $template->assign_block_vars( - 'favorite', - array( - 'FAVORITE_IMG' => PHPWG_ROOT_PATH.'template/'.$user['template'].'/theme/favorite.gif', - 'FAVORITE_HINT' =>$lang['add_favorites_hint'], - 'FAVORITE_ALT' =>'[ '.$lang['add_favorites_alt'].' ]', - 'U_FAVORITE' => $url - )); - } - else - { - $url = PHPWG_ROOT_PATH.'picture.php'; - $url.= get_query_string_diff(array('rate','add_fav')); - $url.= '&add_fav=0'; - - $template->assign_block_vars( - 'favorite', - array( - 'FAVORITE_IMG' => PHPWG_ROOT_PATH.'template/'.$user['template'].'/theme/del_favorite.gif', - 'FAVORITE_HINT' =>$lang['del_favorites_hint'], - 'FAVORITE_ALT' =>'[ '.$lang['del_favorites_alt'].' ]', - 'U_FAVORITE'=> $url - )); - } -} -//------------------------------------ admin link for information modifications -if ( $user['status'] == 'admin' ) -{ - $template->assign_block_vars('modification', array()); -} //---------------------------------------------------- users's comments display if ( $conf['show_comments'] ) diff --git a/template/default/default.css b/template/default/default.css index b41fdfaf0..7e2d58e95 100644 --- a/template/default/default.css +++ b/template/default/default.css @@ -1,3 +1,33 @@ +/*POSITION*/ +#gauche,#droite +{ + float:left; + width:18%; + text-align:left; +} + +#centre +{ + float:left; + width:64%; + text-align:center; +} + +#droite +{ + text-align:right; +} + +#left +{ + float:left; +} + +#right +{ + float:right; +} + /* MAIN STYLES */ body { @@ -26,8 +56,17 @@ a:hover { text-decoration:none; color:#FFF48E;} a.none:hover { text-decoration:none;} a.image:hover { text-decoration:none;} a.thumbLink:hover { text-decoration:none;} -/*a.adminMenu:hover{ color : #C6B78E; } -a.adminMenu{ color : #FFF48E; }*/ + +/* LAYOUT STYLE */ + +.main { + background-color:#444444; + border: 1px solid #E0E0E0; + width:100%; + padding-bottom:30px; + text-align:center; + display:block; +} /* Navigation styles */ @@ -46,18 +85,12 @@ a.adminMenu{ color : #FFF48E; }*/ text-align:center; } -.titrePage +.titrePage { + font-family: 'Trebuchet MS', Verdana, sans-serif; text-align:left; font-size:16px; - margin-bottom:5px; -} - -.titreImg{ - text-align:center; - font-size:16px; - color:#FFF48E; - font-weight:600; + /*margin-bottom:5px;*/ } .menu { @@ -69,7 +102,6 @@ a.adminMenu{ color : #FFF48E; }*/ ul.menu { text-align:left; - /* list-style-image : url(theme/collapsed.gif); */ list-style-type: square ; padding-left:15px; margin:5px; @@ -96,6 +128,47 @@ ul.menu { margin : 10px 4px 10px 4px; } +#imgBarMenu +{ + width:100%; + display:block; + height:25px; + background-image: url(theme/button_bg.gif); + border-bottom: 1px solid #000000; +} + +.imgMenu +{ + width:48px; + border:none; + float:left; +} + +.imgMenu img +{ + border:none; + text-align:center; + margin-top:4px; +} + +.imgMenu a +{ + display:block; + background-image: url(theme/button_bg.gif); + height: 25px; + border-bottom: 1px solid #000000; + border-left: 1px solid #838383; + border-right: 1px solid #000000; +} + +.imgMenu a:hover +{ + background-image:url(theme/tableh1_bg.gif); + border-bottom: 1px solid #3F3F3F; + border-left: 1px solid #3F3F3F; + border-right: 1px solid #3F3F3F; +} + .commentImage { text-align:justify; font-style:italic; @@ -106,20 +179,10 @@ ul.menu { .nameImage { text-align:center; - font-size:24px; - background-color: #666666; - border-top: 1px solid #222222; - border-bottom: 1px solid #222222; + font-size:20px; } /* Table styles */ -.main { - background-color:#444444; - border: 1px solid #E0E0E0; - width:100%; - padding-bottom:30px; -} - .table1, .home { border: 1px solid #000000; @@ -349,22 +412,3 @@ span.update_error_element, span.update_category_error { .update_summary_del { color:#ffe1e1; } - -div.remoteOutput { - background-color:#444444; - border:1px solid black; - margin:10px; - text-align:left; -} - -li.remoteInfo { - color:gray; -} - -li.remoteWarning { - color:#ffe1e1; -} - -li.remoteError { - color:orange; -} \ No newline at end of file diff --git a/template/default/footer.tpl b/template/default/footer.tpl index bceb9e234..2dfa4db57 100644 --- a/template/default/footer.tpl +++ b/template/default/footer.tpl @@ -1,24 +1,21 @@ -
- - {L_GEN_TIME} {TIME} :: - +
+ + {L_GEN_TIME} {TIME} :: + - + - Powered by PhpWebGallery - {VERSION} :: + Powered by PhpWebGallery + {VERSION} :: - {L_SEND_MAIL} - - {L_WEBMASTER} - + {L_SEND_MAIL} + + {L_WEBMASTER} + -
- - - - +
+ diff --git a/template/default/header.tpl b/template/default/header.tpl index d19afdcfa..9c4d355e8 100644 --- a/template/default/header.tpl +++ b/template/default/header.tpl @@ -13,6 +13,4 @@ - - -
\ No newline at end of file +
\ No newline at end of file diff --git a/template/default/picture.tpl b/template/default/picture.tpl index 981174558..7a39e34be 100644 --- a/template/default/picture.tpl +++ b/template/default/picture.tpl @@ -1,84 +1,101 @@ - -
{information.INFORMATION}
- - -
- [ {L_SLIDESHOW} : - - {start_slideshow.second.SLIDESHOW_SPEED} - - {L_TIME} ] -
- - - - - - -
-
-
{CATEGORY}
-
{PHOTO}
- - {ALT_IMG} - -
{TITLE}
- -
[ {L_DOWNLOAD} ]
- - -
{legend.COMMENT_IMG}
- -
- - - - - - -
- - - - {previous.TITLE_IMG} - - - - - - - - - - -
{info_line.INFO} : {info_line.VALUE}
- 		- - - {next.TITLE_IMG} - - - -
- -
- - {favorite.FAVORITE_ALT} - -
- + +
{information.INFORMATION}
+ +
+
{CATEGORY}
+
{TITLE}
+
{PHOTO}
+
+ +
+ + + + + + + + + + + + + + + +
- - [ {L_PICTURE_SHOW_METADATA} ] - + + {ALT_IMG} + + +
{legend.COMMENT_IMG}
+ - - [ {L_PICTURE_HIDE_METADATA} ] - + + + - +
+  + + + + {previous.TITLE_IMG} + + +
+
+ + + + + + + +
{info_line.INFO} : {info_line.VALUE}
+
+
+ + + {next.TITLE_IMG} + + + +   +
+
+ @@ -103,15 +120,9 @@ - -
- [ {L_ADMIN} ] -
- +
{L_BACK}
- - - +
 
diff --git a/template/default/theme/categories.gif b/template/default/theme/categories.gif new file mode 100644 index 000000000..cd3084434 Binary files /dev/null and b/template/default/theme/categories.gif differ diff --git a/template/default/theme/download.gif b/template/default/theme/download.gif new file mode 100644 index 000000000..bf44419dd Binary files /dev/null and b/template/default/theme/download.gif differ diff --git a/template/default/theme/eCard.gif b/template/default/theme/eCard.gif new file mode 100644 index 000000000..480872c4e Binary files /dev/null and b/template/default/theme/eCard.gif differ diff --git a/template/default/theme/metadata.gif b/template/default/theme/metadata.gif new file mode 100644 index 000000000..69b77ec44 Binary files /dev/null and b/template/default/theme/metadata.gif differ diff --git a/template/default/theme/properties.gif b/template/default/theme/properties.gif new file mode 100644 index 000000000..f843e0636 Binary files /dev/null and b/template/default/theme/properties.gif differ diff --git a/template/default/theme/slideshow.gif b/template/default/theme/slideshow.gif new file mode 100644 index 000000000..79712c3ad Binary files /dev/null and b/template/default/theme/slideshow.gif differ -- cgit v1.2.3
@@ -128,7 +139,7 @@ {comments.comment.COMMENT_DATE} - [{L_DELETE}] + [{L_DELETE}]