From e6972464de39189934b770cf520e13a7e3db1f10 Mon Sep 17 00:00:00 2001 From: Tony Air Date: Mon, 19 Aug 2019 15:37:24 +0700 Subject: [PATCH] IMPROVEMENT: Page Default container type --- app/_config/config.yml | 3 +++ app/src/Extensions/ElementRows.php | 10 +++++----- app/src/Pages/Page.php | 7 +++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/_config/config.yml b/app/_config/config.yml index 261fb4a..2e526ca 100644 --- a/app/_config/config.yml +++ b/app/_config/config.yml @@ -10,6 +10,9 @@ SilverStripe\View\SSViewer: - '$public' - '$default' +Page: + default_container_class: 'container' + #SilverStripe\Admin\LeftAndMain: # extra_requirements_javascript: # - 'colymba/gridfield-bulk-editing-tools:client/dist/js/main.js' diff --git a/app/src/Extensions/ElementRows.php b/app/src/Extensions/ElementRows.php index b3d6cbc..34f1b7c 100644 --- a/app/src/Extensions/ElementRows.php +++ b/app/src/Extensions/ElementRows.php @@ -36,7 +36,7 @@ class ElementRows extends DataExtension // move available globaly to main tab $fields->removeByName('AvailableGlobally'); - + $tab = $fields->findOrMakeTab('Root.Main'); $tab->push(CheckboxField::create('AvailableGlobally')); @@ -170,7 +170,7 @@ class ElementRows extends DataExtension $object = $object ? $object : $this->owner; - if(!$object->isRoot()){ + if (!$object->isRoot()) { $size = $object->getField('Size'); $max = $size ? $max / (self::colsNumber() / $size) : $max; $parent = $object->Parent()->getOwnerPage(); @@ -185,8 +185,8 @@ class ElementRows extends DataExtension { $db = Config::inst()->get(self::class, 'db'); $sizes = $db['Size']; - $sizes = preg_replace('!Enum\("([0-9,]+)","([0-9]+)"\)!i','$1', $sizes); - $sizes = explode(',',$sizes); + $sizes = preg_replace('!Enum\("([0-9,]+)","([0-9]+)"\)!i', '$1', $sizes); + $sizes = explode(',', $sizes); return max($sizes); } @@ -216,7 +216,7 @@ class ElementRows extends DataExtension $container_styles = array_keys(self::$container_styles); if (!$type && $this->isRoot()) { - $type = $container_styles[0]; + $type = \Page::DefaultContainer(); } return $type; diff --git a/app/src/Pages/Page.php b/app/src/Pages/Page.php index 49d063a..1b9b299 100644 --- a/app/src/Pages/Page.php +++ b/app/src/Pages/Page.php @@ -9,6 +9,13 @@ use DNADesign\Elemental\Models\ElementContent; class Page extends SiteTree { + private static $default_container_class = 'container'; + + public static function DefaultContainer() + { + return self::config()->get('default_container_class'); + } + /* * Shows custom summary of the post, otherwise * Displays summary of the first content element