Skip to content
This repository has been archived by the owner on Jul 27, 2022. It is now read-only.

ISAICP-6766: Changes for the Explore block #2627

Open
wants to merge 7 commits into
base: ISAICP-6415
Choose a base branch
from
+22 −20
Open

ISAICP-6766: Changes for the Explore block #2627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
676d540
ISAICP-6766: Show the collections tab first in the Explore block.
pfrenssen Oct 18, 2021
6fa3f15
Merge branch 'ISAICP-6415' into ISAICP-6766
pfrenssen Oct 20, 2021
dffdf50
ISAICP-6766: Explore section’s design changes.
gingapa Oct 21, 2021
7f9e753
Merge branch 'ISAICP-6766' of github.com:ec-europa/joinup-dev into IS…
gingapa Oct 21, 2021
15b82d2
ISAICP-6766: Test that collections are shown before solutions in the …
pfrenssen Oct 21, 2021
571c74e
Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6766
pfrenssen Oct 25, 2021
1adee0d
Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6766
pfrenssen Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions tests/features/homepage.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 |
Expand Down
12 changes: 6 additions & 6 deletions web/modules/custom/joinup_front_page/src/Plugin/Block/ExploreBlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
14 changes: 8 additions & 6 deletions web/themes/ventuno/src/scss/components/_explore-block.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ body {
}
}
.tab-content {
width: 100vw;
@include media-breakpoint-up(xl) {
width: 90vw;
}
.tab-pane {
.see-more {
display: block;
Expand All @@ -65,7 +61,6 @@ body {
border-radius: $border-radius;
@extend .p-4;
@extend .me-4;
@extend .shadow;
height: 100%;
.layout {
flex-grow: 1;
Expand Down Expand Up @@ -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;
Expand All @@ -155,4 +152,9 @@ body {
width: 100%;
}
}
.slick-active {
article {
@extend .shadow;
}
}
}
2 changes: 1 addition & 1 deletion web/themes/ventuno/templates/block/block--joinup-front-page-explore-block.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
%}
<div{{ attributes.addClass(classes) }}>
<div class="row">
<div class="col-lg-11 offset-lg-1">
<div class="col-lg-12">
{{ title_prefix }}
{% if label %}
<h2{{ title_attributes.addClass('explore-block-title') }}>{{ label }}</h2>
Expand Down