From 676d540ed17850b538aef12418af8337a3f38e48 Mon Sep 17 00:00:00 2001 From: Pieter Frenssen Date: Mon, 18 Oct 2021 21:31:37 +0300 Subject: [PATCH 1/3] ISAICP-6766: Show the collections tab first in the Explore block. --- .../src/Plugin/Block/ExploreBlock.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/modules/custom/joinup_front_page/src/Plugin/Block/ExploreBlock.php b/web/modules/custom/joinup_front_page/src/Plugin/Block/ExploreBlock.php index fe829754d4..4f3afd9320 100644 --- a/web/modules/custom/joinup_front_page/src/Plugin/Block/ExploreBlock.php +++ b/web/modules/custom/joinup_front_page/src/Plugin/Block/ExploreBlock.php @@ -91,18 +91,18 @@ public static function create(ContainerInterface $container, array $configuratio */ public function build(): array { $data = [ - 'solutions' => [ - 'label' => $this->t('Solutions'), - 'plural_type' => $this->t('solutions'), - 'data' => $this->getRdfEntities('solution'), - 'url' => '/search?keys=&f[0]=type%3Asolution', - ], 'collections' => [ 'label' => $this->t('Collections'), 'plural_type' => $this->t('collections'), 'data' => $this->getRdfEntities('collection'), 'url' => '/search?keys=&f[0]=type%3Acollection', ], + 'solutions' => [ + 'label' => $this->t('Solutions'), + 'plural_type' => $this->t('solutions'), + 'data' => $this->getRdfEntities('solution'), + 'url' => '/search?keys=&f[0]=type%3Asolution', + ], 'news' => [ 'label' => $this->t('News'), 'plural_type' => $this->t('news'), From dffdf501ba015d6dff62f6367dd41db07b27896f Mon Sep 17 00:00:00 2001 From: gingapa Date: Thu, 21 Oct 2021 08:46:27 +0100 Subject: [PATCH 2/3] =?UTF-8?q?ISAICP-6766:=20Explore=20section=E2=80=99s?= =?UTF-8?q?=20design=20changes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/scss/components/_explore-block.scss | 14 ++++++++------ ...lock--joinup-front-page-explore-block.html.twig | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/web/themes/ventuno/src/scss/components/_explore-block.scss b/web/themes/ventuno/src/scss/components/_explore-block.scss index 4e033ec0e9..5debce1666 100644 --- a/web/themes/ventuno/src/scss/components/_explore-block.scss +++ b/web/themes/ventuno/src/scss/components/_explore-block.scss @@ -49,10 +49,6 @@ body { } } .tab-content { - width: 100vw; - @include media-breakpoint-up(xl) { - width: 90vw; - } .tab-pane { .see-more { display: block; @@ -65,7 +61,6 @@ body { border-radius: $border-radius; @extend .p-4; @extend .me-4; - @extend .shadow; height: 100%; .layout { flex-grow: 1; @@ -142,7 +137,9 @@ body { order: 3; overflow-y: unset !important; overflow-x: clip !important; - padding: 6px 0 6px 6px; + padding: 0px 0px 6px 6px; + margin: 0 -3px; + width: calc(100% + 24px); } .slick-track { display: flex !important; @@ -155,4 +152,9 @@ body { width: 100%; } } + .slick-active { + article { + @extend .shadow; + } + } } diff --git a/web/themes/ventuno/templates/block/block--joinup-front-page-explore-block.html.twig b/web/themes/ventuno/templates/block/block--joinup-front-page-explore-block.html.twig index 100934c145..73b01137f6 100644 --- a/web/themes/ventuno/templates/block/block--joinup-front-page-explore-block.html.twig +++ b/web/themes/ventuno/templates/block/block--joinup-front-page-explore-block.html.twig @@ -34,7 +34,7 @@ %}
-
+
{{ title_prefix }} {% if label %} {{ label }} From 15b82d273afebba6202fd528a04a3913c0f868e5 Mon Sep 17 00:00:00 2001 From: Pieter Frenssen Date: Thu, 21 Oct 2021 14:47:39 +0300 Subject: [PATCH 3/3] ISAICP-6766: Test that collections are shown before solutions in the explore block. --- tests/features/homepage.feature | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/features/homepage.feature b/tests/features/homepage.feature index a489c49ee2..4945315b48 100644 --- a/tests/features/homepage.feature +++ b/tests/features/homepage.feature @@ -309,13 +309,6 @@ Feature: Homepage When I am on the homepage Then the explore section should contain the following content: | type | title | date | description | - | solution | Cities of Italy | 2020-01-01 17:36 +0200 | Download our report report-2021-09-16.xls for more information. | - | solution | Products of Italy | 2019-08-14 17:36 +0200 | Watch now | - | solution | Proton Global | 2019-07-05 10:00 +0100 | An inlined image:Text after image. | - | solution | Lantern International | 2018-12-18 08:00 +0100 | Lantern International Group has started deploying personnel in focused areas. In this quest we have decided to consolidate our private businesses into one entity as a significant step towards realizing our company's long-term plan… | - | solution | Cities of France | 2018-12-14 17:36 +0200 | There are many variations | - | solution | Cities of Bulgaria | 2018-11-14 17:36 +0200 | Supports fields | - | solution | Products of Bulgaria | 2018-08-14 17:36 +0200 | Supports health | | collection | Clash of vettel | 2020-10-18 08:00 +0100 | The point is that we do have the rights to one of our films. So we could be dealing with a film that we'd normally have to show only for three or four weeks and see what happens. But it's more like a TV show. It's bigger and has… | | collection | Sarah desert | 2020-06-18 08:00 +0100 | Watch our video! It's embedded! | | collection | Clash of jonnys | 2019-12-18 08:00 +0100 | Supports health-related fields | @@ -324,6 +317,13 @@ Feature: Homepage | collection | Jupiter sun | 2018-12-18 08:00 +0100 | Sum is therefore | | collection | Clash of alex | 2018-11-18 08:00 +0100 | Lorem Ipsum is simply dummy | | collection | Nature area | 2018-07-18 08:00 +0100 | Supports health | + | solution | Cities of Italy | 2020-01-01 17:36 +0200 | Download our report report-2021-09-16.xls for more information. | + | solution | Products of Italy | 2019-08-14 17:36 +0200 | Watch now | + | solution | Proton Global | 2019-07-05 10:00 +0100 | An inlined image:Text after image. | + | solution | Lantern International | 2018-12-18 08:00 +0100 | Lantern International Group has started deploying personnel in focused areas. In this quest we have decided to consolidate our private businesses into one entity as a significant step towards realizing our company's long-term plan… | + | solution | Cities of France | 2018-12-14 17:36 +0200 | There are many variations | + | solution | Cities of Bulgaria | 2018-11-14 17:36 +0200 | Supports fields | + | solution | Products of Bulgaria | 2018-08-14 17:36 +0200 | Supports health | | news | Current biodiversity adapt | 2021-04-30T19:09:00Z | Here we combine global maps of human populations and land use over the past 12000 y with current biodiversity data to show that nearly three quarters of nature has long been shaped by histories of human habitation and use by… | | news | Super-Alfvenic plasma flow | 2021-04-29T10:18:00Z | Magnetic draping | | news | H-rich Wolf-Rayet star | 2021-03-29T10:18:00Z | Polarimetric analysis Watch our video |