tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121 from chillu/silverstripe-cms

Browse Source 
---

....Main" to "Root.Main", merged "Root.Content.Metadata" tab into "Root.Main"

See https://github.com/silverstripe/sapphire/pull/420

Conflicts:
	code/model/SiteTree.php
This commit is contained in:
Ingo Schommer 2012-05-11 14:03:44 +02:00
commit af48b3948b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/model/SiteTree.php
View File

@ -1846,9 +1846,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
new TextField("Title", $this->fieldLabel('Title')), new TextField("Title", $this->fieldLabel('Title')),
$urlsegment, $urlsegment,
new TextField("MenuTitle", $this->fieldLabel('MenuTitle')), new TextField("MenuTitle", $this->fieldLabel('MenuTitle')),
$htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title')) $htmlField = new HtmlEditorField("Content", _t('SiteTree.HTMLEDITORTITLE', "Content", 'HTML editor title')),
),
$tabMeta = new Tab('Metadata',
new TextField("MetaTitle", $this->fieldLabel('MetaTitle')), new TextField("MetaTitle", $this->fieldLabel('MetaTitle')),
new TextareaField("MetaKeywords", $this->fieldLabel('MetaKeywords'), 1), new TextareaField("MetaKeywords", $this->fieldLabel('MetaKeywords'), 1),
new TextareaField("MetaDescription", $this->fieldLabel('MetaDescription')), new TextareaField("MetaDescription", $this->fieldLabel('MetaDescription')),
@ -1867,7 +1865,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
else $fields->removeFieldFromTab('Root', 'Dependent'); else $fields->removeFieldFromTab('Root', 'Dependent');
$tabMain->setTitle(_t('SiteTree.TABCONTENT', "Main Content")); $tabMain->setTitle(_t('SiteTree.TABCONTENT', "Main Content"));
$tabMeta->setTitle(_t('SiteTree.TABMETA', "Metadata"));
if(file_exists(BASE_PATH . '/install.php')) { if(file_exists(BASE_PATH . '/install.php')) {
$fields->addFieldToTab("Root.Main", new LiteralField("InstallWarningHeader", $fields->addFieldToTab("Root.Main", new LiteralField("InstallWarningHeader",
@ -1876,6 +1873,11 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
. "</p>"), "Title"); . "</p>"), "Title");
} }
// Backwards compat: Rewrite nested "Content" tabs to toplevel
$fields->setTabPathRewrites(array(
'/^Root\.Content\.Main$/' => 'Root.Main',
'/^Root\.Content\.([^.]+)$/' => 'Root.\\1',
));
if(self::$runCMSFieldsExtensions) { if(self::$runCMSFieldsExtensions) {
$this->extend('updateCMSFields', $fields); $this->extend('updateCMSFields', $fields);
@ -1913,9 +1915,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$visibility = new FieldGroup( $visibility = new FieldGroup(
new CheckboxField("ShowInMenus", $this->fieldLabel('ShowInMenus')), new CheckboxField("ShowInMenus", $this->fieldLabel('ShowInMenus')),
new CheckboxField("ShowInSearch", $this->fieldLabel('ShowInSearch')) new CheckboxField("ShowInSearch", $this->fieldLabel('ShowInSearch'))
) ),
),
$tabAccess = new Tab('Access',
$viewersOptionsField = new OptionsetField( $viewersOptionsField = new OptionsetField(
"CanViewType", "CanViewType",
_t('SiteTree.ACCESSHEADER', "Who can view this page?") _t('SiteTree.ACCESSHEADER', "Who can view this page?")
@ -1942,7 +1942,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$parentTypeSelector->addExtraClass('parentTypeSelector'); $parentTypeSelector->addExtraClass('parentTypeSelector');
$tabBehaviour->setTitle(_t('SiteTree.TABBEHAVIOUR', "Behavior")); $tabBehaviour->setTitle(_t('SiteTree.TABBEHAVIOUR', "Behavior"));
$tabAccess->setTitle(_t('SiteTree.TABACCESS', "Access"));
// Make page location fields read-only if the user doesn't have the appropriate permission // Make page location fields read-only if the user doesn't have the appropriate permission
if(!Permission::check("SITETREE_REORGANISE")) { if(!Permission::check("SITETREE_REORGANISE")) {