From 0a4b49abd8b0faf9ccc5fe8328adfaa42bcf8f4c Mon Sep 17 00:00:00 2001 From: plegall Date: Sun, 21 Aug 2005 11:32:12 +0000 Subject: - new way to display picture informations (template variables instead of template generic blocks) - new color for A:hover and its solid border-bottom, dotted border-bottom for A (same color as link color) - background color and border color for form input fields (input, select, textarea) to accentuate contrast with page background. - clear:both on #imageHeaderBar H1 let it be center on page - in infoTable keys are right aligned and values are left aligned (more beautiful, isn't it?) - add "set as representative" button to cclear template in picture.tpl. representative.png picture taken from Gorilla theme. - invisible horizontal rule on picture.tpl to separate user comments from the beginning of the page git-svn-id: http://piwigo.org/svn/trunk@847 68402e56-0260-453c-a942-63ccdbb3a9ee --- picture.php | 272 ++++++++++++++++--------------- template/cclear/default-colors.css | 5 +- template/cclear/default-layout.css | 9 +- template/cclear/image.css | 11 +- template/cclear/picture.tpl | 89 ++++++---- template/cclear/theme/representative.png | Bin 593 -> 1556 bytes 6 files changed, 218 insertions(+), 168 deletions(-) diff --git a/picture.php b/picture.php index b05414cf5..ce69fb3a7 100644 --- a/picture.php +++ b/picture.php @@ -95,13 +95,8 @@ $query = ' SELECT category_id,uppercats,commentable,global_rank FROM '.IMAGE_CATEGORY_TABLE.' INNER JOIN '.CATEGORIES_TABLE.' ON category_id = id - WHERE image_id = '.$_GET['image_id']; -if ($user['forbidden_categories'] != '') -{ - $query.= ' - AND category_id NOT IN ('.$user['forbidden_categories'].')'; -} -$query.= ' + WHERE image_id = '.$_GET['image_id'].' + AND category_id NOT IN ('.$user['forbidden_categories'].') ;'; $result = pwg_query($query); $related_categories = array(); @@ -487,69 +482,6 @@ if ($metadata_showable and !isset($_GET['show_metadata'])) $url_metadata.= '&show_metadata=1'; } -// author -$author = $creation_date = $size = $filesize = $lang['unavailable']; -if ( !empty($picture['current']['author']) ) -{ - $search_url = PHPWG_ROOT_PATH.'category.php?cat=search'; - $search_url.= '&search=author:'.$picture['current']['author']; - - $author = ''.$picture['current']['author'].''; -} - -// creation date -if ( !empty($picture['current']['date_creation']) ) -{ - $creation_date = format_date($picture['current']['date_creation']); -} - -// date of availability -$availability_date = format_date($picture['current']['date_available'], - 'mysql_datetime'); - -// size in pixels -if ($picture['current']['is_picture']) -{ - if ($original_width != $picture_size[0] - or $original_height != $picture_size[1]) - { - $size = '[ '; - $size .= $original_width.'*'.$original_height.' ]'; - } - else - { - $size = $original_width.'*'.$original_height; - } -} - -// filesize -if (empty($picture['current']['filesize'])) -{ - if (!$picture['current']['is_picture']) - { - $filesize = floor(filesize($picture['current']['download'])/1024); - } - else - { - $filesize = floor(filesize($picture['current']['src'])/1024); - } -} -else -{ - $filesize = $picture['current']['filesize']; -} - -// number of visits -$template->assign_block_vars( - 'info_line', - array( - 'INFO'=>$lang['visited'], - 'VALUE'=>$picture['current']['hit'].' '.$lang['times'] - )); - include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('picture'=>'picture.tpl')); @@ -561,11 +493,6 @@ $template->assign_vars(array( 'ALT_IMG' => $picture['current']['file'], 'WIDTH_IMG' => $picture_size[0], 'HEIGHT_IMG' => $picture_size[1], - 'AUTHOR' => $author, - 'CREATION_DATE' => $creation_date, - 'AVAILABILITY_DATE' => $availability_date, - 'SIZE' => $size, - 'FILE_SIZE' => $filesize, 'LEVEL_SEPARATOR' => $conf['level_separator'], @@ -580,7 +507,6 @@ $template->assign_vars(array( 'L_DELETE_COMMENT' =>$lang['comments_del'], 'L_DELETE' =>$lang['delete'], 'L_SUBMIT' =>$lang['submit'], - 'L_AUTHOR' =>$lang['author'], 'L_COMMENT' =>$lang['comment'], 'L_DOWNLOAD' => $lang['download'], 'L_DOWNLOAD_HINT' => $lang['download_hint'], @@ -588,11 +514,6 @@ $template->assign_vars(array( 'L_PICTURE_HIGH' => $lang['picture_high'], 'L_UP_HINT' => $lang['home_hint'], 'L_UP_ALT' => $lang['home'], - 'L_CREATION_DATE' => $lang['creation_date'], - 'L_AVAILABILITY_DATE' => $lang['registration_date'], - 'L_SIZE' => $lang['size'], - 'L_FILE' => $lang['file'], - 'L_FILE_SIZE' => $lang['size'], 'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php'), 'U_UP' => add_session_id($url_up), @@ -730,61 +651,123 @@ if (isset($picture['current']['comment']) )); } -// keywords -if (!empty($picture['current']['keywords'])) +$infos = array(); + +// author +if (!empty($picture['current']['author'])) { - $keywords = explode(',', $picture['current']['keywords']); - $content = ''; - $url = PHPWG_ROOT_PATH.'category.php?cat=search&search=keywords:'; - foreach ($keywords as $i => $keyword) - { - $local_url = add_session_id($url.$keyword); - if ($i > 0) - { - $content.= ','; - } - $content.= ''.$keyword.''; - } - $template->assign_block_vars( - 'keywords', - array( - 'INFO'=>$lang['keywords'], - 'VALUE'=>$content - )); + $infos['INFO_AUTHOR'] = + ''.$picture['current']['author'].''; +} +else +{ + $infos['INFO_AUTHOR'] = l10n('N/A'); } -// related categories -$cat_output = ''; -$page['show_comments'] = false; -foreach ($related_categories as $category) +// creation date +if (!empty($picture['current']['date_creation'])) { - if ($cat_output != '') - { - $cat_output.= '
'; - } - - if (count($related_categories) > 3) + $infos['INFO_CREATION_DATE'] = + ''.format_date($picture['current']['date_creation']).''; +} +else +{ + $infos['INFO_CREATION_DATE'] = l10n('N/A'); +} + +// date of availability +$infos['INFO_AVAILABILITY_DATE'] = + ''. + format_date($picture['current']['date_available'], 'mysql_datetime'). + ''; + +// size in pixels +if ($picture['current']['is_picture']) +{ + if ($original_width != $picture_size[0] + or $original_height != $picture_size[1]) { - $cat_output .= get_cat_display_name_cache($category['uppercats']); + $infos['INFO_DIMENSIONS'] = + ''. + $original_width.'*'.$original_height.''; } else { - $cat_info = get_cat_info($category['category_id']); - $cat_output .= get_cat_display_name($cat_info['name']); - } - // the picture is commentable if it belongs at least to one category which - // is commentable - if ($category['commentable'] == 'true') - { - $page['show_comments'] = true; + $infos['INFO_DIMENSIONS'] = $original_width.'*'.$original_height; } } -$template->assign_block_vars( - 'associated', - array( - 'INFO' => $lang['categories'], - 'VALUE' => $cat_output - )); +else +{ + $infos['INFO_DIMENSIONS'] = l10n('N/A'); +} + +// filesize +if (!empty($picture['current']['filesize'])) +{ + $infos['INFO_FILESIZE'] = + sprintf(l10n('%d Kb'), $picture['current']['filesize']); +} +else +{ + $infos['INFO_FILESIZE'] = l10n('N/A'); +} + +// number of visits +$infos['INFO_VISITS'] = $picture['current']['hit']; + +// file +$infos['INFO_FILE'] = $picture['current']['file']; + +// keywords +if (!empty($picture['current']['keywords'])) +{ + $infos['INFO_KEYWORDS'] = + preg_replace( + '/([^,]+)/', + '$1', + $picture['current']['keywords'] + ); +} +else +{ + $infos['INFO_KEYWORDS'] = l10n('N/A'); +} + +$template->assign_vars($infos); + +// related categories +foreach ($related_categories as $category) +{ + $template->assign_block_vars( + 'category', + array( + 'LINE' => count($related_categories) > 3 + ? get_cat_display_name_cache($category['uppercats']) + : get_cat_display_name_from_id($category['category_id']) + ) + ); +} //------------------------------------------------------------------- metadata if ($metadata_showable and isset($_GET['show_metadata'])) @@ -893,7 +876,8 @@ if ( isset( $_GET['slideshow'] ) ) //------------------------------------------------------------------- rating if ($conf['rate']) { - $query = 'SELECT COUNT(rate) AS count + $query = ' +SELECT COUNT(rate) AS count , ROUND(AVG(rate),2) AS average , ROUND(STD(rate),2) AS STD FROM '.RATE_TABLE.' @@ -906,11 +890,12 @@ if ($conf['rate']) } else { - $value = $row['average']; - $value.= ' ('; - $value.= $row['count'].' '.$lang['rates']; - $value.= ', '.$lang['standard_deviation'].' : '.$row['STD']; - $value.= ')'; + $value = sprintf( + l10n('%.2f (rated %d times, standard deviation = %.2f)'), + $row['average'], + $row['count'], + $row['STD'] + ); } if (!$user['is_the_guest']) @@ -934,10 +919,17 @@ if ($conf['rate']) $template->assign_block_vars( 'rate', array( - 'INFO' => $lang['element_rate'], - 'VALUE' => $value, + 'CONTENT' => $value, 'SENTENCE' => $sentence )); + + $template->assign_block_vars('info_rate', array('CONTENT' => $value)); + + $template->assign_vars( + array( + 'INFO_RATE' => $value + ) + ); foreach ($rate_items as $num => $mark) { @@ -966,6 +958,18 @@ if ($conf['rate']) } //---------------------------------------------------- users's comments display + +// the picture is commentable if it belongs at least to one category which +// is commentable +$page['show_comments'] = false; +foreach ($related_categories as $category) +{ + if ($category['commentable'] == 'true') + { + $page['show_comments'] = true; + } +} + if ($page['show_comments']) { // number of comment for this picture diff --git a/template/cclear/default-colors.css b/template/cclear/default-colors.css index 3bf837da9..3681a6ee7 100644 --- a/template/cclear/default-colors.css +++ b/template/cclear/default-colors.css @@ -25,7 +25,7 @@ A { } A:hover { - color: #754300; + color: #858460; } @@ -114,7 +114,8 @@ A.navThumb, A.navThumb:hover { } input, select, textarea { color:black; - background-color:#eee; + background-color: lightgrey; + border: 1px solid gray; } .bouton { background-color:#d3d3d3; diff --git a/template/cclear/default-layout.css b/template/cclear/default-layout.css index 18d96bfa4..d8af28a93 100644 --- a/template/cclear/default-layout.css +++ b/template/cclear/default-layout.css @@ -35,16 +35,21 @@ H2 { A { text-decoration:none; - /*border-bottom: 1px dotted #000000;*/ + border-bottom: 1px dotted #005e89; } A:hover { - border-bottom-style: solid; + border-bottom: 1px solid #858460; } IMG { border: none; } +HR.separation { + visibility: hidden; + clear: both; +} + #copyright { clear: both; font-size: 83%; diff --git a/template/cclear/image.css b/template/cclear/image.css index a4a036be0..4c587f205 100644 --- a/template/cclear/image.css +++ b/template/cclear/image.css @@ -7,6 +7,7 @@ #imageHeaderBar H1 { margin: 1ex 0; /* override default-layout for less bottom-margin */ + clear: both; } #imageToolBar { @@ -73,12 +74,20 @@ de l'image... TABLE.infoTable { margin: auto; } -TABLE.infoTable TD { +TABLE.infoTable .value { text-align: left; } TABLE.infoTable .label { font-weight: bold; + text-align: right; + padding-right: 0.5em; +} + +TABLE.infoTable TD.value UL { + margin: 0; + padding: 0 0 0 1.5em; + list-style-type: square; } #comments { diff --git a/template/cclear/picture.tpl b/template/cclear/picture.tpl index 2011a2c0a..3f2793fbe 100644 --- a/template/cclear/picture.tpl +++ b/template/cclear/picture.tpl @@ -10,44 +10,31 @@
- - {L_SLIDESHOW} - - - {L_PICTURE_METADATA} - + {L_SLIDESHOW} + {L_PICTURE_METADATA} + + {lang:representative} + - - {favorite.FAVORITE_ALT} - + {favorite.FAVORITE_ALT} - - {L_DOWNLOAD} - + {L_DOWNLOAD} - - {L_ADMIN} - + {L_ADMIN}
- + - - {L_UP_ALT} - + {L_UP_ALT} - +
-
+
@@ -80,12 +67,54 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + +
{info_line.INFO} :{info_line.VALUE}{lang:Author}{INFO_AUTHOR}
{lang:Created on}{INFO_CREATION_DATE}
{lang:Registered on}{INFO_AVAILABILITY_DATE}
{lang:Dimensions}{INFO_DIMENSIONS}
{lang:File}{INFO_FILE}
{lang:Filesize}{INFO_FILESIZE}
{lang:Keywords}{INFO_KEYWORDS}
{lang:Categories} +
    + +
  • {category.LINE}
    • + +
+
{lang:Visits}{INFO_VISITS}
{lang:Average rate}{info_rate.CONTENT}
@@ -113,6 +142,8 @@

+
+

[{comments.NB_COMMENT}] {L_COMMENT_TITLE}

diff --git a/template/cclear/theme/representative.png b/template/cclear/theme/representative.png index 971997db4..f1141d91b 100644 Binary files a/template/cclear/theme/representative.png and b/template/cclear/theme/representative.png differ -- cgit v1.2.3