From 2c224bf69f527e22ee97d7168bdeaf81fd216453 Mon Sep 17 00:00:00 2001
From: Matt <maf675@gmail.com>
Date: Fri, 9 Apr 2010 14:46:58 -0700
Subject: [PATCH] Page Title's corrected. Removed View Forum, View Topic, added pagination to forum and topic page titles, also moved the Site Name to the end of title for forum and topic view pages.

---
 phpBB/language/en/common.php                       |    1 +
 .../styles/prosilver/template/overall_header.html  |    2 +-
 .../styles/subsilver2/template/overall_header.html |    2 +-
 phpBB/viewforum.php                                |    2 +-
 phpBB/viewtopic.php                                |    2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 phpBB/language/en/common.php
 mode change 100644 => 100755 phpBB/styles/prosilver/template/overall_header.html
 mode change 100644 => 100755 phpBB/styles/subsilver2/template/overall_header.html
 mode change 100644 => 100755 phpBB/viewforum.php
 mode change 100644 => 100755 phpBB/viewtopic.php

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
old mode 100644
new mode 100755
index a3d47b5..e6c00c0
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -416,6 +416,7 @@ $lang = array_merge($lang, array(
 	'OPTIONS'					=> 'Options',
 
 	'PAGE_OF'				=> 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
+	'PAGE_TITLE_NUMBER'		=> 'Page %s',
 	'PASSWORD'				=> 'Password',
 	'PIXEL'					=> 'px',
 	'PLAY_QUICKTIME_FILE'	=> 'Play Quicktime file',
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
old mode 100644
new mode 100755
index 8f4ac19..4364581
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -13,7 +13,7 @@
 <meta name="description" content="" />
 <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
 {META}
-<title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
+<title><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
 <!-- IF S_ENABLE_FEEDS -->
 	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
old mode 100644
new mode 100755
index 963f516..6f24bbd
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -13,7 +13,7 @@
 <meta name="description" content="" />
 <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
 {META}
-<title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
+<title><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --></title>
 
 <!-- IF S_ENABLE_FEEDS -->
 	<!-- IF S_ENABLE_FEEDS_OVERALL --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {SITENAME}" href="{U_FEED}" /><!-- ENDIF -->
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
old mode 100644
new mode 100755
index d18508c..bc818f1
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -142,7 +142,7 @@ else
 }
 
 // Dump out the page header and load viewforum template
-page_header($user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name'], true, $forum_id);
+page_header($forum_data['forum_name'] . ($start ? ' - ' . sprintf($user->lang['PAGE_TITLE_NUMBER'], floor($start / $config['topics_per_page']) + 1) : ''), true, $forum_id);
 
 $template->set_filenames(array(
 	'body' => 'viewforum_body.html')
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
old mode 100644
new mode 100755
index 8e05215..12c0f90
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1744,7 +1744,7 @@ if (empty($_REQUEST['t']) && !empty($topic_id))
 }
 
 // Output the page
-page_header($user->lang['VIEW_TOPIC'] . ' - ' . $topic_data['topic_title'], true, $forum_id);
+page_header($topic_data['topic_title'] . ($start ? ' - ' . sprintf($user->lang['PAGE_TITLE_NUMBER'], floor($start / $config['posts_per_page']) + 1) : ''), true, $forum_id);
 
 $template->set_filenames(array(
 	'body' => ($view == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html')
-- 
1.7.0