aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-04-05 20:55:26 +0000
committerplegall <plg@piwigo.org>2006-04-05 20:55:26 +0000
commit969ebbf4f120064ab864329c8daf3adc38cfc38a (patch)
tree1e4e5fcd8d5661eeb10008fe74237bbc7874e8e3
parentcf5f9f4eb6ff84813db69bcd5aede7bd690f3ca7 (diff)
improvement: on picture.php, show title calculated in
include/section_init.inc.php instead of nothing. git-svn-id: http://piwigo.org/svn/trunk@1128 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--picture.php17
-rw-r--r--template/yoga/picture.tpl6
2 files changed, 8 insertions, 15 deletions
diff --git a/picture.php b/picture.php
index bb4f8ead7..988859546 100644
--- a/picture.php
+++ b/picture.php
@@ -370,18 +370,6 @@ if ( isset( $_GET['slideshow'] ) and isset($page['next_item']) )
);
}
-$title_img = $picture['current']['name'];
-if ( isset( $page['category'] ) )
-{
- if (is_numeric( $page['category'] ))
- {
- $title_img = replace_space(get_cat_display_name($page['cat_name']));
- }
- else if ( $page['cat'] == 'search' )
- { // ??? TODO -remove or change some remainings from old variables
- $title_img = replace_search( $title_img, $_GET['search'] );
- }
-}
$title_nb = ($page['current_rank'] + 1).'/'.$page['cat_nb_images'];
// calculation of width and height
@@ -442,7 +430,8 @@ $template->set_filenames(array('picture'=>'picture.tpl'));
$template->assign_vars(
array(
- 'CATEGORY' => $title_img,
+ 'SECTION_TITLE' => $page['title'],
+ 'PICTURE_TITLE' => $picture['current']['name'],
'PHOTO' => $title_nb,
'TITLE' => $picture['current']['name'],
'SRC_IMG' => $picture['current']['src'],
@@ -779,7 +768,7 @@ if ($metadata_showable and isset($_GET['metadata']))
include(PHPWG_ROOT_PATH.'include/picture_metadata.inc.php');
}
//------------------------------------------------------------ log informations
-pwg_log( 'picture', $title_img, $picture['current']['file'] );
+pwg_log('picture', $page['title'], $picture['current']['file']);
$template->parse('picture');
include(PHPWG_ROOT_PATH.'include/page_tail.php');
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 82260bc96..50c0b0fc3 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -3,7 +3,11 @@
<!-- END information -->
<div id="imageHeaderBar">
- <div class="browsePath"><a href="{U_HOME}" rel="home">{L_HOME}</a>{LEVEL_SEPARATOR}{CATEGORY}</div>
+ <div class="browsePath">
+ <a href="{U_HOME}" rel="home">{L_HOME}</a>
+ {LEVEL_SEPARATOR}{SECTION_TITLE}
+ {LEVEL_SEPARATOR}{PICTURE_TITLE}
+ </div>
<div class="imageNumber">{PHOTO}</div>
<!-- BEGIN title -->
<h2>{TITLE}</h2>