From e8405019af0ddb7c3c22195e25619a46fd56adeb Mon Sep 17 00:00:00 2001 From: Dennis Prins Date: Mon, 12 Jun 2023 17:23:44 +0200 Subject: [PATCH 1/4] Update ElementArticle.php --- src/ElementalGrid/ElementArticle.php | 32 +++++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/ElementalGrid/ElementArticle.php b/src/ElementalGrid/ElementArticle.php index a913b9e..afd3aca 100644 --- a/src/ElementalGrid/ElementArticle.php +++ b/src/ElementalGrid/ElementArticle.php @@ -3,10 +3,12 @@ namespace WeDevelop\Articles\ElementalGrid; use DNADesign\Elemental\Models\BaseElement; +use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Forms\CheckboxField; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\TextField; use SilverStripe\Forms\TreeDropdownField; +use UncleCheese\DisplayLogic\Forms\Wrapper; use WeDevelop\Articles\Pages\ArticlePage; use WeDevelop\Articles\Pages\ArticlesPage; @@ -15,6 +17,7 @@ * @package WeDevelop\Articles\ElementalGrid * * @method ArticlePage ArticlePage() + * @method ArticlesPage ArticlesPage() */ class ElementArticle extends BaseElement { @@ -63,17 +66,11 @@ public function getCMSFields(): FieldList { $fields = parent::getCMSFields(); - $fields->addFieldsToTab( - 'Root.Main', - [ - TreeDropdownField::create('ArticlePageID', _t(__CLASS__ . '.ARTICLETOSHOW', 'Article to show'), ArticlePage::class), - ] - ); - $fields->removeByName( [ 'ShowMoreArticlesButton', 'ArticlesPageID', + 'ArticlePageID', 'ShowMoreArticlesButtonText', ] ); @@ -81,15 +78,24 @@ public function getCMSFields(): FieldList $fields->addFieldsToTab( 'Root.Main', [ + TreeDropdownField::create( + 'ArticlePageID', + _t(__CLASS__ . '.ARTICLETOSHOW', 'Article to show'), + ArticlePage::class), CheckboxField::create( 'ShowMoreArticlesButton', _t('WeDevelop\Articles\ElementalGrid.SHOWMOREBUTTON', "Show 'more articles' button") ), - TreeDropdownField::create('ArticlesPageID', 'Articles page', ArticlesPage::class), - TextField::create( - 'ShowMoreArticlesButtonText', - _t('WeDevelop\Articles\ElementalGrid.SHOWMOREBUTTONTEXT', "Show 'more articles' button text") - ) + Wrapper::create([ + TreeDropdownField::create( + 'ArticlesPageID', + _t(__CLASS__ . '.ARTICLESPAGE', 'Articles overview page'), + SiteTree::class), + TextField::create( + 'ShowMoreArticlesButtonText', + _t('WeDevelop\Articles\ElementalGrid.SHOWMOREBUTTONTEXT', "Show 'more articles' button text") + ), + ]) ->displayIf('ShowMoreArticlesButton') ->isChecked() ->end(), @@ -103,6 +109,6 @@ public function getCMSFields(): FieldList public function getType(): string { - return 'Article'; + return 'Single article'; } } From 3c70796d61fdf792f552149304eed853fd00a9f7 Mon Sep 17 00:00:00 2001 From: Dennis Prins Date: Mon, 12 Jun 2023 17:23:57 +0200 Subject: [PATCH 2/4] Update ElementArticles.php --- src/ElementalGrid/ElementArticles.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ElementalGrid/ElementArticles.php b/src/ElementalGrid/ElementArticles.php index ff34c49..29da47a 100644 --- a/src/ElementalGrid/ElementArticles.php +++ b/src/ElementalGrid/ElementArticles.php @@ -12,6 +12,7 @@ use SilverStripe\ORM\DataList; use SilverStripe\ORM\ManyManyList; use SilverStripe\TagField\TagField; +use UncleCheese\DisplayLogic\Forms\Wrapper; use WeDevelop\Articles\Models\Author; use WeDevelop\Articles\Pages\ArticlePage; use WeDevelop\Articles\Pages\ArticlesPage; @@ -91,12 +92,9 @@ public function getCMSFields(): FieldList { $fields = parent::getCMSFields(); - $fields->addFieldsToTab( - 'Root.Main', - [ - TreeDropdownField::create('ArticlesPageID', 'Articles page', SiteTree::class), - ] - ); + $fields->addFieldsToTab('Root.Main', [ + TreeDropdownField::create('ArticlesPageID', _t(__CLASS__ . '.ARTICLESPAGE', 'Articles overview page'), SiteTree::class), + ]); $fields->removeByName( [ @@ -151,10 +149,12 @@ public function getCMSFields(): FieldList 'ShowMoreArticlesButton', _t(__CLASS__ . '.SHOWMOREBUTTON', "Show 'more articles' button") ), - TextField::create( - 'ShowMoreArticlesButtonText', - _t(__CLASS__ . '.SHOWMOREBUTTONTEXT', "Show 'more articles' button text") - ) + Wrapper::create([ + TextField::create( + 'ShowMoreArticlesButtonText', + _t(__CLASS__ . '.SHOWMOREBUTTONTEXT', "Show 'more articles' button text") + ), + ]) ->displayIf('ShowMoreArticlesButton') ->isChecked() ->end(), From 877c8b0ff9d6c936fffb1d6975576d072a92c317 Mon Sep 17 00:00:00 2001 From: Dennis Prins Date: Mon, 12 Jun 2023 17:24:14 +0200 Subject: [PATCH 3/4] Update nl.yml --- lang/nl.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lang/nl.yml b/lang/nl.yml index aa2fb7b..4f96203 100755 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -55,7 +55,9 @@ nl: SHOWMOREBUTTON: 'Toon meer artikelen button' SHOWMOREBUTTONTEXT: 'Meer artikelen buttontekst' NOARTICLESFOUND: 'Geen artikelen gevonden' + ARTICLESPAGE: 'Artikelen overzicht pagina' WeDevelop\Articles\ElementalGrid\ElementArticle: + ARTICLESPAGE: 'Artikelen overzicht pagina' ARTICLETOSHOW: 'Artikel om weer te geven' NOARTICLEFOUND: 'Geen artikel gevonden' From 61270a2dc5ad4936f21288ba19ed2c5da6b86186 Mon Sep 17 00:00:00 2001 From: Dennis Prins Date: Mon, 12 Jun 2023 17:27:36 +0200 Subject: [PATCH 4/4] Update ElementArticles.php --- src/ElementalGrid/ElementArticles.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ElementalGrid/ElementArticles.php b/src/ElementalGrid/ElementArticles.php index 29da47a..1a67f9f 100644 --- a/src/ElementalGrid/ElementArticles.php +++ b/src/ElementalGrid/ElementArticles.php @@ -54,7 +54,7 @@ class ElementArticles extends BaseElement /** * @var string */ - private static $icon = 'font-icon-p-list'; + private static $icon = 'font-icon-menu-campaigns'; /** * @var array @@ -169,7 +169,7 @@ public function getCMSFields(): FieldList public function getType(): string { - return 'Articles list'; + return 'Articles overview'; } public function getArticles(): ?DataList