diff --git a/composer.json b/composer.json index 5b83184f19f5585adc5b278ee80b7fb19edf8e9a..f60258a74518ff13a3d7d011b376306f4a99c1f4 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": { 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 4f9d92b6559b21f80b33f061ac41e55ce509f8dd..7e9200f5314102e096c50e995ddde05edc83f904 100755 --- a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module +++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.module @@ -78,10 +78,6 @@ 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()]; - } - $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 bc004c43f5327330e664393a675f1679f8044939..8f5f2799bf8a1e2d92750c4e94fbd6bd6b27655e 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,19 @@ {% 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 ? { + path: image.src, + alt: image.alt, + }, + meta: [ + content.oe_sc_event_dates|field_value, + ], }) }} </article> {% endblock %} 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 78143f0865ff2bebd8b193fb633267e8761e102d..4af48a40b9d87a1dc3269fef15d1d20cc0ee5963 100644 --- a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module +++ b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.module @@ -68,9 +68,5 @@ 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()]; - } - $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 6650bbca5f729368d42e1bd09696fe7bfd03cf19..4d5474929e67b1dd9530df32cc7fe29b1f0f5e9e 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,19 @@ {% 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 ? { + path: image.src, + alt: image.alt, + }, + meta: [ + content.oe_publication_date|field_value + ], }) }} </article> {% endblock %} diff --git a/tests/src/Functional/ContentNewsRenderTest.php b/tests/src/Functional/ContentNewsRenderTest.php index e7d42ad30fe26ad94b2bf1ad3666868b7ec210e1..34497412920ce01de6679277aee8982525af6fb4 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()) ); }