Permalink
Browse files

bug 2772: remove "Home" from html title pages on index pages

git-svn-id: http://piwigo.org/svn/trunk@18637 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
modus75 committed Oct 13, 2012
1 parent 1e6e762 commit 7f75c131ed12fe830a13cc77ae677aa0d68740a4
Showing with 18 additions and 16 deletions.
  1. +0 −4 include/config_default.inc.php
  2. +0 −4 include/page_header.php
  3. +15 −2 include/section_init.inc.php
  4. +1 −1 index.php
  5. +1 −1 picture.php
  6. +1 −4 themes/default/template/header.tpl
@@ -182,10 +182,6 @@
// );
$conf['random_index_redirect'] = array();
// reverse_home_title: if Piwigo is your home page for a better robot index
// we recommend to set it true (Only index page will reverse its title)
$conf['reverse_home_title'] = false;
// List of notes to display on all header page
// example $conf['header_notes'] = array('Test', 'Hello');
$conf['header_notes'] = array();
@@ -48,10 +48,6 @@
isset($page['body_id']) ?
$page['body_id'] : '',
'REVERSE' =>
(isset($conf['reverse_home_title']) and $conf['reverse_home_title']) ?
true : false,
'CONTENT_ENCODING' => get_pwg_charset(),
'PAGE_TITLE' => strip_tags($title),
@@ -561,9 +561,22 @@
{
if (!empty($page['title']))
{
$page['title'] = $conf['level_separator'].$page['title'];
$page['section_title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].$page['title'];
}
$page['title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$page['title'];
else
{
if ('picture'==script_basename())
{
$used_title = l10n('Home');
$used_link = duplicate_index_url(array('start'=>0));
}
else
{
$used_title = @$page['is_homepage'] ? $conf['gallery_title'] :l10n('Home');
$used_link = get_gallery_home_url();
}
$page['section_title'] = $page['title'] = '<a href="'.$used_link.'">'.$used_title.'</a>';
}
}
// add meta robots noindex, nofollow to avoid unnecesary robot crawls
@@ -111,7 +111,7 @@
$template->set_filenames( array('index'=>'index.tpl') );
//-------------------------------------------------------------- category title
$template_title = $page['title'];
$template_title = $page['section_title'];
if (count($page['items']) > 0)
{
$template_title.= ' ['.count($page['items']).']';
@@ -736,7 +736,7 @@ function default_picture_content($content, $element_info)
$template->assign(
array(
'SECTION_TITLE' => $page['title'],
'SECTION_TITLE' => $page['section_title'],
'PHOTO' => $title_nb,
'IS_HOME' => ('categories'==$page['section'] and !isset($page['category']) ),
@@ -16,10 +16,7 @@
<meta name="description" content="{$PAGE_TITLE}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
{/if}
{/if}

{if (isset($REVERSE) and $REVERSE and $PAGE_TITLE == l10n('Home'))}
<title>{$GALLERY_TITLE} | {$PAGE_TITLE}</title>{else}
<title>{$PAGE_TITLE} | {$GALLERY_TITLE}</title>{/if}
<title>{$PAGE_TITLE}{if $PAGE_TITLE!=$GALLERY_TITLE} | {$GALLERY_TITLE}{/if}</title>
<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">

<link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" >

0 comments on commit 7f75c13

Please sign in to comment.