silverstripe / cwp

src/Extensions/CwpSiteSummaryExtension.php

Indentation +35 added lines, -35 removed lines

@@ -5,41 +5,41 @@
  */
 class CwpSiteSummaryExtension extends Extension
 {
-    /**
-     * Updates the modules used for the version label by:
-     *  - Removing SS Framework
-     *  - Adding CWP
-     *  - Relabelling SS CMS
-     *
-     * @param array $modules
-     */
-    public function updateVersionModules(&$modules)
-    {
-        unset($modules['silverstripe/framework']);
-        $modules = ['cwp/cwp' => 'CWP'] + $modules;
-        $modules['silverstripe/cms'] = 'SilverStripe CMS';
-    }
+	/**
+	 * Updates the modules used for the version label by:
+	 *  - Removing SS Framework
+	 *  - Adding CWP
+	 *  - Relabelling SS CMS
+	 *
+	 * @param array $modules
+	 */
+	public function updateVersionModules(&$modules)
+	{
+		unset($modules['silverstripe/framework']);
+		$modules = ['cwp/cwp' => 'CWP'] + $modules;
+		$modules['silverstripe/cms'] = 'SilverStripe CMS';
+	}
 
-    /**
-     * Updates the dropdown filter used to filter supported packages by renaming the labels (replaces the existing
-     * filter options)
-     *
-     * @param GridFieldDropdownFilter $dropdownFilter
-     */
-    public function updateDropdownFilterOptions($dropdownFilter)
-    {
-        $dropdownFilter->removeFilterOption('supported');
-        $dropdownFilter->removeFilterOption('unsupported');
+	/**
+	 * Updates the dropdown filter used to filter supported packages by renaming the labels (replaces the existing
+	 * filter options)
+	 *
+	 * @param GridFieldDropdownFilter $dropdownFilter
+	 */
+	public function updateDropdownFilterOptions($dropdownFilter)
+	{
+		$dropdownFilter->removeFilterOption('supported');
+		$dropdownFilter->removeFilterOption('unsupported');
 
-        $dropdownFilter->addFilterOption(
-            'supported',
-            _t(__CLASS__ . '.FilterSupported', 'CWP recipe modules'),
-            ['Supported' => true]
-        );
-        $dropdownFilter->addFilterOption(
-            'unsupported',
-            _t(__CLASS__ . '.FilterUnsupported', 'Non CWP modules'),
-            ['Supported' => false]
-        );
-    }
+		$dropdownFilter->addFilterOption(
+			'supported',
+			_t(__CLASS__ . '.FilterSupported', 'CWP recipe modules'),
+			['Supported' => true]
+		);
+		$dropdownFilter->addFilterOption(
+			'unsupported',
+			_t(__CLASS__ . '.FilterUnsupported', 'Non CWP modules'),
+			['Supported' => false]
+		);
+	}
 }

src/Extensions/MaintenanceProxyExtension.php

Indentation +41 added lines, -41 removed lines

