diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 10f42d34c..6e320e902 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ // | file : $Id$ // | last update : $Date$ @@ -224,7 +224,7 @@ else '

'; } -$template->assign_vars( +$template->assign( array( 'U_SYNC' => PHPWG_ROOT_PATH.'admin.php?page=picture_modify'. @@ -265,29 +265,27 @@ $template->assign_vars( if ($row['has_high'] == 'true') { - $template->assign_block_vars( - 'high', - array( - 'FILESIZE' => isset($row['high_filesize']) + $template->assign( + 'HIGH_FILESIZE', + isset($row['high_filesize']) ? $row['high_filesize'].' KB' - : l10n('unknown'), - ) + : l10n('unknown') ); } // image level options -$blockname = 'level_option'; -$selected_level = isset($_POST['level']) ? $_POST['level'] : $row['level']; +$tpl_options = array(); foreach ($conf['available_permission_levels'] as $level) { - $template->assign_block_vars( - $blockname, - array( - 'VALUE' => $level, - 'CONTENT' => l10n( sprintf('Level %d', $level) ), - 'SELECTED' => ($level==$selected_level ? 'selected="selected"' : ''), - )); + $tpl_options[$level] = l10n( sprintf('Level %d', $level) ).' ('.$level.')'; } +$selected_level = isset($_POST['level']) ? $_POST['level'] : $row['level']; +$template->assign( + array( + 'level_options'=> $tpl_options, + 'level_options_selected' => array($selected_level) + ) + ); // creation date unset($day, $month, $year); @@ -308,9 +306,21 @@ else { list($year, $month, $day) = array('', 0, 0); } -get_day_list('date_creation_day', $day); + + get_month_list('date_creation_month', $month); -$template->assign_vars(array('DATE_CREATION_YEAR_VALUE' => $year)); +$month_list = $lang['month']; +$month_list[0]='------------'; +ksort($month_list); + +$template->assign( + array( + 'DATE_CREATION_DAY_VALUE' => $day, + 'DATE_CREATION_MONTH_VALUE' => $month, + 'DATE_CREATION_YEAR_VALUE' => $year, + 'month_list' => $month_list, + ) + ); $query = ' SELECT category_id, uppercats @@ -321,27 +331,22 @@ SELECT category_id, uppercats ;'; $result = pwg_query($query); -if (mysql_num_rows($result) > 1) -{ - $template->assign_block_vars('links', array()); -} - while ($row = mysql_fetch_array($result)) { $name = get_cat_display_name_cache( $row['uppercats'], - PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id=', + get_root_url().'admin.php?page=cat_modify&cat_id=', false ); if ($row['category_id'] == $storage_category_id) { - $template->assign_vars(array('STORAGE_CATEGORY' => $name)); + $template->assign('STORAGE_CATEGORY', $name); } else { - $template->assign_block_vars('links.category', array('NAME' => $name)); + $template->append('related_categories', $name); } } @@ -395,12 +400,7 @@ else if (isset($url_img)) { - $template->assign_block_vars( - 'jumpto', - array( - 'URL' => $url_img - ) - ); + $template->assign( 'U_JUMPTO', $url_img ); } // associate to another category ? @@ -411,7 +411,7 @@ SELECT id,name,uppercats,global_rank WHERE image_id = '.$_GET['image_id'].' AND id != '.$storage_category_id.' ;'; -display_select_cat_wrapper($query, array(), 'associated_option'); +display_select_cat_wrapper($query, array(), 'associated_options'); $result = pwg_query($query); $associateds = array($storage_category_id); @@ -424,7 +424,7 @@ SELECT id,name,uppercats,global_rank FROM '.CATEGORIES_TABLE.' WHERE id NOT IN ('.implode(',', $associateds).') ;'; -display_select_cat_wrapper($query, array(), 'dissociated_option'); +display_select_cat_wrapper($query, array(), 'dissociated_options'); // representing $query = ' @@ -432,7 +432,7 @@ SELECT id,name,uppercats,global_rank FROM '.CATEGORIES_TABLE.' WHERE representative_picture_id = '.$_GET['image_id'].' ;'; -display_select_cat_wrapper($query, array(), 'elected_option'); +display_select_cat_wrapper($query, array(), 'elected_options'); $query = ' SELECT id,name,uppercats,global_rank @@ -440,7 +440,7 @@ SELECT id,name,uppercats,global_rank WHERE representative_picture_id != '.$_GET['image_id'].' OR representative_picture_id IS NULL ;'; -display_select_cat_wrapper($query, array(), 'dismissed_option'); +display_select_cat_wrapper($query, array(), 'dismissed_options'); //----------------------------------------------------------- sending html code diff --git a/include/page_tail.php b/include/page_tail.php index 57f884338..dcb9155a3 100644 --- a/include/page_tail.php +++ b/include/page_tail.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ // | file : $Id$ // | last update : $Date$ @@ -31,19 +31,14 @@ $template->assign_vars( array( 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 'PHPWG_URL' => PHPWG_URL, - - 'L_TITLE_MAIL' => urlencode(l10n('title_send_mail')), )); //--------------------------------------------------------------------- contact if (!is_a_guest()) { - $template->assign_block_vars( - 'contact', - array( - 'MAIL' => get_webmaster_mail_address() - ) + $template->assign( + 'CONTACT_MAIL', get_webmaster_mail_address() ); } @@ -71,16 +66,11 @@ if ($conf['show_queries']) $debug_vars = array_merge($debug_vars, array('QUERIES_LIST' => $debug) ); } -if ( !empty($debug_vars) ) -{ - $template->assign_block_vars('debug',$debug_vars ); -} +$template->assign('debug', $debug_vars ); trigger_action('loc_end_page_tail'); // // Generate the page // -$template->parse('tail'); - -$template->p(); +$template->pparse('tail'); ?> diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php index 1c6968e17..f966421c9 100644 --- a/include/picture_comment.inc.php +++ b/include/picture_comment.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ // | file : $Id$ // | last update : $Date$ @@ -73,14 +73,10 @@ if ( $page['show_comments'] and isset( $_POST['content'] ) ) trigger_error('Invalid comment action '.$comment_action, E_USER_WARNING); } - $block_var = ($comment_action=='reject') ? 'errors.error' : 'infos.info'; - foreach ($infos as $info) - { - $template->assign_block_vars( - $block_var, - array( 'TEXT'=>$info ) - ); - } + $template->assign( + ($comment_action=='reject') ? 'errors' : 'infos', + $infos + ); // allow plugins to notify what's going on trigger_action( 'user_comment_insertion', @@ -108,7 +104,7 @@ if ($page['show_comments']) $page['start'] = 0; } - $page['navigation_bar'] = create_navigation_bar( + $navigation_bar = create_navigation_bar( duplicate_picture_url(array(), array('start')), $row['nb_comments'], $page['start'], @@ -116,11 +112,10 @@ if ($page['show_comments']) true // We want a clean URL ); - $template->assign_block_vars( - 'comments', + $template->assign( array( - 'NB_COMMENT' => $row['nb_comments'], - 'NAV_BAR' => $page['navigation_bar'], + 'COMMENT_COUNT' => $row['nb_comments'], + 'COMMENT_NAV_BAR' => $navigation_bar, ) ); @@ -138,39 +133,33 @@ SELECT id,author,date,image_id,content while ($row = mysql_fetch_array($result)) { - $template->assign_block_vars( - 'comments.comment', + $tpl_comment = array( - 'COMMENT_AUTHOR' => trigger_event('render_comment_author', + 'AUTHOR' => trigger_event('render_comment_author', empty($row['author']) ? l10n('guest') : $row['author']), - 'COMMENT_DATE' => format_date( + 'DATE' => format_date( $row['date'], 'mysql_datetime', true), - 'COMMENT' => trigger_event('render_comment_content',$row['content']), - ) + 'CONTENT' => trigger_event('render_comment_content',$row['content']), ); if (is_admin()) { - $template->assign_block_vars( - 'comments.comment.delete', - array( - 'U_COMMENT_DELETE' => - add_url_params( - $url_self, - array( - 'action'=>'delete_comment', - 'comment_to_delete'=>$row['id'] - ) - ) - ) - ); + $tpl_comment['U_DELETE'] = + add_url_params( + $url_self, + array( + 'action'=>'delete_comment', + 'comment_to_delete'=>$row['id'] + ) + ); } + $template->append('comments', $tpl_comment); } } @@ -184,19 +173,13 @@ SELECT id,author,date,image_id,content { $content = htmlspecialchars($comm['content']); } - $template->assign_block_vars('comments.add_comment', + $template->assign('comment_add', array( + 'F_ACTION' => $url_self, 'KEY' => $key, - 'CONTENT' => $content + 'CONTENT' => $content, + 'SHOW_AUTHOR' => !is_classic_user() )); - - // display author field if the user status is guest or generic - if (!is_classic_user()) - { - $template->assign_block_vars( - 'comments.add_comment.author_field', array() - ); - } } } diff --git a/include/picture_metadata.inc.php b/include/picture_metadata.inc.php index 513ee55c5..861a1e2c5 100644 --- a/include/picture_metadata.inc.php +++ b/include/picture_metadata.inc.php @@ -2,10 +2,9 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -31,15 +30,15 @@ */ include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php'); -$template->assign_block_vars('metadata', array()); if (($conf['show_exif']) and (function_exists('read_exif_data'))) { if ($exif = @read_exif_data($picture['current']['image_path'])) { $exif = trigger_event('format_exif_data', $exif, $picture['current'] ); - $template->assign_block_vars( - 'metadata.headline', - array('TITLE' => 'EXIF Metadata') + + $tpl_meta = array( + 'TITLE' => 'EXIF Metadata', + 'lines' => array(), ); foreach ($conf['show_exif_fields'] as $field) @@ -53,14 +52,7 @@ if (($conf['show_exif']) and (function_exists('read_exif_data'))) { $key = $lang['exif_field_'.$field]; } - - $template->assign_block_vars( - 'metadata.line', - array( - 'KEY' => $key, - 'VALUE' => $exif[$field] - ) - ); + $tpl_meta['lines'][$key] = $exif[$field]; } } else @@ -73,19 +65,14 @@ if (($conf['show_exif']) and (function_exists('read_exif_data'))) { $key = $lang['exif_field_'.$tokens[1]]; } - - $template->assign_block_vars( - 'metadata.line', - array( - 'KEY' => $key, - 'VALUE' => $exif[$tokens[0]][$tokens[1]] - ) - ); + $tpl_meta['lines'][$key] = $exif[$tokens[0]][$tokens[1]]; } } } + $template->append('metadata', $tpl_meta); } } + if ($conf['show_iptc']) { $iptc = get_iptc_data($picture['current']['image_path'], @@ -93,27 +80,21 @@ if ($conf['show_iptc']) if (count($iptc) > 0) { - $template->assign_block_vars( - 'metadata.headline', - array('TITLE' => 'IPTC Metadata') + $tpl_meta = array( + 'TITLE' => 'IPTC Metadata', + 'lines' => array(), ); - } - foreach ($iptc as $field => $value) - { - $key = $field; - if (isset($lang[$field])) + foreach ($iptc as $field => $value) { - $key = $lang[$field]; + $key = $field; + if (isset($lang[$field])) + { + $key = $lang[$field]; + } + $tpl_meta['lines'][$key] = $value; } - - $template->assign_block_vars( - 'metadata.line', - array( - 'KEY' => $key, - 'VALUE' => $value - ) - ); + $template->append('metadata', $tpl_meta); } } diff --git a/include/picture_rate.inc.php b/include/picture_rate.inc.php index 331cb41b0..4ffd0c8c1 100644 --- a/include/picture_rate.inc.php +++ b/include/picture_rate.inc.php @@ -2,10 +2,9 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -35,24 +34,12 @@ if ($conf['rate']) $query = ' SELECT COUNT(rate) AS count , ROUND(AVG(rate),2) AS average - , ROUND(STD(rate),2) AS STD + , ROUND(STD(rate),2) AS std FROM '.RATE_TABLE.' WHERE element_id = '.$picture['current']['id'].' ;'; $row = mysql_fetch_array(pwg_query($query)); - if ($row['count'] == 0) - { - $value = l10n('no_rate'); - } - else - { - $value = sprintf( - l10n('%.2f (rated %d times, standard deviation = %.2f)'), - $row['average'], - $row['count'], - $row['STD'] - ); - } + $template->assign('rate_summary', $row); $user_rate = null; if ($conf['rate_anonymous'] or is_autorize_status(ACCESS_CLASSIC) ) @@ -83,37 +70,17 @@ SELECT COUNT(rate) AS count } } - $template->assign_block_vars( - 'rate', - array( - 'SENTENCE' =>isset($user_rate) ? l10n('update_rate') : l10n('new_rate'), - 'F_ACTION' => add_url_params( + $template->assign( + 'rating', + array( + 'F_ACTION' => add_url_params( $url_self, array('action'=>'rate') - ) + ), + 'USER_RATE'=> $user_rate, + 'marks' => $conf['rate_items'] ) ); - - $template->assign_block_vars('info_rate', array('CONTENT' => $value)); - - foreach ($conf['rate_items'] as $num => $mark) - { - $template->assign_block_vars( - 'rate.rate_option', - array( - 'OPTION' => $mark, - 'SEPARATOR' => ($num > 0 ? '|' : ''), - ) - ); - if (isset($user_rate) and $user_rate==$mark) - { - $template->assign_block_vars('rate.rate_option.my_rate', array() ); - } - else - { - $template->assign_block_vars('rate.rate_option.not_my_rate', array() ); - } - } } } diff --git a/picture.php b/picture.php index 052d9c325..07d6ef7cd 100644 --- a/picture.php +++ b/picture.php @@ -81,7 +81,7 @@ function default_picture_content($content, $element_info) if ( !$page['slideshow'] and isset($element_info['high_url']) ) { $uuid = uniqid(rand()); - $template->assign_block_vars( + $template->assign( 'high', array( 'U_HIGH' => $element_info['high_url'], @@ -89,7 +89,7 @@ function default_picture_content($content, $element_info) ) ); } - $template->assign_vars( array( + $template->assign( array( 'SRC_IMG' => $element_info['image_url'], 'ALT_IMG' => $element_info['file'], 'WIDTH_IMG' => @$element_info['scaled_width'], @@ -472,19 +472,8 @@ $template->set_filenames( array( 'picture' => (($page['slideshow'] and $conf['light_slideshow']) ? 'slideshow.tpl' : 'picture.tpl'), - 'nav_buttons' => 'picture_nav_buttons.tpl')); + )); -if ($page['slideshow']) -{ - // Add local-slideshow.css file if exists - // Not only for ligth - $css = get_root_url() . get_themeconf('template_dir') . '/theme/' - . get_themeconf('theme') . '/local-slideshow.css'; - if (file_exists($css)) - { - $template->assign_block_vars('slideshow', array()); - } -} $title = $picture['current']['name']; $title_nb = ($page['current_rank'] + 1).'/'.count($page['items']); @@ -523,69 +512,67 @@ $picture = trigger_event('picture_pictures_data', $picture); if (isset($picture['next']['image_url']) and $picture['next']['is_picture'] ) { - $template->assign_block_vars( - 'prefetch', - array ( - 'URL' => $picture['next']['image_url'] - ) - ); + $template->assign('U_PREFETCH', $picture['next']['image_url'] ); } //------------------------------------------------------- navigation management -foreach (array('first','previous','next','last') as $which_image) +foreach (array('first','previous','next','last', 'current') as $which_image) { if (isset($picture[$which_image])) { - $template->assign_block_vars( + $template->assign( $which_image, array( - 'TITLE_IMG' => $picture[$which_image]['name'], - 'IMG' => $picture[$which_image]['thumbnail'], + 'TITLE' => $picture[$which_image]['name'], + 'THUMB_SRC' => $picture[$which_image]['thumbnail'], // Params slideshow was transmit to navigation buttons 'U_IMG' => add_url_params( - $picture[$which_image]['url'], $slideshow_url_params) + $picture[$which_image]['url'], $slideshow_url_params), + 'U_DOWNLOAD' => @$picture['current']['download_url'], ) ); } - else - { - $template->assign_block_vars( - $which_image.'_unactive', - array() - ); - } } if ($page['slideshow']) { + // Add local-slideshow.css file if exists + // Not only for ligth + $css = PHPWG_ROOT_PATH . get_themeconf('template_dir') . '/theme/' + . get_themeconf('theme') . '/local-slideshow.css'; + if (file_exists($css)) + { + //TODO CORRECT THIS $template->assign_block_vars('slideshow', array()); + } + + $tpl_slideshow = array(); + //slideshow end - $template->assign_block_vars( - 'stop_slideshow', + $template->assign( array( - 'U_SLIDESHOW' => $picture['current']['url'], + 'U_SLIDESHOW_STOP' => $picture['current']['url'], ) ); foreach (array('repeat', 'play') as $p) { - $template->assign_block_vars( - ($slideshow_params[$p] ? 'stop' : 'start').'_'.$p, - array( - // Params slideshow was transmit to navigation buttons - 'U_IMG' => + $var_name = + 'U_' + .($slideshow_params[$p] ? 'STOP_' : 'START_') + .strtoupper($p); + + $tpl_slideshow[$var_name] = add_url_params( $picture['current']['url'], array('slideshow' => encode_slideshow_params( - array_merge($slideshow_params, + array_merge($slideshow_params, array($p => ! $slideshow_params[$p])) - ) ) ) - ) - ); + ); } foreach (array('dec', 'inc') as $op) @@ -593,105 +580,73 @@ if ($page['slideshow']) $new_period = $slideshow_params['period'] + ((($op == 'dec') ? -1 : 1) * $conf['slideshow_period_step']); $new_slideshow_params = correct_slideshow_params( - array_merge($slideshow_params, + array_merge($slideshow_params, array('period' => $new_period))); - $block_period = $op.'_period'; if ($new_slideshow_params['period'] === $new_period) { - $template->assign_block_vars( - $block_period, - array( - // Params slideshow was transmit to navigation buttons - 'U_IMG' => + $var_name = 'U_'.strtoupper($op).'_PERIOD'; + $tpl_slideshow[$var_name] = add_url_params( $picture['current']['url'], array('slideshow' => encode_slideshow_params($new_slideshow_params) ) - ) - ) ); } - else - { - $template->assign_block_vars( - $block_period.'_unactive', - array() - ); - } } + $template->assign('slideshow', $tpl_slideshow ); } else { - $template->assign_block_vars( - 'start_slideshow', + $template->assign( array( - 'U_SLIDESHOW' => + 'U_SLIDESHOW_START' => add_url_params( $picture['current']['url'], array( 'slideshow'=>'')) ) ); - $template->assign_block_vars( - 'up',array('U_URL' => $url_up)); } -$template->assign_vars( +$template->assign( array( 'SECTION_TITLE' => $page['title'], - 'PICTURE_TITLE' => $picture['current']['name'], 'PHOTO' => $title_nb, - 'TITLE' => $picture['current']['name'], + 'SHOW_PICTURE_NAME_ON_TITLE' => $conf['show_picture_name_on_title'], 'LEVEL_SEPARATOR' => $conf['level_separator'], + + 'FILE_PICTURE_NAV_BUTTONS' => 'picture_nav_buttons.tpl', 'U_HOME' => make_index_url(), + 'U_UP' => $url_up, 'U_METADATA' => $url_metadata, - 'U_ADMIN' => $url_admin, - 'U_ADD_COMMENT' => $url_self, ) ); -if ($conf['show_picture_name_on_title']) -{ - $template->assign_block_vars('title', array()); -} //------------------------------------------------------- upper menu management -// download link -if ( isset($picture['current']['download_url']) ) -{ - $template->assign_block_vars( - 'download', - array( - 'U_DOWNLOAD' => $picture['current']['download_url'] - ) - ); -} - -// button to set the current picture as representative -if (is_admin() and isset($page['category'])) -{ - $template->assign_block_vars( - 'representative', - array( - 'URL' => add_url_params($url_self, - array('action'=>'set_as_representative') - ) - ) - ); -} - -// caddie button +// admin links if (is_admin()) { - $template->assign_block_vars( - 'caddie', + if (isset($page['category'])) + { + $template->assign( + array( + 'U_SET_AS_REPRESENTATIVE' => add_url_params($url_self, + array('action'=>'set_as_representative') + ) + ) + ); + } + + $template->assign( array( - 'URL' => add_url_params($url_self, + 'U_CADDIE' => add_url_params($url_self, array('action'=>'add_to_caddie') - ) + ), + 'U_ADMIN' => $url_admin, ) ); } @@ -711,7 +666,7 @@ SELECT COUNT(*) AS nb_fav if ($row['nb_fav'] == 0) { - $template->assign_block_vars( + $template->assign( 'favorite', array( 'FAVORITE_IMG' => @@ -727,7 +682,7 @@ SELECT COUNT(*) AS nb_fav } else { - $template->assign_block_vars( + $template->assign( 'favorite', array( 'FAVORITE_IMG' => @@ -742,11 +697,6 @@ SELECT COUNT(*) AS nb_fav ); } } -//------------------------------------ admin link for information modifications -if ( is_admin() ) -{ - $template->assign_block_vars('admin', array()); -} //--------------------------------------------------------- picture information $header_infos = array(); //for html header use @@ -754,13 +704,11 @@ $header_infos = array(); //for html header use if (isset($picture['current']['comment']) and !empty($picture['current']['comment'])) { - $template->assign_block_vars( - 'legend', - array( - 'COMMENT_IMG' => + $template->assign( + 'COMMENT_IMG', trigger_event('render_element_description', $picture['current']['comment']) - )); + ); $header_infos['COMMENT'] = strip_tags($picture['current']['comment']); } @@ -780,10 +728,6 @@ if (!empty($picture['current']['author'])) $picture['current']['author']; $header_infos['INFO_AUTHOR'] = $picture['current']['author']; } -else -{ - $infos['INFO_AUTHOR'] = l10n('N/A'); -} // creation date if (!empty($picture['current']['date_creation'])) @@ -800,10 +744,6 @@ if (!empty($picture['current']['date_creation'])) $infos['INFO_CREATION_DATE'] = ''.$val.''; } -else -{ - $infos['INFO_CREATION_DATE'] = l10n('N/A'); -} // date of availability $val = format_date($picture['current']['date_available'], 'mysql_datetime'); @@ -836,10 +776,6 @@ if ($picture['current']['is_picture'] and isset($picture['current']['width']) ) $picture['current']['width'].'*'.$picture['current']['height']; } } -else -{ - $infos['INFO_DIMENSIONS'] = l10n('N/A'); -} // filesize if (!empty($picture['current']['filesize'])) @@ -847,10 +783,6 @@ 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']; @@ -858,47 +790,46 @@ $infos['INFO_VISITS'] = $picture['current']['hit']; // file $infos['INFO_FILE'] = $picture['current']['file']; -// tags +$template->assign($infos); + +// related tags $tags = get_common_tags( array($page['image_id']), -1); if ( count($tags) ) { - $infos['INFO_TAGS'] = ''; - foreach ($tags as $num => $tag) + foreach ($tags as $tag) { - $infos['INFO_TAGS'] .= $num ? ', ' : ''; - $infos['INFO_TAGS'] .= ''.$tag['name'].''; + ); } - $header_infos['INFO_TAGS'] = strip_tags($infos['INFO_TAGS']); } -else -{ - $infos['INFO_TAGS'] = 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 + $template->append( + 'related_categories', + count($related_categories) > 3 ? get_cat_display_name_cache($category['uppercats']) : get_cat_display_name_from_id($category['category_id']) - ) ); } -// assign tpl picture_nav_buttons -$template->assign_var_from_handle('NAV_BUTTONS', 'nav_buttons'); - // maybe someone wants a special display (call it before page_header so that // they can add stylesheets) $element_content = trigger_event( @@ -906,7 +837,7 @@ $element_content = trigger_event( '', $picture['current'] ); -$template->assign_var( 'ELEMENT_CONTENT', $element_content ); +$template->assign( 'ELEMENT_CONTENT', $element_content ); // +-----------------------------------------------------------------------+ // | sub pages | @@ -923,6 +854,6 @@ pwg_log($picture['current']['id'], 'picture'); include(PHPWG_ROOT_PATH.'include/page_header.php'); trigger_action('loc_end_picture'); -$template->parse('picture'); +$template->pparse('picture'); include(PHPWG_ROOT_PATH.'include/page_tail.php'); ?> diff --git a/template/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl index b0fe64911..2dada069f 100644 --- a/template/yoga/admin/picture_modify.tpl +++ b/template/yoga/admin/picture_modify.tpl @@ -1,129 +1,125 @@ - - -

