Changeset 18637

Timestamp:

Oct 13, 2012, 5:55:35 PM (12 years ago)

Author:

rvelices

Message:

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

Location:

trunk

Files:

• include/config_default.inc.php (modified) (1 diff)
• include/page_header.php (modified) (1 diff)
• include/section_init.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• themes/default/template/header.tpl (modified) (1 diff)

trunk/include/config_default.inc.php

@@ -182 +182 @@
 //    );
 $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

trunk/include/page_header.php

@@ -48 +48 @@
       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(),

trunk/include/section_init.inc.php

@@ -562 +562 @@
   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>';
+  }
 }
 

trunk/index.php

@@ -112 +112 @@
 $template->set_filenames( array('index'=>'index.tpl') );
 //-------------------------------------------------------------- category title
-$template_title = $page['title'];
+$template_title = $page['section_title'];
 if (count($page['items']) > 0)
 {

trunk/picture.php

@@ -737 +737 @@
 $template->assign(
   array(
-    'SECTION_TITLE' => $page['title'],
+    'SECTION_TITLE' => $page['section_title'],
     'PHOTO' => $title_nb,
     'IS_HOME' => ('categories'==$page['section'] and !isset($page['category']) ),

trunk/themes/default/template/header.tpl

@@ -17 +17 @@
 {/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">