From 841022957ef169ef917d0a42472836c2e4ac9322 Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Wed, 30 Mar 2022 10:17:45 +0300
Subject: [PATCH 1/5] OEL-0000: Fix broken article tag.
---
.../templates/node--oe-sc-event--teaser.html.twig | 1 +
1 file changed, 1 insertion(+)
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 94b72061..f6299401 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,3 +18,4 @@
image: image,
content: _content
}) }}
+</article>
--
GitLab
From a38822d9313d023cd9b479235e81bc6e8638e55d Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Wed, 30 Mar 2022 10:18:52 +0300
Subject: [PATCH 2/5] OEL-0000: Improve file comments.
---
.../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 f6299401..a068a48e 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
@@ -1,7 +1,7 @@
{#
/**
* @file
- * Search result template.
+ * Theme override to display a node of bundle event in the teaser view mode.
*/
#}
{% set _title %}
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 51cb95a6..2f46de9a 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
@@ -1,7 +1,7 @@
{#
/**
* @file
- * Search result template.
+ * Theme override to display a node of bundle news in the teaser view mode.
*/
#}
{% set _title %}
--
GitLab
From 1cf93577c68281cbd8a18163717ea2c71af4dd68 Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Wed, 30 Mar 2022 10:19:23 +0300
Subject: [PATCH 3/5] OEL-0000: Use standalone class for links.
---
.../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 a068a48e..83bfe25b 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
@@ -5,7 +5,7 @@
*/
#}
{% set _title %}
- <a class="text-underline-hover" href="{{ url }}">{{ label }}</a>
+ <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>
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 2f46de9a..38befee3 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
@@ -5,7 +5,7 @@
*/
#}
{% set _title %}
- <a class="text-underline-hover" href="{{ url }}">{{ label }}</a>
+ <a class="standalone" href="{{ url }}">{{ label }}</a>
{% endset %}
{% set _content %}
<span class="text-muted text-nowrap me-4-5">{{ content.oe_publication_date }}</span>
--
GitLab
From a2bd99e007c1ed4aef29a1d77d1dcc814433776f Mon Sep 17 00:00:00 2001
From: drishu <aszilagyi@live.com>
Date: Wed, 30 Mar 2022 10:20:04 +0300
Subject: [PATCH 4/5] OEL-0000: Wrap teaser article in block content.
---
.../templates/node--oe-sc-event--teaser.html.twig | 2 ++
.../templates/node--oe-sc-news--teaser.html.twig | 2 ++
2 files changed, 4 insertions(+)
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 83bfe25b..bc004c43 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
@@ -10,6 +10,7 @@
{% 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',
@@ -19,3 +20,4 @@
content: _content
}) }}
</article>
+{% endblock %}
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 38befee3..6650bbca 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
@@ -10,6 +10,7 @@
{% 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',
@@ -19,3 +20,4 @@
content: _content
}) }}
</article>
+{% endblock %}
--
GitLab
From 9fe40b4708a7f36ccb6065d41ead42e12ad38ff0 Mon Sep 17 00:00:00 2001
From: Andreas Hennings <andreas@dqxtech.net>
Date: Tue, 5 Apr 2022 18:18:06 +0200
Subject: [PATCH 5/5] OEL-1255: Patch oe_bootstrap_theme for latest 1.x.
---
composer.json | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 989869e1..f8c79040 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
"cweagans/composer-patches": "^1.7",
"drupal/core": "^9.2",
"drupal/twig_field_value": "^2.0",
- "openeuropa/oe_bootstrap_theme": "0.1255.202203291523"
+ "openeuropa/oe_bootstrap_theme": "0.1.202203290731"
},
"require-dev": {
"composer/installers": "^1.11",
@@ -70,6 +70,11 @@
}
}
},
+ "patches": {
+ "openeuropa/oe_bootstrap_theme" : {
+ "1.x latest": "https://github.com/openeuropa/oe_bootstrap_theme/compare/0.1.202203290731..1.x.diff"
+ }
+ },
"drupal-scaffold": {
"locations": {
"web-root": "./build"
--
GitLab