{lang:title_picmod}

+{* $Id$ *} +

{'title_picmod'|@translate}

-{lang:thumbnail} +{'thumbnail'|@translate} -
+
- {lang:Informations} + {'Informations'|@translate} - - + + - - + + - - + + - - + + - +{if isset($HIGH_FILESIZE) } - - + + - +{/if} - - + + - + {if isset($related_categories) } - + - + {/if}
{lang:Path}{PATH}{'Path'|@translate}{$PATH}
{lang:Post date}{REGISTRATION_DATE}{'Post date'|@translate}{$REGISTRATION_DATE}
{lang:Dimensions}{DIMENSIONS}{'Dimensions'|@translate}{$DIMENSIONS}
{lang:Filesize}{FILESIZE}{'Filesize'|@translate}{$FILESIZE}
{lang:High filesize}{high.FILESIZE}{'High filesize'|@translate}{$HIGH_FILESIZE}
{lang:Storage category}{STORAGE_CATEGORY}{'Storage category'|@translate}{$STORAGE_CATEGORY}
{lang:Linked categories}{'Linked categories'|@translate}
    - -
  • {links.category.NAME}
    • - + {foreach from=$related_categories item=name} +
  • {$name}
    • + {/foreach}
- {lang:Properties} + {'Properties'|@translate} - - + + - - + + - + - - + + - - + + - + @@ -131,38 +127,34 @@
{lang:Name}{'Name'|@translate}
{lang:Author}{'Author'|@translate}
{lang:Creation date}{'Creation date'|@translate} - - {lang:set to} + + {'set to'|@translate} + value="{$DATE_CREATION_YEAR_VALUE}" />
{lang:Tags}{TAG_SELECTION}{'Tags'|@translate}{$TAG_SELECTION}
{lang:Description}{'Description'|@translate}
{lang:Minimum privacy level}{'Minimum privacy level'|@translate}