@@ -13,48 +13,48 @@
  */
 class MaintenanceProxyExtension extends Extension
 {
-    /**
-     * Configures required environment settings for Composer's use, applies to
-     * {@link \BringYourOwnIdeas\Maintenance\Util\ComposerLoader} and is applied before ComposerLoaderExtension in
-     * bringyourownideas/silverstripe-composer-update-checker to ensure the proxy information is set before Composer
-     * is created
-     */
-    public function onAfterBuild()
-    {
-        // Provide access for Composer's StreamContextFactory, since it creates its own stream context
-        if ($proxy = $this->getCwpProxy()) {
-            $_SERVER['CGI_HTTP_PROXY'] = $proxy;
-        }
-    }
+	/**
+	 * Configures required environment settings for Composer's use, applies to
+	 * {@link \BringYourOwnIdeas\Maintenance\Util\ComposerLoader} and is applied before ComposerLoaderExtension in
+	 * bringyourownideas/silverstripe-composer-update-checker to ensure the proxy information is set before Composer
+	 * is created
+	 */
+	public function onAfterBuild()
+	{
+		// Provide access for Composer's StreamContextFactory, since it creates its own stream context
+		if ($proxy = $this->getCwpProxy()) {
+			$_SERVER['CGI_HTTP_PROXY'] = $proxy;
+		}
+	}
 
-    /**
-     * Provide proxy options for {@link \BringYourOwnIdeas\Maintenance\Util\ApiLoader} instances to use in
-     * their Guzzle clients
-     *
-     * @param array $options
-     */
-    public function updateClientOptions(&$options)
-    {
-        if ($proxy = $this->getCwpProxy()) {
-            $options['proxy'] = $proxy;
-        }
-    }
+	/**
+	 * Provide proxy options for {@link \BringYourOwnIdeas\Maintenance\Util\ApiLoader} instances to use in
+	 * their Guzzle clients
+	 *
+	 * @param array $options
+	 */
+	public function updateClientOptions(&$options)
+	{
+		if ($proxy = $this->getCwpProxy()) {
+			$options['proxy'] = $proxy;
+		}
+	}
 
-    /**
-     * Returns a formatted CWP proxy string, e.g. `tcp://proxy.cwp.govt.nz:1234`
-     *
-     * @return string
-     */
-    protected function getCwpProxy()
-    {
-        if (!Environment::getEnv('SS_OUTBOUND_PROXY') || !Environment::getEnv('SS_OUTBOUND_PROXY_PORT')) {
-            return '';
-        }
+	/**
+	 * Returns a formatted CWP proxy string, e.g. `tcp://proxy.cwp.govt.nz:1234`
+	 *
+	 * @return string
+	 */
+	protected function getCwpProxy()
+	{
+		if (!Environment::getEnv('SS_OUTBOUND_PROXY') || !Environment::getEnv('SS_OUTBOUND_PROXY_PORT')) {
+			return '';
+		}
 
-        return sprintf(
-            'tcp://%s:%d',
-            Environment::getEnv('SS_OUTBOUND_PROXY'),
-            Environment::getEnv('SS_OUTBOUND_PROXY_PORT')
-        );
-    }
+		return sprintf(
+			'tcp://%s:%d',
+			Environment::getEnv('SS_OUTBOUND_PROXY'),
+			Environment::getEnv('SS_OUTBOUND_PROXY_PORT')
+		);
+	}
 }

tests/Report/CwpStatsReportTest.php

Indentation +38 added lines, -38 removed lines

@@ -11,42 +11,42 @@
 
 class CwpStatsReportTest extends SapphireTest
 {
-    protected static $fixture_file = 'CwpStatsReportTest.yml';
-
-    protected function setUp()
-    {
-        Config::modify()->set(SiteTree::class, 'create_default_pages', false);
-
-        parent::setUp();
-    }
-
-    public function testCount()
-    {
-        // Publish all pages apart from page3.
-        $this->objFromFixture(Page::class, 'page1')->publishRecursive();
-        $this->objFromFixture(Page::class, 'page2')->publishRecursive();
-        $this->objFromFixture(Page::class, 'page3')->publishRecursive();
-
-        // Add page5s to a subsite, if the module is installed.
-        $page5s = $this->objFromFixture(Page::class, 'page5s');
-        if (class_exists(Subsite::class)) {
-            $subsite = Subsite::create();
-            $subsite->Title = 'subsite';
-            $subsite->write();
-
-            $page5s->SubsiteID = $subsite->ID;
-            $page5s->write();
-        }
-        $page5s->publishRecursive();
-
-        $report = CwpStatsReport::create();
-        $records = $report->sourceRecords([])->toArray();
-        $i = 0;
-        $this->assertEquals(4, $records[$i++]['Count'], 'Four pages in total, across locales, subsites, live only.');
-        if (class_exists(Subsite::class)) {
-            $this->assertEquals(3, $records[$i++]['Count'], 'Three pages in the main site, if subsites installed.');
-            $this->assertEquals(1, $records[$i++]['Count'], 'One page in the subsite, if subsites installed');
-        }
-        $this->assertEquals(1, $records[$i++]['Count'], 'One file in total.');
-    }
+	protected static $fixture_file = 'CwpStatsReportTest.yml';
+
+	protected function setUp()
+	{
+		Config::modify()->set(SiteTree::class, 'create_default_pages', false);
+
+		parent::setUp();
+	}
+
+	public function testCount()
+	{
+		// Publish all pages apart from page3.
+		$this->objFromFixture(Page::class, 'page1')->publishRecursive();
+		$this->objFromFixture(Page::class, 'page2')->publishRecursive();
+		$this->objFromFixture(Page::class, 'page3')->publishRecursive();
+
+		// Add page5s to a subsite, if the module is installed.
+		$page5s = $this->objFromFixture(Page::class, 'page5s');
+		if (class_exists(Subsite::class)) {
+			$subsite = Subsite::create();
+			$subsite->Title = 'subsite';
+			$subsite->write();
+
+			$page5s->SubsiteID = $subsite->ID;
+			$page5s->write();
+		}
+		$page5s->publishRecursive();
+
+		$report = CwpStatsReport::create();
+		$records = $report->sourceRecords([])->toArray();
+		$i = 0;
+		$this->assertEquals(4, $records[$i++]['Count'], 'Four pages in total, across locales, subsites, live only.');
+		if (class_exists(Subsite::class)) {
+			$this->assertEquals(3, $records[$i++]['Count'], 'Three pages in the main site, if subsites installed.');
+			$this->assertEquals(1, $records[$i++]['Count'], 'One page in the subsite, if subsites installed');
+		}
+		$this->assertEquals(1, $records[$i++]['Count'], 'One file in total.');
+	}
 }

