From 53a62e7b8cb2fa4c8e676772ce03e2807a0028f9 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 19 Apr 2011 22:37:48 +1200
Subject: [PATCH] MINOR Moved 'access' field labels in
 SiteConfig->getCMSFields() and SiteTree->getCMSFields() from headlines to
 actual label elements in order to manage presentation easier

---
 code/model/SiteConfig.php | 11 ++++-------
 code/model/SiteTree.php   |  6 ++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/code/model/SiteConfig.php b/code/model/SiteConfig.php
index f5801701..0bb58ffc 100644
--- a/code/model/SiteConfig.php
+++ b/code/model/SiteConfig.php
@@ -52,19 +52,16 @@ class SiteConfig extends DataObject implements PermissionProvider {
 					new DropdownField("Theme", _t('SiteConfig.THEME', 'Theme'), $this->getAvailableThemes(), '', null, _t('SiteConfig.DEFAULTTHEME', '(Use default theme)'))
 				),
 				$tabAccess = new Tab('Access',
-					new HeaderField('WhoCanViewHeader', _t('SiteConfig.VIEWHEADER', "Who can view pages on this site?"), 2),
-					$viewersOptionsField = new OptionsetField("CanViewType"),
+					$viewersOptionsField = new OptionsetField("CanViewType", _t('SiteConfig.VIEWHEADER', "Who can view pages on this site?")),
 					$viewerGroupsField = new TreeMultiselectField("ViewerGroups", _t('SiteTree.VIEWERGROUPS', "Viewer Groups")),
-					new HeaderField('WhoCanEditHeader', _t('SiteConfig.EDITHEADER', "Who can edit pages on this site?"), 2),
-					$editorsOptionsField = new OptionsetField("CanEditType"),
+					$editorsOptionsField = new OptionsetField("CanEditType", _t('SiteConfig.EDITHEADER', "Who can edit pages on this site?")),
 					$editorGroupsField = new TreeMultiselectField("EditorGroups", _t('SiteTree.EDITORGROUPS', "Editor Groups")),
-					new HeaderField('WhoCanCreateTopLevelHeader', _t('SiteConfig.TOPLEVELCREATE', "Who can create pages in the root of the site?"), 2),
-					$topLevelCreatorsOptionsField = new OptionsetField("CanCreateTopLevelType"),
+					$topLevelCreatorsOptionsField = new OptionsetField("CanCreateTopLevelType", _t('SiteConfig.TOPLEVELCREATE', "Who can create pages in the root of the site?")),
 					$topLevelCreatorsGroupsField = new TreeMultiselectField("CreateTopLevelGroups", _t('SiteTree.TOPLEVELCREATORGROUPS', "Top level creators"))
 				)
 			)
 		);
-		
+
 		$viewersOptionsSource = array();
 		$viewersOptionsSource["Anyone"] = _t('SiteTree.ACCESSANYONE', "Anyone");
 		$viewersOptionsSource["LoggedInUsers"] = _t('SiteTree.ACCESSLOGGEDIN', "Logged-in users");
diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php
index ce41b985..d5334acf 100755
--- a/code/model/SiteTree.php
+++ b/code/model/SiteTree.php
@@ -1842,16 +1842,14 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 					)
 				),
 				$tabAccess = new Tab('Access',
-					new HeaderField('WhoCanViewHeader',_t('SiteTree.ACCESSHEADER', "Who can view this page?"), 2),
 					$viewersOptionsField = new OptionsetField(
 						"CanViewType", 
-						""
+						_t('SiteTree.ACCESSHEADER', "Who can view this page?")
 					),
 					$viewerGroupsField = new TreeMultiselectField("ViewerGroups", $this->fieldLabel('ViewerGroups')),
-					new HeaderField('WhoCanEditHeader',_t('SiteTree.EDITHEADER', "Who can edit this page?"), 2),
 					$editorsOptionsField = new OptionsetField(
 						"CanEditType", 
-						""
+						_t('SiteTree.EDITHEADER', "Who can edit this page?")
 					),
 					$editorGroupsField = new TreeMultiselectField("EditorGroups", $this->fieldLabel('EditorGroups'))
 				)