From 16f9491f94242ee33034b44f5b09a3772b0f6f9d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 26 Jan 2010 20:42:11 +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

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97597 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 44f1409e..bad3c804 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 b2b6ca1c..65b08b35 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -509,8 +509,12 @@ class LeftAndMain extends Controller {
 			$rootLink = $this->Link() . '0';
 			
 			// 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;
+			}
 			
 			$siteTree = "<ul id=\"sitetree\" class=\"tree unformatted\"><li id=\"record-0\" class=\"Root nodelete\"><a href=\"$rootLink\"><strong>$treeTitle</strong></a>"
 				. $siteTree . "</li></ul>";
diff --git a/lang/en_US.php b/lang/en_US.php
index 68681201..66ba2137 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -80,7 +80,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'
 );
@@ -170,7 +170,7 @@ $lang['en_US']['CMSMain_left.ss']['SELECTPAGESACTIONS'] = 'Select the pages that
 $lang['en_US']['CMSMain_left.ss']['SHOWONLYCHANGED'] = 'Show only changed pages';
 $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 fec64957..31845425 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -4,7 +4,7 @@
 		<h2 id="heading_sitetree" class="selected">
 			<img id="sitetree_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" style="display:none;" title="<% _t('OPENBOX','click to open this box') %>" />
 			<img id="sitetree_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" title="<% _t('CLOSEBOX','click to close box') %>" />
-			<% _t('SITECONTENT TITLE','Site Content and Structure',PR_HIGH) %>
+			<% _t('SITECONTENT TITLE','Page Tree',PR_HIGH) %>
 		</h2>
 		<div id="sitetree_holder">
 			<div id="TreeTools">