src/Extensions/CwpCommentingExtension.php

Indentation +14 added lines, -14 removed lines

@@ -14,20 +14,20 @@
  */
 class CwpCommentingExtension extends Extension
 {
-    public function alterCommentForm(Form $form)
-    {
-        $fields = $form->Fields();
+	public function alterCommentForm(Form $form)
+	{
+		$fields = $form->Fields();
 
-        if ($emailField = $fields->dataFieldByName('Email')) {
-            $emailField
-                ->setTitle(_t(__CLASS__ . '.EMAIL_TITLE', 'Email'))
-                ->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
-        }
+		if ($emailField = $fields->dataFieldByName('Email')) {
+			$emailField
+				->setTitle(_t(__CLASS__ . '.EMAIL_TITLE', 'Email'))
+				->setDescription(_t(__CLASS__ . '.WILL_NOT_BE_PUBLISHED', 'Will not be published.'));
+		}
 
-        if ($urlField = $fields->dataFieldByName('URL')) {
-            $urlField
-                ->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
-                ->setAttribute('placeholder', 'http://');
-        }
-    }
+		if ($urlField = $fields->dataFieldByName('URL')) {
+			$urlField
+				->setTitle(_t(__CLASS__ . '.WEBSITE_TITLE', 'Your website (optional)'))
+				->setAttribute('placeholder', 'http://');
+		}
+	}
 }

src/Model/RelatedPageLink.php

Indentation +23 added lines, -23 removed lines

@@ -8,30 +8,30 @@
 
 class RelatedPageLink extends DataObject
 {
-    private static $table_name = 'BasePage_RelatedPages';
+	private static $table_name = 'BasePage_RelatedPages';
 
-    private static $extensions = [
-        Versioned::class,
-    ];
+	private static $extensions = [
+		Versioned::class,
+	];
 
-    private static $db = [
-        'SortOrder' => 'Int',
-    ];
+	private static $db = [
+		'SortOrder' => 'Int',
+	];
 
-    /**
-     * For backwards compatibility these must match a traditional 'many_many' definition.
-     * This was BasePage.RelatedPages => BasePage
-     * ManyMany relations are normally joined by ${DefiningClass}ID && ${RelatedClass}ID
-     * excepting in the case where ${DefiningClass} === ${RelatedClass}
-     * Then the 'related class' column changes from ${RelatedClass}ID to "ChildID".
-     *
-     * {@see SilverStripe\ORM\DataObjectSchema->parseManyManyComponent()}
-     *
-     * @var array
-     * @config
-     */
-    private static $has_one = [
-        'BasePage' => BasePage::class,
-        'Child' => BasePage::class,
-    ];
+	/**
+	 * For backwards compatibility these must match a traditional 'many_many' definition.
+	 * This was BasePage.RelatedPages => BasePage
+	 * ManyMany relations are normally joined by ${DefiningClass}ID && ${RelatedClass}ID
+	 * excepting in the case where ${DefiningClass} === ${RelatedClass}
+	 * Then the 'related class' column changes from ${RelatedClass}ID to "ChildID".
+	 *
+	 * {@see SilverStripe\ORM\DataObjectSchema->parseManyManyComponent()}
+	 *
+	 * @var array
+	 * @config
+	 */
+	private static $has_one = [
+		'BasePage' => BasePage::class,
+		'Child' => BasePage::class,
+	];
 }

