+ 
+ {% else %}
+
- {% else %}
-
- {% endif %}
+
{% if page.header %}
{{ page.header }}
diff --git a/templates/patterns/header/header.ui_patterns.yml b/templates/patterns/header/header.ui_patterns.yml
deleted file mode 100644
index 00e2ab0f1..000000000
--- a/templates/patterns/header/header.ui_patterns.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-header:
- label: Header
- description: A navigation section for the header
- variants:
- ec:
- label: European Commission
- eu:
- label: European Union
- fields:
- navbar_branding:
- type: array
- label: "Brand title"
- description: "Your company, product, or project name."
- preview:
- - type: html_tag
- tag: span
- value: "Brand"
- navbar_right:
- type: array
- label: Text
- description: "Vertically centered strings of text."
- preview: "Navbar text with an inline element"
- header_top:
- type: array
- label: 'Header Top'
- header_left:
- type: array
- label: 'Header Left'
- header_right:
- type: array
- label: 'Header Right'
- breadcrumbs:
- type: array
- label: 'Breadcrumbs'
diff --git a/templates/patterns/header/pattern-header--variant-ec.html.twig b/templates/patterns/header/pattern-header--variant-ec.html.twig
deleted file mode 100644
index 1873aab3e..000000000
--- a/templates/patterns/header/pattern-header--variant-ec.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{#
-/**
- * @file
- * Template override for pattern header variant EC.
- */
-#}
-{% extends "pattern-header.html.twig" %}
-{% block header %}
- {% set _header_attributes = create_attribute().addClass(['bcl-header--ec', 'bcl-header']) %}
- {{ parent() }}
-{% endblock %}
diff --git a/templates/patterns/header/pattern-header--variant-eu.html.twig b/templates/patterns/header/pattern-header--variant-eu.html.twig
deleted file mode 100644
index d39c1b062..000000000
--- a/templates/patterns/header/pattern-header--variant-eu.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{#
-/**
- * @file
- * Template override for pattern header variant EU.
- */
-#}
-{% extends "pattern-header.html.twig" %}
-{% block header %}
- {% set _header_attributes = create_attribute().addClass(['bcl-header--eu', 'bcl-header']) %}
- {{ parent() }}
-{% endblock %}
diff --git a/templates/patterns/header/pattern-header.html.twig b/templates/patterns/header/pattern-header.html.twig
deleted file mode 100644
index 8562e3edf..000000000
--- a/templates/patterns/header/pattern-header.html.twig
+++ /dev/null
@@ -1,46 +0,0 @@
-{#
-/**
- * @file
- * Template for header pattern.
- */
-#}
-{% set _nav_attributes = create_attribute().addClass([
- 'w-100',
- 'shadow-sm',
- 'navbar',
- 'navbar-expand-lg',
- 'navbar-light',
-]) %}
-{% set navbar_attributes = create_attribute().addClass(['bcl-header__navbar']) %}
-{% set _header_attributes = create_attribute() %}
-{% set _project_attributes = create_attribute().addClass([
- 'bcl-header__project',
- bcl_header_style == 'light' ? bcl_header_style,
-]) %}
-{% block header %}
-
-{% endblock %}
-
-
diff --git a/tests/src/Functional/CorporateHeaderLogosTest.php b/tests/src/Functional/CorporateHeaderLogosTest.php
new file mode 100644
index 000000000..593aabc6d
--- /dev/null
+++ b/tests/src/Functional/CorporateHeaderLogosTest.php
@@ -0,0 +1,93 @@
+install(['language']);
+ $language = ConfigurableLanguage::createFromLangcode('es');
+ $language->save();
+
+ // Rebuild the ui_pattern definitions to collect the ones provided by
+ // oe_whitelabel itself.
+ \Drupal::service('plugin.manager.ui_patterns')->clearCachedDefinitions();
+ }
+
+ /**
+ * Tests the header logos.
+ */
+ public function testCorporateHeaderLogos(): void {
+ // Create a user that has permission to administer theme settings.
+ $user = $this->drupalCreateUser(['administer themes']);
+ $this->drupalLogin($user);
+
+ $this->drupalGet('');
+ $page = $this->getSession()->getPage();
+ $assert_session = $this->assertSession();
+
+ $assert_session->elementExists('css', 'header.bcl-header.bcl-header--neutral');
+ $assert_session->elementExists('css', 'img[alt="Home logo"]');
+
+ // Select EU component library and save configuration.
+ $this->drupalGet('/admin/appearance/settings/oe_whitelabel');
+ $page->selectFieldOption('Component library', 'European Union');
+ $page->pressButton('Save configuration');
+
+ $this->drupalGet('');
+
+ $assert_session->elementExists('css', 'header.bcl-header.bcl-header--eu');
+ $assert_session->elementExists('css', 'header > nav > div > div > a[href="https://european-union.europa.eu/index_en"]');
+ $assert_session->elementExists('css', 'picture > source[srcset="/build/themes/contrib/oe_bootstrap_theme/assets/logos/eu/mobile/logo-eu--en.svg"]');
+ $assert_session->elementExists('css', 'picture > img[src="/build/themes/contrib/oe_bootstrap_theme/assets/logos/eu/logo-eu--en.svg"]');
+
+ $this->drupalGet('es/');
+
+ $assert_session->elementExists('css', 'header.bcl-header.bcl-header--eu');
+ $assert_session->elementExists('css', 'header > nav > div > div > a[href="https://european-union.europa.eu/index_es"]');
+ $assert_session->elementExists('css', 'picture > source[srcset="/build/themes/contrib/oe_bootstrap_theme/assets/logos/eu/mobile/logo-eu--es.svg"]');
+ $assert_session->elementExists('css', 'picture > img[src="/build/themes/contrib/oe_bootstrap_theme/assets/logos/eu/logo-eu--es.svg"]');
+
+ // Select EC component library and save configuration.
+ $this->drupalGet('/admin/appearance/settings/oe_whitelabel');
+ $page->selectFieldOption('Component library', 'European Commission');
+ $page->pressButton('Save configuration');
+
+ $this->drupalGet('');
+ $assert_session->elementExists('css', 'header.bcl-header.bcl-header--ec');
+ $assert_session->elementExists('css', 'header > nav > div > div > a[href="https://ec.europa.eu/info/index_en"]');
+ $assert_session->elementExists('css', 'img[src="/build/themes/contrib/oe_bootstrap_theme/assets/logos/ec/logo-ec--en.svg"]');
+
+ $this->drupalGet('es/');
+ $assert_session->elementExists('css', 'header.bcl-header.bcl-header--ec');
+ $assert_session->elementExists('css', 'header > nav > div > div > a[href="https://ec.europa.eu/info/index_es"]');
+ $assert_session->elementExists('css', 'img[src="/build/themes/contrib/oe_bootstrap_theme/assets/logos/ec/logo-ec--es.svg"]');
+ }
+
+}
diff --git a/tests/src/Kernel/MultilingualBlockTest.php b/tests/src/Kernel/MultilingualBlockTest.php
index 3e56e41af..aa7053f84 100644
--- a/tests/src/Kernel/MultilingualBlockTest.php
+++ b/tests/src/Kernel/MultilingualBlockTest.php
@@ -82,9 +82,9 @@ public function testBlockRendering(): void {
$render = $this->container->get('renderer')->renderRoot($build);
$crawler = new Crawler($render->__toString());
- $block = $crawler->filter('li.language-switcher');
+ $block = $crawler->filter('div.language-switcher');
$this->assertCount(1, $block);
- $link = $crawler->filter('a.nav-link');
+ $link = $crawler->filter('div.language-switcher > a');
$this->assertSame('English', trim($link->text()));
$this->assertSame('http://localhost/en/%3Cnone%3E', $link->attr('href'));
$title = $crawler->filter('h5#languageeModalLabel');
diff --git a/tests/src/Kernel/SiteBrandingBlockTest.php b/tests/src/Kernel/SiteBrandingBlockTest.php
index 623d92a0f..aadf149de 100644
--- a/tests/src/Kernel/SiteBrandingBlockTest.php
+++ b/tests/src/Kernel/SiteBrandingBlockTest.php
@@ -29,7 +29,6 @@ protected function setUp(): void {
parent::setUp();
\Drupal::service('theme_installer')->install(['oe_whitelabel']);
- $this->container->set('theme.registry', NULL);
$url = '/' . drupal_get_path('theme', 'oe_whitelabel') . '/logo.svg';
\Drupal::configFactory()
@@ -53,39 +52,67 @@ protected function setUp(): void {
* Tests the rendering of blocks.
*/
public function testBlockRendering(): void {
+ \Drupal::configFactory()->getEditable('oe_whitelabel.settings')
+ ->set('component_library', 'ec')
+ ->save();
+
$entity_type_manager = $this->container
->get('entity_type.manager')
->getStorage('block');
- $entity = $entity_type_manager->create([
- 'id' => 'test_block',
- 'theme' => 'oe_whitelabel',
- 'plugin' => 'system_branding_block',
- 'settings' => [
- 'id' => 'system_branding_block',
- 'label' => 'Site branding',
- 'provider' => 'system',
- 'label_display' => '0',
- 'use_site_logo' => TRUE,
- 'use_site_name' => TRUE,
- 'use_site_slogan' => FALSE,
- ],
- ]);
- $entity->save();
+ $entity = $entity_type_manager->load('oe_whitelabel_branding');
+
+ $builder = \Drupal::entityTypeManager()->getViewBuilder('block');
+ $build = $builder->view($entity, 'block');
+ $render = $this->container->get('renderer')->renderRoot($build);
+ $crawler = new Crawler((string) $render);
+
+ $actual = $crawler->filter('.bcl-header__site-name.site-name');
+ $this->assertCount(1, $actual);
+ $link = $actual->filter('.text-decoration-none.align-bottom');
+ $this->assertCount(1, $link);
+ $actual = $crawler->filter('.site-logo.d-none.d-lg-inline-block');
+ $this->assertCount(1, $actual);
+ $logo = $actual->filter('img');
+ $this->assertCount(1, $logo);
+ $expected = '/themes/custom/oe_whitelabel/logo.svg';
+ $this->assertSame($expected, $logo->attr('src'));
+
+ \Drupal::configFactory()->getEditable('oe_whitelabel.settings')
+ ->set('component_library', 'eu')
+ ->set('header_style', 'light')
+ ->save();
+ drupal_static_reset('theme_get_setting');
+
$builder = \Drupal::entityTypeManager()->getViewBuilder('block');
$build = $builder->view($entity, 'block');
$render = $this->container->get('renderer')->renderRoot($build);
- $crawler = new Crawler($render->__toString());
+ $crawler = new Crawler((string) $render);
- $actual = $crawler->filter('.site-name');
+ $actual = $crawler->filter('.bcl-header__site-name.site-name');
$this->assertCount(1, $actual);
- $link = $actual->filter('.text-white.text-decoration-none.align-bottom');
+ $link = $actual->filter('.text-decoration-none.align-bottom');
$this->assertCount(1, $link);
- $actual = $crawler->filter('.site-logo');
+ $actual = $crawler->filter('.site-logo.d-none.d-lg-inline-block');
$this->assertCount(1, $actual);
$logo = $actual->filter('img');
$this->assertCount(1, $logo);
$expected = '/themes/custom/oe_whitelabel/logo.svg';
$this->assertSame($expected, $logo->attr('src'));
+
+ \Drupal::configFactory()->getEditable('oe_whitelabel.settings')
+ ->set('component_library', 'neutral')
+ ->save();
+ drupal_static_reset('theme_get_setting');
+
+ $builder = \Drupal::entityTypeManager()->getViewBuilder('block');
+ $build = $builder->view($entity, 'block');
+ $render = $this->container->get('renderer')->renderRoot($build);
+ $crawler = new Crawler((string) $render);
+
+ $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->assertCount(1, $link);
}
}
-
- {{ pattern('navbar', {
- navigation: header_left,
- right: header_right,
- color_scheme: 'dark',
- background: false,
- attributes: navbar_attributes,
- }) }}
-
- {{ header_top }}
-
-
- {{ breadcrumbs }}
-
-