- - + +

-
+
- {lang:Association to categories} + {'Association to categories'|@translate}
-

{lang:Associated}

+

{'Associated'|@translate}

-

+

-

{lang:Dissociated}

+

{'Dissociated'|@translate}

-

+

@@ -170,30 +162,26 @@
-
+
- {lang:Representation of categories} + {'Representation of categories'|@translate}
-

{lang:Represents}

+

{'Represents'|@translate}

-

+

-

{lang:Does not represent}

+

{'Does not represent'|@translate}

-

+

diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl index e21969078..37aab1fba 100644 --- a/template/yoga/footer.tpl +++ b/template/yoga/footer.tpl @@ -1,31 +1,32 @@ - +{* $Id$ *} - -{footer_element.CONTENT} - +{if isset($footer_elemets)} +{foreach from=$footer_elements item=v} +{$v} +{/foreach} +{/if} - - {debug.QUERIES_LIST} - +{if isset($debug.QUERIES_LIST)}{$debug.QUERIES_LIST}{/if} diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl index ebfba0998..9f77b8b56 100644 --- a/template/yoga/picture.tpl +++ b/template/yoga/picture.tpl @@ -1,207 +1,230 @@ - - +{* $Id$ *} +{if isset($errors)}
-
    - -
  • {errors.error.TEXT}
    • - -