src/Extensions/CustomSiteConfig.php

Indentation +49 added lines, -49 removed lines

@@ -12,58 +12,58 @@
  */
 class CustomSiteConfig extends DataExtension
 {
-    private static $db = array(
-        'GACode' => 'Varchar(16)',
-        'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
-        'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
-    );
+	private static $db = array(
+		'GACode' => 'Varchar(16)',
+		'FacebookURL' => 'Varchar(256)', // multitude of ways to link to Facebook accounts, best to leave it open.
+		'TwitterUsername' => 'Varchar(16)', // max length of Twitter username 15
+	);
 
-    public function updateCMSFields(FieldList $fields)
-    {
-        $fields->addFieldToTab(
-            'Root.Main',
-            $gaCode = TextField::create(
-                'GACode',
-                _t(__CLASS__ . '.GaField', 'Google Analytics account')
-            )
-        );
+	public function updateCMSFields(FieldList $fields)
+	{
+		$fields->addFieldToTab(
+			'Root.Main',
+			$gaCode = TextField::create(
+				'GACode',
+				_t(__CLASS__ . '.GaField', 'Google Analytics account')
+			)
+		);
 
-        $gaCode->setDescription(
-            DBField::create_field('HTMLFragment', _t(
-                __CLASS__ . '.GaFieldDesc',
-                'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
-            ))
-        );
+		$gaCode->setDescription(
+			DBField::create_field('HTMLFragment', _t(
+				__CLASS__ . '.GaFieldDesc',
+				'Account number to be used all across the site (in the format <strong>UA-XXXXX-X</strong>)'
+			))
+		);
 
-        $fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
+		$fields->findOrMakeTab('Root.SocialMedia', _t(__CLASS__ . '.SocialMediaTab', 'Social Media'));
 
-        $fields->addFieldToTab(
-            'Root.SocialMedia',
-            $facebookURL = TextField::create(
-                'FacebookURL',
-                _t(__CLASS__ . '.FbField', 'Facebook UID or username')
-            )
-        );
-        $facebookURL->setDescription(
-            DBField::create_field('HTMLFragment', _t(
-                __CLASS__ . '.FbFieldDesc',
-                'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
-                . '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
-            ))
-        );
+		$fields->addFieldToTab(
+			'Root.SocialMedia',
+			$facebookURL = TextField::create(
+				'FacebookURL',
+				_t(__CLASS__ . '.FbField', 'Facebook UID or username')
+			)
+		);
+		$facebookURL->setDescription(
+			DBField::create_field('HTMLFragment', _t(
+				__CLASS__ . '.FbFieldDesc',
+				'Facebook link (everything after the "http://facebook.com/", eg http://facebook.com/'
+				. '<strong>username</strong> or http://facebook.com/<strong>pages/108510539573</strong>)'
+			))
+		);
 
-        $fields->addFieldToTab(
-            'Root.SocialMedia',
-            $twitterUsername = TextField::create(
-                'TwitterUsername',
-                _t(__CLASS__ . '.TwitterField', 'Twitter username')
-            )
-        );
-        $twitterUsername->setDescription(
-            DBField::create_field('HTMLFragment', _t(
-                __CLASS__ . '.TwitterFieldDesc',
-                'Twitter username (eg, http://twitter.com/<strong>username</strong>)'
-            ))
-        );
-    }
+		$fields->addFieldToTab(
+			'Root.SocialMedia',
+			$twitterUsername = TextField::create(
+				'TwitterUsername',
+				_t(__CLASS__ . '.TwitterField', 'Twitter username')
+			)
+		);
+		$twitterUsername->setDescription(
+			DBField::create_field('HTMLFragment', _t(
+				__CLASS__ . '.TwitterFieldDesc',
+				'Twitter username (eg, http://twitter.com/<strong>username</strong>)'
+			))
+		);
+	}
 }

src/PageTypes/EventPage.php

Indentation +77 added lines, -77 removed lines

