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
This commit is contained in:
Ingo Schommer 2010-01-26 20:42:11 +00:00 committed by Sam Minnee
parent 7e92d844c1
commit 16f9491f94
4 changed files with 10 additions and 6 deletions

View File

@ -18,7 +18,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
// so that Director does not think they are actions of CMSMain // so that Director does not think they are actions of CMSMain
static $url_priority = 40; static $url_priority = 40;
static $menu_title = 'Site Content'; static $menu_title = 'Pages';
static $menu_priority = 10; static $menu_priority = 10;

View File

@ -509,8 +509,12 @@ class LeftAndMain extends Controller {
$rootLink = $this->Link() . '0'; $rootLink = $this->Link() . '0';
// This lets us override the tree title with an extension // This lets us override the tree title with an extension
if($this->hasMethod('getCMSTreeTitle')) $treeTitle = $this->getCMSTreeTitle(); if($this->hasMethod('getCMSTreeTitle') && $customTreeTitle = $this->getCMSTreeTitle()) {
else $treeTitle = _t('LeftAndMain.SITECONTENTLEFT',"Site Content",PR_HIGH,'Root node on left'); $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 = "<ul id=\"sitetree\" class=\"tree unformatted\"><li id=\"record-0\" class=\"Root nodelete\"><a href=\"$rootLink\"><strong>$treeTitle</strong></a>"
. $siteTree . "</li></ul>"; . $siteTree . "</li></ul>";

View File

@ -80,7 +80,7 @@ $lang['en_US']['CMSMain']['DESCREMOVED'] = 'and %s descendants';
$lang['en_US']['CMSMain']['EMAIL'] = 'Email'; $lang['en_US']['CMSMain']['EMAIL'] = 'Email';
$lang['en_US']['CMSMain']['GO'] = 'Go'; $lang['en_US']['CMSMain']['GO'] = 'Go';
$lang['en_US']['CMSMain']['MENUTITLE'] = array( $lang['en_US']['CMSMain']['MENUTITLE'] = array(
'Site Content', 'Pages',
100, 100,
'Menu title' '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']['SHOWONLYCHANGED'] = 'Show only changed pages';
$lang['en_US']['CMSMain_left.ss']['SHOWUNPUB'] = 'Show unpublished versions'; $lang['en_US']['CMSMain_left.ss']['SHOWUNPUB'] = 'Show unpublished versions';
$lang['en_US']['CMSMain_left.ss']['SITECONTENT TITLE'] = array( $lang['en_US']['CMSMain_left.ss']['SITECONTENT TITLE'] = array(
'Site Content and Structure', 'Page Tree',
PR_HIGH PR_HIGH
); );
$lang['en_US']['CMSMain_left.ss']['SITEREPORTS'] = 'Site Reports'; $lang['en_US']['CMSMain_left.ss']['SITEREPORTS'] = 'Site Reports';

View File

@ -4,7 +4,7 @@
<h2 id="heading_sitetree" class="selected"> <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_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') %>" /> <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> </h2>
<div id="sitetree_holder"> <div id="sitetree_holder">
<div id="TreeTools"> <div id="TreeTools">