+
    + {foreach from=$errors item=error} +
  • {$error}
    • + {/foreach} +
- - +{/if} + +{if isset($infos)}
-
    - -
  • {infos.info.TEXT}
    • - -
+
    + {foreach from=$infos item=info} +
  • {$info}
    • + {/foreach} +
- +{/if}
- {lang:home} - {LEVEL_SEPARATOR}{SECTION_TITLE} - {LEVEL_SEPARATOR}{PICTURE_TITLE} + {'home'|@translate} + {$LEVEL_SEPARATOR}{$SECTION_TITLE} + {$LEVEL_SEPARATOR}{$current.TITLE}
-
{PHOTO}
- -

{TITLE}

- +
{$PHOTO}
+ {if $SHOW_PICTURE_NAME_ON_TITLE } +

{$current.TITLE}

+ {/if}
- - {lang:slideshow} - - - {lang:slideshow_stop} - - {lang:picture_show_metadata} - - {lang:download} - - {PLUGIN_PICTURE_ACTIONS} - - {favorite.FAVORITE_ALT} - - - {lang:representative} - - - {lang:link_info_image} - - - {lang:caddie} - + {if isset($U_SLIDESHOW_START) } + {'slideshow'|@translate} + {/if} + {if isset($U_SLIDESHOW_STOP) } + {'slideshow_stop'|@translate} + {/if} + {'picture_show_metadata'|@translate} + {if isset($current.U_DOWNLOAD) } + {'download'|@translate} + {/if} + {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} + {if isset($favorite) } + {$favorite.FAVORITE_ALT} + {/if} + {if !empty($U_SET_AS_REPRESENTATIVE) } + {'representative'|@translate} + {/if} + {if isset($U_ADMIN) } + {'link_info_image'|@translate} + {/if} + {if isset($U_CADDIE) } + {'caddie'|@translate} + {/if}
- {NAV_BUTTONS} + {include file=$FILE_PICTURE_NAV_BUTTONS}
-{ELEMENT_CONTENT} - -