@@ -12,81 +12,81 @@
 
 class EventPage extends DatedUpdatePage
 {
-    private static $description = 'Describes an event occurring on a specific date.';
-
-    private static $default_parent = EventHolder::class;
-
-    private static $can_be_root = false;
-
-    private static $icon_class = 'font-icon-p-event';
-
-    private static $singular_name = 'Event Page';
-
-    private static $plural_name = 'Event Pages';
-
-    private static $db = [
-        'StartTime' => 'Time',
-        'EndTime' => 'Time',
-        'Location' => 'Text',
-    ];
-
-    private static $table_name = 'EventPage';
-
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['StartTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.StartTimeFieldLabel', 'Start Time');
-        $labels['EndTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.EndTimeFieldLabel', 'End Time');
-        $labels['Location'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.LocationFieldLabel', 'Location');
-
-        return $labels;
-    }
-
-    /**
-     * Add the default for the Date being the current day.
-     */
-    public function populateDefaults()
-    {
-        if (!isset($this->Date) || $this->Date === null) {
-            $this->Date = DBDatetime::now()->Format('y-MM-dd');
-        }
-
-        if (!isset($this->StartTime) || $this->StartTime === null) {
-            $this->StartTime = '09:00:00';
-        }
-
-        if (!isset($this->EndTime) || $this->EndTime === null) {
-            $this->EndTime = '17:00:00';
-        }
-
-        parent::populateDefaults();
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            $fields->removeByName('Date');
-
-            $dateTimeFields = array();
-
-            $dateTimeFields[] = $dateField = DateField::create('Date', 'Date');
-            $dateTimeFields[] = $startTimeField = TimeField::create(
-                'StartTime',
-                $this->fieldLabel('StartTime')
-            );
-            $dateTimeFields[] = $endTimeField = TimeField::create('EndTime', $this->fieldLabel('EndTime'));
-
-            $fields->addFieldsToTab('Root.Main', [
-                $dateTimeField = FieldGroup::create('Date and time', $dateTimeFields),
-                $locationField = TextareaField::create('Location', $this->fieldLabel('Location'))
-            ], 'Abstract');
-            $locationField->setRows(4);
-        });
-        return parent::getCMSFields();
-    }
-
-    public function NiceLocation()
-    {
-        return nl2br(Convert::raw2xml($this->Location), true);
-    }
+	private static $description = 'Describes an event occurring on a specific date.';
+
+	private static $default_parent = EventHolder::class;
+
+	private static $can_be_root = false;
+
+	private static $icon_class = 'font-icon-p-event';
+
+	private static $singular_name = 'Event Page';
+
+	private static $plural_name = 'Event Pages';
+
+	private static $db = [
+		'StartTime' => 'Time',
+		'EndTime' => 'Time',
+		'Location' => 'Text',
+	];
+
+	private static $table_name = 'EventPage';
+
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['StartTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.StartTimeFieldLabel', 'Start Time');
+		$labels['EndTime'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.EndTimeFieldLabel', 'End Time');
+		$labels['Location'] = _t('CWP\\CWP\\PageTypes\\DateUpdatePage.LocationFieldLabel', 'Location');
+
+		return $labels;
+	}
+
+	/**
+	 * Add the default for the Date being the current day.
+	 */
+	public function populateDefaults()
+	{
+		if (!isset($this->Date) || $this->Date === null) {
+			$this->Date = DBDatetime::now()->Format('y-MM-dd');
+		}
+
+		if (!isset($this->StartTime) || $this->StartTime === null) {
+			$this->StartTime = '09:00:00';
+		}
+
+		if (!isset($this->EndTime) || $this->EndTime === null) {
+			$this->EndTime = '17:00:00';
+		}
+
+		parent::populateDefaults();
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			$fields->removeByName('Date');
+
+			$dateTimeFields = array();
+
+			$dateTimeFields[] = $dateField = DateField::create('Date', 'Date');
+			$dateTimeFields[] = $startTimeField = TimeField::create(
+				'StartTime',
+				$this->fieldLabel('StartTime')
+			);
+			$dateTimeFields[] = $endTimeField = TimeField::create('EndTime', $this->fieldLabel('EndTime'));
+
+			$fields->addFieldsToTab('Root.Main', [
+				$dateTimeField = FieldGroup::create('Date and time', $dateTimeFields),
+				$locationField = TextareaField::create('Location', $this->fieldLabel('Location'))
+			], 'Abstract');
+			$locationField->setRows(4);
+		});
+		return parent::getCMSFields();
+	}
+
+	public function NiceLocation()
+	{
+		return nl2br(Convert::raw2xml($this->Location), true);
+	}
 }

