From 7ff0c7a2b98de478d6104936dc9c9e94616b82dd Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 5 Apr 2022 16:59:14 +0200
Subject: [PATCH 1/7] OEL-1159: Adapt news to card last changes.
---
.../oe_whitelabel_starter_news.module | 8 ++++----
.../templates/node--oe-sc-news--teaser.html.twig | 11 ++++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module
index 78143f08..7ca466f5 100644
--- a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module
+++ b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module
@@ -66,11 +66,11 @@ function oe_whitelabel_starter_news_preprocess_node__oe_sc_news(&$variables) {
}
$thumbnail = $media->get('thumbnail')->first();
- $variables['image'] = ImageValueObject::fromImageItem($thumbnail);
-
- if ($variables['view_mode'] == 'teaser') {
- $variables['image'] = ['#markup' => $variables['image']->getSource()];
+ if ($thumbnail === NULL) {
+ $cacheability->applyTo($variables);
+ return;
}
+ $variables['image'] = ImageValueObject::fromImageItem($thumbnail);
$cacheability->applyTo($variables);
}
diff --git a/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig b/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
index 6650bbca..9190db65 100644
--- a/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
+++ b/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
@@ -7,17 +7,18 @@
{% set _title %}
<a class="standalone" href="{{ url }}">{{ label }}</a>
{% endset %}
-{% set _content %}
- <span class="text-muted text-nowrap me-4-5">{{ content.oe_publication_date }}</span>
-{% endset %}
{% block content %}
<article{{attributes}}>
{{ pattern('card', {
variant: 'search',
title: _title,
text: content.oe_summary,
- image: image,
- content: _content
+ image: image|merge({
+ path: image.src,
+ }),
+ meta: [
+ content.oe_publication_date
+ ],
}) }}
</article>
{% endblock %}
--
GitLab
From 74f8b6e1911959adc460a9cca49ee484213a99c0 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 5 Apr 2022 16:59:39 +0200
Subject: [PATCH 2/7] OEL-1159: Fix news tests after card changes.
---
tests/src/Functional/ContentNewsRenderTest.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/src/Functional/ContentNewsRenderTest.php b/tests/src/Functional/ContentNewsRenderTest.php
index e7d42ad3..34497412 100644
--- a/tests/src/Functional/ContentNewsRenderTest.php
+++ b/tests/src/Functional/ContentNewsRenderTest.php
@@ -145,12 +145,12 @@ class ContentNewsRenderTest extends WhitelabelBrowserTestBase {
// Assert content banner content.
$this->assertEquals(
'http://www.example.org is a web page',
- trim($crawler->filter('p.card-text')->text())
+ trim($crawler->filter('div.card-text')->text())
);
// Assert content banner publication date.
$this->assertEquals(
'09 February 2022',
- trim($crawler->filter('div.card-body > span.text-muted')->text())
+ trim($crawler->filter('div.card-body > div > span.text-muted')->text())
);
}
--
GitLab
From 1add4db407440bd1b48e78e734b16e0cbdbaeac4 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 5 Apr 2022 17:00:22 +0200
Subject: [PATCH 3/7] OEL-1159: Adapt events to card last changes.
---
.../oe_whitelabel_starter_event.module | 8 ++++----
.../templates/node--oe-sc-event--teaser.html.twig | 11 ++++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module
index 4f9d92b6..e1f9e25b 100755
--- a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module
+++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module
@@ -76,11 +76,11 @@ function _oe_whitelabel_starter_event_preprocess_featured_media(array &$variable
}
$thumbnail = $media->get('thumbnail')->first();
- $variables['image'] = ImageValueObject::fromImageItem($thumbnail);
-
- if ($variables['view_mode'] == 'teaser') {
- $variables['image'] = ['#markup' => $variables['image']->getSource()];
+ if ($thumbnail === NULL) {
+ $cacheability->applyTo($variables);
+ return;
}
+ $variables['image'] = ImageValueObject::fromImageItem($thumbnail);
$cacheability->applyTo($variables);
}
diff --git a/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig b/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
index bc004c43..8d9729af 100755
--- a/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
+++ b/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
@@ -7,17 +7,18 @@
{% set _title %}
<a class="standalone" href="{{ url }}">{{ label }}</a>
{% endset %}
-{% set _content %}
- <span class="text-muted text-nowrap me-4-5">{{ content.oe_sc_event_dates }}</span>
-{% endset %}
{% block content %}
<article{{attributes}}>
{{ pattern('card', {
variant: 'search',
title: _title,
text: content.oe_summary,
- image: image,
- content: _content
+ image: image|merge({
+ path: image.src,
+ }),
+ meta: [
+ content.oe_sc_event_dates,
+ ],
}) }}
</article>
{% endblock %}
--
GitLab
From cdb8a596d79507e816df63adc5debd175acc0741 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 5 Apr 2022 18:01:55 +0200
Subject: [PATCH 4/7] OEL-1159: No send image, only path and alt to pattern.
---
.../templates/node--oe-sc-event--teaser.html.twig | 5 +++--
.../templates/node--oe-sc-news--teaser.html.twig | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig b/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
index 8d9729af..371dd1cf 100755
--- a/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
+++ b/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
@@ -13,9 +13,10 @@
variant: 'search',
title: _title,
text: content.oe_summary,
- image: image|merge({
+ image: image ? {
path: image.src,
- }),
+ alt: image.alt,
+ },
meta: [
content.oe_sc_event_dates,
],
diff --git a/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig b/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
index 9190db65..92f4861e 100644
--- a/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
+++ b/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
@@ -13,9 +13,10 @@
variant: 'search',
title: _title,
text: content.oe_summary,
- image: image|merge({
+ image: image ? {
path: image.src,
- }),
+ alt: image.alt,
+ },
meta: [
content.oe_publication_date
],
--
GitLab
From aff051a8274f5d1b90713d15a6299f53a843ae8a Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 5 Apr 2022 18:02:08 +0200
Subject: [PATCH 5/7] OEL-1159: Remove clause.
---
.../oe_whitelabel_starter_event.module | 4 ----
.../oe_whitelabel_starter_news.module | 4 ----
2 files changed, 8 deletions(-)
diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module
index e1f9e25b..7e9200f5 100755
--- a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module
+++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module
@@ -76,10 +76,6 @@ function _oe_whitelabel_starter_event_preprocess_featured_media(array &$variable
}
$thumbnail = $media->get('thumbnail')->first();
- if ($thumbnail === NULL) {
- $cacheability->applyTo($variables);
- return;
- }
$variables['image'] = ImageValueObject::fromImageItem($thumbnail);
$cacheability->applyTo($variables);
diff --git a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module
index 7ca466f5..4af48a40 100644
--- a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module
+++ b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module
@@ -66,10 +66,6 @@ function oe_whitelabel_starter_news_preprocess_node__oe_sc_news(&$variables) {
}
$thumbnail = $media->get('thumbnail')->first();
- if ($thumbnail === NULL) {
- $cacheability->applyTo($variables);
- return;
- }
$variables['image'] = ImageValueObject::fromImageItem($thumbnail);
$cacheability->applyTo($variables);
--
GitLab
From fe790d12418be989f1304d06f57e9805663922b0 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Wed, 6 Apr 2022 17:38:30 +0200
Subject: [PATCH 6/7] OEL-1159: Adapt composer to last oe_bootstrap_theme
changes.
---
composer.json | 3 +++
1 file changed, 3 insertions(+)
diff --git a/composer.json b/composer.json
index 5b83184f..f60258a7 100644
--- a/composer.json
+++ b/composer.json
@@ -84,6 +84,9 @@
"patches": {
"openeuropa/oe_paragraphs": {
"latest": "https://github.com/openeuropa/oe_paragraphs/compare/1.12.0..master.diff"
+ },
+ "openeuropa/oe_bootstrap_theme": {
+ "latest": "https://github.com/openeuropa/oe_bootstrap_theme/compare/0.1.202204061107..1.x.diff"
}
},
"drupal-scaffold": {
--
GitLab
From 9fab9f27ea402c441aac8db28ccb0bd117d008e3 Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Wed, 6 Apr 2022 20:27:59 +0300
Subject: [PATCH 7/7] OEL-1159: Remove field wrappers from dates in teaser.
---
.../templates/node--oe-sc-event--teaser.html.twig | 2 +-
.../templates/node--oe-sc-news--teaser.html.twig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig b/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
index 371dd1cf..8f5f2799 100755
--- a/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
+++ b/modules/oe_whitelabel_starter_event/templates/node--oe-sc-event--teaser.html.twig
@@ -18,7 +18,7 @@
alt: image.alt,
},
meta: [
- content.oe_sc_event_dates,
+ content.oe_sc_event_dates|field_value,
],
}) }}
</article>
diff --git a/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig b/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
index 92f4861e..4d547492 100644
--- a/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
+++ b/modules/oe_whitelabel_starter_news/templates/node--oe-sc-news--teaser.html.twig
@@ -18,7 +18,7 @@
alt: image.alt,
},
meta: [
- content.oe_publication_date
+ content.oe_publication_date|field_value
],
}) }}
</article>
--
GitLab