diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0aaca79cb038377950f07afa58483840285d67f..937b7a57ff352eeb68e988cba49193d16f6399b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,47 @@
# Change Log
+## [1.0.0-beta2](https://github.com/openeuropa/oe_whitelabel/tree/1.0.0-beta2) (2022-05-23)
+[Full Changelog](https://github.com/openeuropa/oe_whitelabel/compare/1.0.0-beta1...1.0.0-beta2)
+
+**Merged pull requests:**
+
+- OEL-1632: Add upgrade hooks for moving content banner into block. [\#147](https://github.com/openeuropa/oe_whitelabel/pull/147) ([donquixote](https://github.com/donquixote))
+
+## [1.0.0-beta1](https://github.com/openeuropa/oe_whitelabel/tree/1.0.0-beta1) (2022-05-20)
+[Full Changelog](https://github.com/openeuropa/oe_whitelabel/compare/1.0.0-alpha7...1.0.0-beta1)
+
+**Closed issues:**
+
+- The header pattern displays an empty navbar when both regions are empty [\#50](https://github.com/openeuropa/oe_whitelabel/issues/50)
+
+**Merged pull requests:**
+
+- Prepare dependencies for release 1.0.0-beta1 [\#146](https://github.com/openeuropa/oe_whitelabel/pull/146) ([drishu](https://github.com/drishu))
+- Prepare release 1.0.0-beta1 [\#145](https://github.com/openeuropa/oe_whitelabel/pull/145) ([drishu](https://github.com/drishu))
+- OEL-1585: Fix logo url link in neutral flavour and test coverage. [\#142](https://github.com/openeuropa/oe_whitelabel/pull/142) ([escuriola](https://github.com/escuriola))
+- Update EPIC-1293-Project [\#140](https://github.com/openeuropa/oe_whitelabel/pull/140) ([donquixote](https://github.com/donquixote))
+- OEL-0000: Remove explicit version requirement for drupal/remote\_stream\_wrapper [\#134](https://github.com/openeuropa/oe_whitelabel/pull/134) ([donquixote](https://github.com/donquixote))
+- OEL-1528: Fix whitelabel issues on template, composer and dependencies. [\#133](https://github.com/openeuropa/oe_whitelabel/pull/133) ([Maxfire](https://github.com/Maxfire))
+- OEL-0000: Fix remote\_stream\_wrapper version to 1.5.0 temporarily. [\#132](https://github.com/openeuropa/oe_whitelabel/pull/132) ([donquixote](https://github.com/donquixote))
+- OEL-1536: Specify extension type when using ConfigImporter. [\#131](https://github.com/openeuropa/oe_whitelabel/pull/131) ([donquixote](https://github.com/donquixote))
+- OEL-1525: Uninitialized config keys in SearchBlock [\#130](https://github.com/openeuropa/oe_whitelabel/pull/130) ([donquixote](https://github.com/donquixote))
+- OEL-1452: Escaped markup in description list paragraph. [\#127](https://github.com/openeuropa/oe_whitelabel/pull/127) ([brummbar](https://github.com/brummbar))
+- OEL-1374: Search page look & feel update [\#126](https://github.com/openeuropa/oe_whitelabel/pull/126) ([escuriola](https://github.com/escuriola))
+- OEL-1453: Consolidate theme regions [\#125](https://github.com/openeuropa/oe_whitelabel/pull/125) ([escuriola](https://github.com/escuriola))
+- OEL-1416: Fix tests for BCL 0.22.0 [\#124](https://github.com/openeuropa/oe_whitelabel/pull/124) ([donquixote](https://github.com/donquixote))
+- OEL-1357: README improvements [\#123](https://github.com/openeuropa/oe_whitelabel/pull/123) ([donquixote](https://github.com/donquixote))
+- OEL-1425: Use imageValueObject on oe\_whitelabel. [\#118](https://github.com/openeuropa/oe_whitelabel/pull/118) ([escuriola](https://github.com/escuriola))
+- EPIC-1293-Project [\#109](https://github.com/openeuropa/oe_whitelabel/pull/109) ([Maxfire](https://github.com/Maxfire))
+- OEL-1227: Move content banner into a block. [\#101](https://github.com/openeuropa/oe_whitelabel/pull/101) ([donquixote](https://github.com/donquixote))
+- OEL-1317: Improve navbar search form. [\#100](https://github.com/openeuropa/oe_whitelabel/pull/100) ([escuriola](https://github.com/escuriola))
+- OEL-486: Improve test coverage [\#89](https://github.com/openeuropa/oe_whitelabel/pull/89) ([drishu](https://github.com/drishu))
+
## [1.0.0-alpha7](https://github.com/openeuropa/oe_whitelabel/tree/1.0.0-alpha7) (2022-04-08)
[Full Changelog](https://github.com/openeuropa/oe_whitelabel/compare/1.0.0-alpha6...1.0.0-alpha7)
**Merged pull requests:**
+- Prepare release 1.0.0-alpha7 [\#120](https://github.com/openeuropa/oe_whitelabel/pull/120) ([abel-santos-corral](https://github.com/abel-santos-corral))
- OEL-1434: Filter out bundles if no legacy fields present [\#119](https://github.com/openeuropa/oe_whitelabel/pull/119) ([abel-santos-corral](https://github.com/abel-santos-corral))
## [1.0.0-alpha6](https://github.com/openeuropa/oe_whitelabel/tree/1.0.0-alpha6) (2022-04-07)
diff --git a/composer.json b/composer.json
index 8ea3ed3c911f2663db30c49731aa68ec3569ed98..f429aed09a4ad13a1a5f957d69f15a4427453dde 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
"drupal/core": "^9.2",
"drupal/twig_field_value": "^2.0",
"openeuropa/composer-artifacts": "^1.0.0-alpha1",
- "openeuropa/oe_bootstrap_theme": "0.1.202204221756"
+ "openeuropa/oe_bootstrap_theme": "0.1.202206071025"
},
"require-dev": {
"composer/installers": "^1.11",
@@ -41,7 +41,7 @@
"openeuropa/oe_authentication": "^1.4",
"openeuropa/oe_contact_forms": "~1.1",
"openeuropa/oe_content": "^2.8.0",
- "openeuropa/oe_content_extra": "dev-EPIC-1293-Project",
+ "openeuropa/oe_content_extra": "1.x-dev",
"openeuropa/oe_corporate_blocks": "^4.4",
"openeuropa/oe_media": "^1.14",
"openeuropa/oe_multilingual": "^1.9",
@@ -90,9 +90,6 @@
"patches": {
"drupal/entity_reference_revisions": {
"https://www.drupal.org/project/entity_reference_revisions/issues/2937835": "https://www.drupal.org/files/issues/2021-03-26/entity_reference_revisions-field_formatter_label-2937835-36.patch"
- },
- "openeuropa/oe_bootstrap_theme": {
- "latest": "https://github.com/openeuropa/oe_bootstrap_theme/compare/0.1.202204221756..1.x.diff"
}
},
"drupal-scaffold": {
diff --git a/modules/oe_whitelabel_contact_forms/oe_whitelabel_contact_forms.module b/modules/oe_whitelabel_contact_forms/oe_whitelabel_contact_forms.module
index d979b6c28b3fa0885a72b2fd2482422d7ef83be4..29046b9be94a951451c15621f1bf8f14cd2e95a3 100644
--- a/modules/oe_whitelabel_contact_forms/oe_whitelabel_contact_forms.module
+++ b/modules/oe_whitelabel_contact_forms/oe_whitelabel_contact_forms.module
@@ -74,13 +74,19 @@ function oe_whitelabel_contact_forms_preprocess_status_messages(&$variables) {
if ($field->isEmpty() || !$field->access()) {
continue;
}
- $value = 'value';
- if ($field->getFieldDefinition()->getType() == 'skos_concept_entity_reference') {
- $value = 'target_id';
+
+ if ($field->getFieldDefinition()->getType() === 'skos_concept_entity_reference') {
+ /** @var \Drupal\rdf_skos\Entity\Concept[] $concept_entities */
+ $concept_entities = $field->referencedEntities();
+ $definition = $concept_entities[0]->label();
+ }
+ else {
+ $definition = $field->first()->getValue()['value'];
}
+
$items[] = [
'term' => $field->getFieldDefinition()->getLabel(),
- 'definition' => $field->first()->getValue()[$value],
+ 'definition' => $definition,
];
}
$variables['message_list']['status'][$key] = [
diff --git a/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/block.block.oe_whitelabel_content_banner.yml b/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/block.block.oe_whitelabel_content_banner.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a7739a8290bea8d780fbe477992b073c0982ad69
--- /dev/null
+++ b/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/block.block.oe_whitelabel_content_banner.yml
@@ -0,0 +1,21 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - node
+ theme:
+ - oe_whitelabel
+id: oe_whitelabel_content_banner
+theme: oe_whitelabel
+region: hero
+weight: -6
+provider: null
+plugin: oe_w_content_banner
+settings:
+ id: oe_w_content_banner
+ label: 'Content banner'
+ label_display: '0'
+ provider: node
+ context_mapping:
+ node: '@node.node_route_context:node'
+visibility: { }
diff --git a/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/core.entity_view_mode.node.oe_w_content_banner.yml b/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/core.entity_view_mode.node.oe_w_content_banner.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f9fd090f85d463538ab1fbad052f07781d8d04f4
--- /dev/null
+++ b/modules/oe_whitelabel_helper/config/post_updates/00001_content_banner/core.entity_view_mode.node.oe_w_content_banner.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - node
+id: node.oe_w_content_banner
+label: 'Content banner'
+targetEntityType: node
+cache: true
diff --git a/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php b/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php
new file mode 100644
index 0000000000000000000000000000000000000000..d82ac1650beefa35d6ce05d2717991f990bf6ec2
--- /dev/null
+++ b/modules/oe_whitelabel_helper/oe_whitelabel_helper.post_update.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Post update hooks.
+ */
+
+declare(strict_types = 1);
+
+use Drupal\oe_bootstrap_theme\ConfigImporter;
+
+/**
+ * Move content banner into a block.
+ */
+function oe_whitelabel_helper_post_update_00001(): void {
+ $configs = [
+ 'block.block.oe_whitelabel_content_banner',
+ 'core.entity_view_mode.node.oe_w_content_banner',
+ ];
+ ConfigImporter::importMultiple('module', 'oe_whitelabel_helper', '/config/post_updates/00001_content_banner', $configs, TRUE);
+}
diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.full.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.full.yml
new file mode 100755
index 0000000000000000000000000000000000000000..6ad2e19b4a71f0579a0b35ac5cb7087f03a1879c
--- /dev/null
+++ b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.full.yml
@@ -0,0 +1,69 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.full
+ - field.field.node.oe_sc_event.body
+ - field.field.node.oe_sc_event.oe_documents
+ - field.field.node.oe_sc_event.oe_featured_media
+ - field.field.node.oe_sc_event.oe_sc_event_dates
+ - field.field.node.oe_sc_event.oe_sc_event_location
+ - field.field.node.oe_sc_event.oe_summary
+ - node.type.oe_sc_event
+ module:
+ - datetime_range
+ - oe_whitelabel_helper
+ - text
+ - user
+id: node.oe_sc_event.full
+targetEntityType: node
+bundle: oe_sc_event
+mode: full
+content:
+ body:
+ type: text_default
+ label: above
+ settings: { }
+ third_party_settings: { }
+ weight: 0
+ region: content
+ links:
+ settings: { }
+ third_party_settings: { }
+ weight: 4
+ region: content
+ oe_documents:
+ type: entity_reference_entity_view
+ label: above
+ settings:
+ view_mode: default
+ link: true
+ third_party_settings: { }
+ weight: 3
+ region: content
+ oe_sc_event_dates:
+ type: daterange_default
+ label: inline
+ settings:
+ timezone_override: ''
+ format_type: oe_whitelabel_starter_event_date
+ separator: to
+ third_party_settings: { }
+ weight: 1
+ region: content
+ oe_sc_event_location:
+ type: oe_whitelabel_helper_address_inline
+ label: inline
+ settings:
+ delimiter: ', '
+ third_party_settings: { }
+ weight: 2
+ region: content
+hidden:
+ langcode: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_featured_media: true
+ oe_summary: true
diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f6d0cd2adc32860b19f61da1d6f7a2ff472c54a0
--- /dev/null
+++ b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.oe_w_content_banner.yml
@@ -0,0 +1,47 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.oe_w_content_banner
+ - field.field.node.oe_sc_event.body
+ - field.field.node.oe_sc_event.oe_documents
+ - field.field.node.oe_sc_event.oe_featured_media
+ - field.field.node.oe_sc_event.oe_sc_event_dates
+ - field.field.node.oe_sc_event.oe_sc_event_location
+ - field.field.node.oe_sc_event.oe_summary
+ - node.type.oe_sc_event
+ module:
+ - oe_content_featured_media_field
+ - text
+ - user
+id: node.oe_sc_event.oe_w_content_banner
+targetEntityType: node
+bundle: oe_sc_event
+mode: oe_w_content_banner
+content:
+ oe_featured_media:
+ type: oe_featured_media_label
+ label: hidden
+ settings:
+ link: true
+ third_party_settings: { }
+ weight: 1
+ region: content
+ oe_summary:
+ type: text_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 0
+ region: content
+hidden:
+ body: true
+ langcode: true
+ links: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_documents: true
+ oe_sc_event_dates: true
+ oe_sc_event_location: true
diff --git a/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.teaser.yml b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.teaser.yml
new file mode 100755
index 0000000000000000000000000000000000000000..6233984402ee68232bd4f5d50236783222a39d79
--- /dev/null
+++ b/modules/oe_whitelabel_starter_event/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_event.teaser.yml
@@ -0,0 +1,56 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.teaser
+ - field.field.node.oe_sc_event.body
+ - field.field.node.oe_sc_event.oe_documents
+ - field.field.node.oe_sc_event.oe_featured_media
+ - field.field.node.oe_sc_event.oe_sc_event_dates
+ - field.field.node.oe_sc_event.oe_sc_event_location
+ - field.field.node.oe_sc_event.oe_summary
+ - node.type.oe_sc_event
+ module:
+ - address
+ - datetime_range
+ - text
+ - user
+id: node.oe_sc_event.teaser
+targetEntityType: node
+bundle: oe_sc_event
+mode: teaser
+content:
+ oe_sc_event_dates:
+ type: daterange_default
+ label: hidden
+ settings:
+ timezone_override: ''
+ format_type: oe_whitelabel_starter_event_date
+ separator: to
+ third_party_settings: { }
+ weight: 4
+ region: content
+ oe_sc_event_location:
+ type: address_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 5
+ region: content
+ oe_summary:
+ type: text_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 2
+ region: content
+hidden:
+ body: true
+ langcode: true
+ links: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_documents: true
+ oe_featured_media: true
diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php
new file mode 100644
index 0000000000000000000000000000000000000000..fe1ab7d35472c1a327d9a702aa1496abf3880923
--- /dev/null
+++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.post_update.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Post update hooks.
+ */
+
+declare(strict_types = 1);
+
+use Drupal\oe_bootstrap_theme\ConfigImporter;
+
+/**
+ * Move content banner into a block.
+ */
+function oe_whitelabel_starter_event_post_update_00001(): void {
+ $configs = [
+ 'core.entity_view_display.node.oe_sc_event.full',
+ 'core.entity_view_display.node.oe_sc_event.oe_w_content_banner',
+ 'core.entity_view_display.node.oe_sc_event.teaser',
+ ];
+ ConfigImporter::importMultiple('module', 'oe_whitelabel_starter_event', '/config/post_updates/00001_content_banner', $configs, TRUE);
+}
diff --git a/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.full.yml b/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.full.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c79b5a1c89a59a1486bf42769d054ffcb3567ddd
--- /dev/null
+++ b/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.full.yml
@@ -0,0 +1,40 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.full
+ - field.field.node.oe_sc_news.body
+ - field.field.node.oe_sc_news.oe_featured_media
+ - field.field.node.oe_sc_news.oe_publication_date
+ - field.field.node.oe_sc_news.oe_summary
+ - node.type.oe_sc_news
+ module:
+ - text
+ - user
+id: node.oe_sc_news.full
+targetEntityType: node
+bundle: oe_sc_news
+mode: full
+content:
+ body:
+ type: text_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 0
+ region: content
+ links:
+ settings: { }
+ third_party_settings: { }
+ weight: 1
+ region: content
+hidden:
+ langcode: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_featured_media: true
+ oe_publication_date: true
+ oe_summary: true
+ search_api_excerpt: true
diff --git a/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.oe_w_content_banner.yml b/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.oe_w_content_banner.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2eb3b1342ba4ae932410a6408ab069618714795d
--- /dev/null
+++ b/modules/oe_whitelabel_starter_news/config/post_updates/00001_content_banner/core.entity_view_display.node.oe_sc_news.oe_w_content_banner.yml
@@ -0,0 +1,44 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - core.entity_view_mode.node.oe_w_content_banner
+ - field.field.node.oe_sc_news.body
+ - field.field.node.oe_sc_news.oe_featured_media
+ - field.field.node.oe_sc_news.oe_publication_date
+ - field.field.node.oe_sc_news.oe_summary
+ - node.type.oe_sc_news
+ module:
+ - datetime
+ - text
+ - user
+id: node.oe_sc_news.oe_w_content_banner
+targetEntityType: node
+bundle: oe_sc_news
+mode: oe_w_content_banner
+content:
+ oe_publication_date:
+ type: datetime_default
+ label: hidden
+ settings:
+ timezone_override: ''
+ format_type: oe_whitelabel_starter_news_date
+ third_party_settings: { }
+ weight: 1
+ region: content
+ oe_summary:
+ type: text_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 0
+ region: content
+hidden:
+ body: true
+ langcode: true
+ links: true
+ oe_content_content_owner: true
+ oe_content_legacy_link: true
+ oe_content_navigation_title: true
+ oe_content_short_title: true
+ oe_featured_media: true
diff --git a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.post_update.php b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.post_update.php
new file mode 100644
index 0000000000000000000000000000000000000000..4f5a135261a36792c5a28a616dfa337198a6731d
--- /dev/null
+++ b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.post_update.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Post update hooks.
+ */
+
+declare(strict_types = 1);
+
+use Drupal\oe_bootstrap_theme\ConfigImporter;
+
+/**
+ * Move content banner into a block.
+ */
+function oe_whitelabel_starter_news_post_update_00001(): void {
+ $configs = [
+ 'core.entity_view_display.node.oe_sc_news.full',
+ 'core.entity_view_display.node.oe_sc_news.oe_w_content_banner',
+ ];
+ ConfigImporter::importMultiple('module', 'oe_whitelabel_starter_news', '/config/post_updates/00001_content_banner', $configs, TRUE);
+}
diff --git a/oe_whitelabel.theme b/oe_whitelabel.theme
index 490f62a85c016476069eb10b0851b8b62bca20f9..f44bc248b7971f9f8a0fa2307ac473356602f5b6 100644
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
@@ -8,7 +8,6 @@
declare(strict_types = 1);
use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
use Drupal\oe_bootstrap_theme_helper\EuropeanUnionLanguages;
use Drupal\oe_whitelabel\DocumentMediaWrapper;
@@ -80,7 +79,6 @@ function oe_whitelabel_preprocess_page(&$variables) {
$variables['logo_aria_label'] = t('Home');
$variables['site_logo_alt'] = t('Home logo');
$variables['site_logo_title'] = t('Home');
- $site_logo_href = Url::fromRoute('<front>')->toString();
}
if ($variables['bcl_component_library'] === 'neutral') {
diff --git a/templates/overrides/page/page.html.twig b/templates/overrides/page/page.html.twig
index abfe5da7f0bac14d1e8a6f40f0a8edfbf560b5f0..a6f0c6e8572d5833f83c1e70f4b8e16d5876df3a 100644
--- a/templates/overrides/page/page.html.twig
+++ b/templates/overrides/page/page.html.twig
@@ -47,12 +47,13 @@
* @ingroup themeable
*/
#}
+{% set neutral = bcl_component_library == 'neutral' %}
{% set corporate_logos %}
- {% set anchor_attributes = bcl_component_library == 'neutral'
+ {% set anchor_attributes = neutral
? create_attribute().addClass(['navbar-brand'])
: create_attribute().addClass(['navbar-brand']).setAttribute('target', '_blank')
%}
- <a {{ anchor_attributes }} href="{{ site_logo_href }}">
+ <a {{ anchor_attributes }} href="{{ neutral ? front_page : site_logo_href }}">
{% if bcl_component_library == 'eu' %}
<picture>
<source media="(max-width: 992px)"
diff --git a/tests/src/Kernel/SiteBrandingBlockTest.php b/tests/src/Kernel/SiteBrandingBlockTest.php
index aadf149deacbbcddfb650cb69de1ae479b47aac2..7ff0346479450aee0bb7a9cc4c641b8d1737f3eb 100644
--- a/tests/src/Kernel/SiteBrandingBlockTest.php
+++ b/tests/src/Kernel/SiteBrandingBlockTest.php
@@ -4,6 +4,7 @@ declare(strict_types = 1);
namespace Drupal\Tests\oe_whitelabel\Kernel;
+use Drupal\Core\Url;
use Drupal\KernelTests\KernelTestBase;
use Symfony\Component\DomCrawler\Crawler;
@@ -71,6 +72,7 @@ class SiteBrandingBlockTest extends KernelTestBase {
$link = $actual->filter('.text-decoration-none.align-bottom');
$this->assertCount(1, $link);
$actual = $crawler->filter('.site-logo.d-none.d-lg-inline-block');
+ $this->assertSame(Url::fromRoute('<front>')->toString(), $actual->attr('href'));
$this->assertCount(1, $actual);
$logo = $actual->filter('img');
$this->assertCount(1, $logo);
@@ -93,6 +95,7 @@ class SiteBrandingBlockTest extends KernelTestBase {
$link = $actual->filter('.text-decoration-none.align-bottom');
$this->assertCount(1, $link);
$actual = $crawler->filter('.site-logo.d-none.d-lg-inline-block');
+ $this->assertSame(Url::fromRoute('<front>')->toString(), $actual->attr('href'));
$this->assertCount(1, $actual);
$logo = $actual->filter('img');
$this->assertCount(1, $logo);
@@ -112,6 +115,7 @@ class SiteBrandingBlockTest extends KernelTestBase {
$actual = $crawler->filter('.bcl-header__site-name.site-name.h5.d-inline-block.d-lg-none');
$this->assertCount(1, $actual);
$link = $actual->filter('.text-decoration-none.align-bottom');
+ $this->assertSame(Url::fromRoute('<front>')->toString(), $link->attr('href'));
$this->assertCount(1, $link);
}