src/PageTypes/BaseHomePage.php

Indentation +133 added lines, -133 removed lines

@@ -26,137 +26,137 @@
  */
 class BaseHomePage extends Page
 {
-    private static $icon_class = 'font-icon-p-home';
-
-    private static $hide_ancestor = BaseHomePage::class;
-
-    private static $singular_name = 'Home Page';
-
-    private static $plural_name = 'Home Pages';
-
-    private static $table_name = 'BaseHomePage';
-
-    private static $db = [
-        'FeatureOneTitle' => 'Varchar(255)',
-        'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
-        'FeatureOneContent' => 'HTMLText',
-        'FeatureOneButtonText' => 'Varchar(255)',
-        'FeatureTwoTitle' => 'Varchar(255)',
-        'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
-        'FeatureTwoContent' => 'HTMLText',
-        'FeatureTwoButtonText' => 'Varchar(255)'
-    ];
-
-    private static $has_one = [
-        'LearnMorePage' => SiteTree::class,
-        'FeatureOneLink' => SiteTree::class,
-        'FeatureTwoLink' => SiteTree::class,
-    ];
-
-    private static $has_many = [
-        'Quicklinks' => Quicklink::class . '.Parent',
-    ];
-
-    public function Quicklinks()
-    {
-        return $this->getComponents('Quicklinks')->sort('SortOrder');
-    }
-
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function (FieldList $fields) {
-            // Main Content tab
-            $fields->addFieldToTab(
-                'Root.Main',
-                TreeDropdownField::create(
-                    'LearnMorePageID',
-                    _t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
-                    SiteTree::class
-                ),
-                'Metadata'
-            );
-
-            $gridField = GridField::create(
-                'Quicklinks',
-                'Quicklinks',
-                $this->Quicklinks(),
-                GridFieldConfig_RelationEditor::create()
-            );
-            $gridConfig = $gridField->getConfig();
-            $gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
-                _t(__CLASS__ . '.AddNewButton', 'Add new')
-            );
-
-            $injector = Injector::inst();
-
-            $gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
-            $gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
-            $gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
-            $gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
-            $gridField->setModelClass(Quicklink::class);
-
-            $fields->addFieldToTab('Root.Quicklinks', $gridField);
-
-            $fields->removeByName('Import');
-
-            $fields->addFieldToTab(
-                'Root.Features',
-                ToggleCompositeField::create(
-                    'FeatureOne',
-                    _t(__CLASS__ . '.FeatureOne', 'Feature One'),
-                    array(
-                        TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
-                        $dropdownField = DropdownField::create(
-                            'FeatureOneCategory',
-                            _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
-                            singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
-                        ),
-                        HTMLEditorField::create(
-                            'FeatureOneContent',
-                            _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
-                        ),
-                        TextField::create(
-                            'FeatureOneButtonText',
-                            _t(__CLASS__ . '.FeatureButtonText', 'Button text')
-                        ),
-                        TreeDropdownField::create(
-                            'FeatureOneLinkID',
-                            _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
-                            SiteTree::class
-                        )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
-                    )
-                )->setHeadingLevel(3)
-            );
-            $dropdownField->setEmptyString('none');
-
-            $fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
-                'FeatureTwo',
-                _t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
-                array(
-                    TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
-                    $dropdownField = DropdownField::create(
-                        'FeatureTwoCategory',
-                        _t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
-                        singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
-                    ),
-                    HTMLEditorField::create(
-                        'FeatureTwoContent',
-                        _t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
-                    ),
-                    TextField::create(
-                        'FeatureTwoButtonText',
-                        _t(__CLASS__ . '.FeatureButtonText', 'Button text')
-                    ),
-                    TreeDropdownField::create(
-                        'FeatureTwoLinkID',
-                        _t(__CLASS__ . '.FeatureLink', 'Page to link to'),
-                        SiteTree::class
-                    )->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
-                )
-            )->setHeadingLevel(3));
-            $dropdownField->setEmptyString('none');
-        });
-
-        return parent::getCMSFields();
-    }
+	private static $icon_class = 'font-icon-p-home';
+
+	private static $hide_ancestor = BaseHomePage::class;
+
+	private static $singular_name = 'Home Page';
+
+	private static $plural_name = 'Home Pages';
+
+	private static $table_name = 'BaseHomePage';
+
+	private static $db = [
+		'FeatureOneTitle' => 'Varchar(255)',
+		'FeatureOneCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
+		'FeatureOneContent' => 'HTMLText',
+		'FeatureOneButtonText' => 'Varchar(255)',
+		'FeatureTwoTitle' => 'Varchar(255)',
+		'FeatureTwoCategory' => "Enum('bell,comments,film,flag,globe,group,list,phone,rss,time,user','comments')",
+		'FeatureTwoContent' => 'HTMLText',
+		'FeatureTwoButtonText' => 'Varchar(255)'
+	];
+
+	private static $has_one = [
+		'LearnMorePage' => SiteTree::class,
+		'FeatureOneLink' => SiteTree::class,
+		'FeatureTwoLink' => SiteTree::class,
+	];
+
+	private static $has_many = [
+		'Quicklinks' => Quicklink::class . '.Parent',
+	];
+
+	public function Quicklinks()
+	{
+		return $this->getComponents('Quicklinks')->sort('SortOrder');
+	}
+
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function (FieldList $fields) {
+			// Main Content tab
+			$fields->addFieldToTab(
+				'Root.Main',
+				TreeDropdownField::create(
+					'LearnMorePageID',
+					_t(__CLASS__ . '.LearnMoreLink', 'Page to link the "Learn More" button to:'),
+					SiteTree::class
+				),
+				'Metadata'
+			);
+
+			$gridField = GridField::create(
+				'Quicklinks',
+				'Quicklinks',
+				$this->Quicklinks(),
+				GridFieldConfig_RelationEditor::create()
+			);
+			$gridConfig = $gridField->getConfig();
+			$gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
+				_t(__CLASS__ . '.AddNewButton', 'Add new')
+			);
+
+			$injector = Injector::inst();
+
+			$gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
+			$gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
+			$gridConfig->addComponent($injector->create(GridFieldDeleteAction::class));
+			$gridConfig->addComponent($injector->create(GridFieldOrderableRows::class, 'SortOrder'));
+			$gridField->setModelClass(Quicklink::class);
+
+			$fields->addFieldToTab('Root.Quicklinks', $gridField);
+
+			$fields->removeByName('Import');
+
+			$fields->addFieldToTab(
+				'Root.Features',
+				ToggleCompositeField::create(
+					'FeatureOne',
+					_t(__CLASS__ . '.FeatureOne', 'Feature One'),
+					array(
+						TextField::create('FeatureOneTitle', _t(__CLASS__ . '.Title', 'Title')),
+						$dropdownField = DropdownField::create(
+							'FeatureOneCategory',
+							_t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
+							singleton(BaseHomePage::class)->dbObject('FeatureOneCategory')->enumValues()
+						),
+						HTMLEditorField::create(
+							'FeatureOneContent',
+							_t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
+						),
+						TextField::create(
+							'FeatureOneButtonText',
+							_t(__CLASS__ . '.FeatureButtonText', 'Button text')
+						),
+						TreeDropdownField::create(
+							'FeatureOneLinkID',
+							_t(__CLASS__ . '.FeatureLink', 'Page to link to'),
+							SiteTree::class
+						)->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
+					)
+				)->setHeadingLevel(3)
+			);
+			$dropdownField->setEmptyString('none');
+
+			$fields->addFieldToTab('Root.Features', ToggleCompositeField::create(
+				'FeatureTwo',
+				_t(__CLASS__ . '.FeatureTwo', 'Feature Two'),
+				array(
+					TextField::create('FeatureTwoTitle', _t(__CLASS__ . '.Title', 'Title')),
+					$dropdownField = DropdownField::create(
+						'FeatureTwoCategory',
+						_t(__CLASS__ . '.FeatureCategoryDropdown', 'Category icon'),
+						singleton(BaseHomePage::class)->dbObject('FeatureTwoCategory')->enumValues()
+					),
+					HTMLEditorField::create(
+						'FeatureTwoContent',
+						_t(__CLASS__ . '.FeatureContentFieldLabel', 'Content')
+					),
+					TextField::create(
+						'FeatureTwoButtonText',
+						_t(__CLASS__ . '.FeatureButtonText', 'Button text')
+					),
+					TreeDropdownField::create(
+						'FeatureTwoLinkID',
+						_t(__CLASS__ . '.FeatureLink', 'Page to link to'),
+						SiteTree::class
+					)->setDescription(_t(__CLASS__ . '.ButtonTextRequired', 'Button text must be filled in'))
+				)
+			)->setHeadingLevel(3));
+			$dropdownField->setEmptyString('none');
+		});
+
+		return parent::getCMSFields();
+	}
 }

