diff options
| author | Matt <maf675@gmail.com> | 2010-04-09 14:46:58 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-16 19:33:51 +0200 |
| commit | 30035b94f5928d6eea2548563b1a1f7767f0e308 (patch) | |
| tree | a225e508e6ba55586b52c93ea02c6f75d3ffd054 /phpBB | |
| parent | e36da18b1c3a492df5789252600b1fc80805472a (diff) | |
| download | forums-30035b94f5928d6eea2548563b1a1f7767f0e308.tar forums-30035b94f5928d6eea2548563b1a1f7767f0e308.tar.gz forums-30035b94f5928d6eea2548563b1a1f7767f0e308.tar.bz2 forums-30035b94f5928d6eea2548563b1a1f7767f0e308.tar.xz forums-30035b94f5928d6eea2548563b1a1f7767f0e308.zip | |
[ticket/9532] Simplified page titles by removing meaningless text.
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.
PHPBB3-9532
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_header.html | 2 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index a3d47b5b59..e6c00c0385 100644 --- 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 index 8f4ac19fb8..4364581339 100644 --- 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} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- 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 index 963f5160dd..6f24bbd12c 100644 --- 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} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- 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 index d18508ccbc..bc818f1e3c 100644 --- 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 index 8e0521522d..12c0f909fd 100644 --- 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') |