From 3b50f8d3f39ae0106a00061bac5e1c9b2998bf9e Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 13 Apr 2010 22:19:49 +0000
Subject: [PATCH] ENHANCEMENT Changed menu title from "Site Content" to "Pages"
 to be consistent with other menu labels ENHANCEMENT Changed tree root node in
 CMS to get title from SiteConfig rather than defaulting to "Site Content"
 ENHANCEMENT Changed tree panel headline in CMS from "Site Content and
 Structure" to "Page Tree" to stay consistent with new CMS menu title (from
 r97597)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102731 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php                   | 2 +-
 code/LeftAndMain.php               | 8 ++++++--
 lang/en_US.php                     | 4 ++--
 templates/Includes/CMSMain_left.ss | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index e11de3d5..c44c3161 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -18,7 +18,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	// so that Director does not think they are actions of CMSMain
 	static $url_priority = 40;
 	
-	static $menu_title = 'Site Content';
+	static $menu_title = 'Pages';
 	
 	static $menu_priority = 10;
 	
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index e2967dcf..c4754186 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -517,8 +517,12 @@ class LeftAndMain extends Controller {
 			$rootLink = $this->Link('show') . '/root';
 			
 			// This lets us override the tree title with an extension
-			if($this->hasMethod('getCMSTreeTitle')) $treeTitle = $this->getCMSTreeTitle();
-			else $treeTitle =  _t('LeftAndMain.SITECONTENTLEFT',"Site Content",PR_HIGH,'Root node on left');
+			if($this->hasMethod('getCMSTreeTitle') && $customTreeTitle = $this->getCMSTreeTitle()) {
+				$treeTitle = $customTreeTitle;
+			} else {
+				$siteConfig = SiteConfig::current_site_config();
+				$treeTitle =  $siteConfig->Title;
+			}
 			
 			$html = "<ul id=\"sitetree\" class=\"tree unformatted\"><li id=\"record-0\" class=\"Root nodelete\"><a href=\"$rootLink\"><strong>$treeTitle</strong></a>"
 				. $html . "</li></ul>";
diff --git a/lang/en_US.php b/lang/en_US.php
index 0f289cd8..1925b523 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -77,7 +77,7 @@ $lang['en_US']['CMSMain']['DESCREMOVED'] = 'and %s descendants';
 $lang['en_US']['CMSMain']['EMAIL'] = 'Email';
 $lang['en_US']['CMSMain']['GO'] = 'Go';
 $lang['en_US']['CMSMain']['MENUTITLE'] = array(
-	'Site Content',
+	'Pages',
 	100,
 	'Menu title'
 );
@@ -154,7 +154,7 @@ $lang['en_US']['CMSMain_left.ss']['SEARCH'] = 'Search';
 $lang['en_US']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Select the pages that you want to change &amp; then click an action:';
 $lang['en_US']['CMSMain_left.ss']['SHOWUNPUB'] = 'Show unpublished versions';
 $lang['en_US']['CMSMain_left.ss']['SITECONTENT TITLE'] = array(
-	'Site Content and Structure',
+	'Page Tree',
 	PR_HIGH
 );
 $lang['en_US']['CMSMain_left.ss']['SITEREPORTS'] = 'Site Reports';
diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index 34452736..2e7b4ba7 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -1,6 +1,6 @@
 	<div id="treepanes">
 		<h3>
-			<a href="#"><% _t('SITECONTENT TITLE','Site Content and Structure',PR_HIGH) %></a>
+			<a href="#"><% _t('SITECONTENT TITLE','Page Tree',PR_HIGH) %></a>
 		</h3>
 		<div id="sitetree_holder">
 			<div id="sitetree_and_tools">