Merge pull request #318 from creative-commoners/pulls/2.0/subsite-management-ux-fixes

NEW Remove Subsite Configuration header, rename Main tab and remove Domains GridField title

lang/en.yml

@@ -29,12 +29,12 @@ en:
     CopyToSubsiteWithChildren: 'Include children pages?'
     SubsiteOperations: 'Subsite Operations'
   SilverStripe\Subsites\Model\Subsite:
+    ConfigurationTab: Configuration
     CopyMessage: 'Created a copy of {title}'
     CustomExtraMeta: 'Custom Meta Tags'
     CustomMetaDescription: Description
     CustomMetaKeywords: Keywords
     CustomMetaTitle: Title
-    DomainsListTitle: Domains
     PLURALNAME: Subsites
     PLURALS:
       one: 'A Subsite'
@@ -43,7 +43,6 @@ en:
     SINGULARNAME: Subsite
     SiteConfigSubtitle: 'Your tagline here'
     SiteConfigTitle: 'Your Site Name'
-    SubsiteConfigurationHeader: 'Subsite Configuration'
     ThemeFieldEmptyString: '-'
     ValidateTitle: 'Please add a "Title"'
   SilverStripe\Subsites\Model\SubsiteDomain:

src/Model/Subsite.php

@@ -657,7 +657,7 @@ class Subsite extends DataObject
                 $fields->addFieldsToTab('Root.Domains', [
                     GridField::create(
                         'Domains',
-                        _t(__CLASS__ . '.DomainsListTitle', 'Domains'),
+                        '',
                         $this->Domains(),
                         GridFieldConfig_RecordEditor::create(10)
                     )
@@ -668,13 +668,6 @@ class Subsite extends DataObject
             // in a wrapper further down. The RedirectURL field is currently not in use.
             $fields->removeByName(['PageTypeBlacklist', 'RedirectURL']);
 
-            // Add the heading to the top of the fields list
-            $fields->fieldByName('Root.Main')
-                ->unshift(HeaderField::create(
-                    'ConfigForSubsiteHeaderField',
-                    _t(__CLASS__ . '.SubsiteConfigurationHeader', 'Subsite Configuration')
-                ));
-
             $fields->addFieldToTab('Root.Main', DropdownField::create(
                 'Language',
                 $this->fieldLabel('Language'),
@@ -709,6 +702,9 @@ class Subsite extends DataObject
 
             // We don't need the Groups many many tab
             $fields->removeByName('Groups');
+
+            // Rename the main tab to configuration
+            $fields->fieldByName('Root.Main')->setTitle(_t(__CLASS__ . '.ConfigurationTab', 'Configuration'));
         });
 
         return parent::getCMSFields();