{legend.COMMENT_IMG}

- - +{$ELEMENT_CONTENT} + +{if isset($COMMENT_IMG)} +

{$COMMENT_IMG}

+{/if} + +{if isset($U_SLIDESHOW_STOP) }

- [ {lang:slideshow_stop} ] + [ {'slideshow_stop'|@translate} ]

- +{/if} +
- - - - - - +{/if} - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + - - + + - - - + + - + {if isset($rate_summary) } + + + + + {/if}
{lang:Author}{INFO_AUTHOR}{'Author'|@translate}{if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}
{lang:Created on}{INFO_CREATION_DATE}{'Created on'|@translate}{if isset($INFO_CREATION_DATE)}{$INFO_CREATION_DATE}{else}{'N/A'|@translate}{/if}
{lang:Posted on}{INFO_POSTED_DATE}{'Posted on'|@translate}{$INFO_POSTED_DATE}
{lang:Dimensions}{INFO_DIMENSIONS}{'Dimensions'|@translate}{if isset($INFO_DIMENSIONS)}{$INFO_DIMENSIONS}{else}{'N/A'|@translate}{/if}
{lang:File}{INFO_FILE}{'File'|@translate}{$INFO_FILE}
{lang:Filesize}{INFO_FILESIZE}{'Filesize'|@translate}{if isset($INFO_FILESIZE)}{$INFO_FILESIZE}{else}{'N/A'|@translate}{/if}
{lang:Tags}{INFO_TAGS}
{lang:Categories}{'Tags'|@translate} -
    - -
  • {category.LINE}
    • - -