src/PageTypes/NewsHolder.php

Indentation +46 added lines, -46 removed lines

@@ -7,50 +7,50 @@
 
 class NewsHolder extends DatedUpdateHolder
 {
-    private static $description = 'Container page for News Pages, provides news filtering and pagination';
-
-    private static $allowed_children = [
-        NewsPage::class,
-    ];
-
-    private static $default_child = NewsPage::class;
-
-    private static $update_name = 'News';
-
-    private static $update_class = NewsPage::class;
-
-    private static $icon_class = 'font-icon-news';
-
-    private static $singular_name = 'News Holder';
-
-    private static $plural_name = 'News Holders';
-
-    private static $table_name = 'NewsHolder';
-
-    /**
-     * Find all site's news items, based on some filters.
-     * Omitting parameters will prevent relevant filters from being applied. The filters are ANDed together.
-     *
-     * @param string $className The name of the class to fetch.
-     * @param int $parentID The ID of the holder to extract the news items from.
-     * @param int $tagID The ID of the tag to filter the news items by.
-     * @param string $dateFrom The beginning of a date filter range.
-     * @param string $dateTo The end of the date filter range. If empty, only one day will be searched for.
-     * @param int $year Numeric value of the year to show.
-     * @param int $monthNumber Numeric value of the month to show.
-     *
-     * @returns DataList|PaginatedList
-     */
-    public static function AllUpdates(
-        $className = NewsPage::class,
-        $parentID = null,
-        $tagID = null,
-        $dateFrom = null,
-        $dateTo = null,
-        $year = null,
-        $monthNumber = null
-    ) {
-        return parent::AllUpdates($className, $parentID, $tagID, $dateFrom, $dateTo, $year, $monthNumber)
-            ->Sort('Date', 'DESC');
-    }
+	private static $description = 'Container page for News Pages, provides news filtering and pagination';
+
+	private static $allowed_children = [
+		NewsPage::class,
+	];
+
+	private static $default_child = NewsPage::class;
+
+	private static $update_name = 'News';
+
+	private static $update_class = NewsPage::class;
+
+	private static $icon_class = 'font-icon-news';
+
+	private static $singular_name = 'News Holder';
+
+	private static $plural_name = 'News Holders';
+
+	private static $table_name = 'NewsHolder';
+
+	/**
+	 * Find all site's news items, based on some filters.
+	 * Omitting parameters will prevent relevant filters from being applied. The filters are ANDed together.
+	 *
+	 * @param string $className The name of the class to fetch.
+	 * @param int $parentID The ID of the holder to extract the news items from.
+	 * @param int $tagID The ID of the tag to filter the news items by.
+	 * @param string $dateFrom The beginning of a date filter range.
+	 * @param string $dateTo The end of the date filter range. If empty, only one day will be searched for.
+	 * @param int $year Numeric value of the year to show.
+	 * @param int $monthNumber Numeric value of the month to show.
+	 *
+	 * @returns DataList|PaginatedList
+	 */
+	public static function AllUpdates(
+		$className = NewsPage::class,
+		$parentID = null,
+		$tagID = null,
+		$dateFrom = null,
+		$dateTo = null,
+		$year = null,
+		$monthNumber = null
+	) {
+		return parent::AllUpdates($className, $parentID, $tagID, $dateFrom, $dateTo, $year, $monthNumber)
+			->Sort('Date', 'DESC');
+	}
 }