diff --git a/about.php b/about.php index ceecf4b..878e7e5 100644 --- a/about.php +++ b/about.php @@ -20,6 +20,7 @@ require_once('header.inc.php'); +$tplVars['pagetitle'] = T_('About'); $tplVars['subtitle'] = T_('About'); $templateservice->loadTemplate('about.tpl', $tplVars); diff --git a/alltags.php b/alltags.php index 45b13ab..95e797a 100644 --- a/alltags.php +++ b/alltags.php @@ -76,6 +76,7 @@ $tplVars['sidebar_blocks'] = array('linked'); $tplVars['userid'] = $userid; $tplVars['loadjs'] = true; +$tplVars['pagetitle'] = $pagetitle; $tplVars['subtitle'] = $pagetitle; $templateservice->loadTemplate('tags.tpl', $tplVars); diff --git a/bookmarks.php b/bookmarks.php index f0ce07d..ee3f96b 100644 --- a/bookmarks.php +++ b/bookmarks.php @@ -251,17 +251,12 @@ if ($templatename == 'editbookmark.tpl') { $tplVars['cat_url'] = createURL('bookmarks', '%s/%s'); $tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s'); if ($userservice->isLoggedOn() && $user == $currentUsername) { - //$title = T_('My Bookmarks') . $catTitleWithUrls; $tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle; $tplVars['subtitle'] = T_('My Bookmarks') . $catTitleWithUrls; } else { - //$title = $pagetitle; - //$tplVars['pagetitle'] = $pagetitle; - $tplVars['pagetitle'] = ''; + $tplVars['pagetitle'] = $user.': '.$cat; $tplVars['subtitle'] = $pagetitle; } - //$tplVars['pagetitle'] = $title; - //$tplVars['subtitle'] = $title; } $tplVars['summarizeLinkedTags'] = true; diff --git a/edit.php b/edit.php index 1ecb9d0..9011ac3 100644 --- a/edit.php +++ b/edit.php @@ -41,6 +41,7 @@ isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define( // Header variables +$tplVars['pagetitle'] = T_('Edit Bookmark'); $tplVars['subtitle'] = T_('Edit Bookmark'); $tplVars['loadjs'] = true; diff --git a/populartags.php b/populartags.php index 7938027..4cc87c6 100644 --- a/populartags.php +++ b/populartags.php @@ -72,6 +72,7 @@ if (isset($userid)) { } $tplVars['sidebar_blocks'] = array('linked'); +$tplVars['pagetitle'] = $pagetitle; $tplVars['subtitle'] = $pagetitle; $tplVars['loadjs'] = true; diff --git a/tags.php b/tags.php index 2050ca7..d3d116a 100644 --- a/tags.php +++ b/tags.php @@ -64,8 +64,7 @@ if ($usecache) { } // Header variables -//$tplVars['pagetitle'] = $pagetitle; -$tplVars['pagetitle'] = ''; +$tplVars['pagetitle'] = T_('Tags') .': '. $cat; $tplVars['loadjs'] = true; $tplVars['rsschannels'] = array( array(filter($sitename .': '. $pagetitle), createURL('rss', 'all/'. filter($cat, 'url')).'?sort='.getSortOrder())