+ {if isset($related_tags)} + {foreach from=$related_tags item=tag name=tag_loop} + {if !$smarty.foreach.tag_loop.first}, {/if} + {$tag.NAME} + {/foreach} + {/if}
{lang:Visits}{INFO_VISITS}{'Categories'|@translate} + {if isset($related_categories)} +
    + {foreach from=$related_categories item=cat} +
  • {$cat}
    • + {/foreach} +
+ {/if} +
{lang:Average rate}{info_rate.CONTENT}{'Visits'|@translate}{$INFO_VISITS}
{'Average rate'|@translate} + {if $rate_summary.count} + {assign var='rate_text' value='%.2f (rated %d times, standard deviation = %.2f)'|@translate } + {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count, $rate_summary.std) } + {else} + {'no_rate'|@translate} + {/if} +
- +{if isset($metadata)} - +{foreach from=$metadata item=meta} - + - - + {foreach from=$meta.lines item=value key=label} - - + + - + {/foreach} +{/foreach}
{metadata.headline.TITLE}{$meta.TITLE}
{metadata.line.KEY}{metadata.line.VALUE}{$label}{$value}
- +{/if} - - -
{rate.SENTENCE} : - -{rate.rate_option.SEPARATOR} - - - - - - - - +{if isset($rating)} + +
+{if isset($rating.USER_RATE)}{'update_rate'|@translate}{else}{'new_rate'|@translate}{/if} +: +{foreach from=$rating.marks item=mark name=rate_loop} +{if !$smarty.foreach.rate_loop.first} | {/if} +{if $mark==$rating.USER_RATE} + +{else} + +{/if} +{/foreach} +
- +{/if}
- +{if isset($COMMENT_COUNT)}
-

[{comments.NB_COMMENT}] {lang:comments_title}

+

[{$COMMENT_COUNT}] {'comments_title'|@translate}

-
{comments.NAV_BAR}
+
{$COMMENT_NAV_BAR}
- + {if isset($comments)} + {foreach from=$comments item=comment}
- + {if isset($comment.U_DELETE)}

- - [{lang:delete}] + + [{'delete'|@translate}]

- -

{comments.comment.COMMENT_AUTHOR} - {comments.comment.COMMENT_DATE}

-
{comments.comment.COMMENT}
+ {/if} +

{$comment.AUTHOR} - {$comment.DATE}

+
{$comment.CONTENT}
- + {/foreach} + {/if} - -
+ {if isset($comment_add)} +
- {lang:comments_add} - - - - - - + {'comments_add'|@translate} + {if $comment_add.SHOW_AUTHOR} + + {/if} + + +
- + {/if}
- +{/if} {*comments*} diff --git a/template/yoga/picture_nav_buttons.tpl b/template/yoga/picture_nav_buttons.tpl index 4041f7b42..f82f5f467 100644 --- a/template/yoga/picture_nav_buttons.tpl +++ b/template/yoga/picture_nav_buttons.tpl @@ -1,90 +1,101 @@ - - +{* $Id$ *}
- - - - - - - - - - - - - - {lang:start_play} - - - {lang:stop_play} - - - {lang:thumbnails} - - - - - - - - - - - - - - - {lang:start_repeat} - - - {lang:stop_repeat} - - - {lang:inc_period} - - - - - - {lang:dec_period} - - - - + +{if isset($last)} + +{else} + +{/if} + +{if isset($next)} + +{else} + +{/if} + +{if isset($slideshow.U_START_PLAY)} + {'start_play'|@translate} +{/if} + +{if isset($slideshow.U_STOP_PLAY)} + {'stop_play'|@translate} +{/if} + +{if isset($U_UP) and !isset($slideshow)} + {'thumbnails'|@translate} +{/if} + +{if isset($previous)} + +{else} + +{/if} + +{if isset($first)} + +{else} + +{/if} + + +{if isset($slideshow.U_START_REPEAT)} + {'start_repeat'|@translate} +{/if} + +{if isset($slideshow.U_STOP_REPEAT)} + {'stop_repeat'|@translate} +{/if} + +{if isset($slideshow)} +{if isset($slideshow.U_INC_PERIOD)} + {'inc_period'|@translate} +{else} + +{/if} + +{if isset($slideshow.U_DEC_PERIOD)} + {'dec_period'|@translate} +{else} + +{/if} +{/if} +