From 7d9c3fbe4a80d9f906eaa83cc3fdd4371baaeb8e Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 19 Apr 2022 17:24:07 +0200
Subject: [PATCH 1/5] OEL-1453: Place blocks in the right regions on config.
---
config/optional/block.block.oe_whitelabel_eulogin.yml | 2 +-
config/optional/block.block.oe_whitelabel_language_switcher.yml | 2 +-
config/optional/block.block.oe_whitelabel_local_actions.yml | 2 +-
config/optional/block.block.oe_whitelabel_local_tasks.yml | 2 +-
config/optional/block.block.oe_whitelabel_main_navigation.yml | 2 +-
config/optional/block.block.oe_whitelabel_messages.yml | 2 +-
config/optional/block.block.oe_whitelabel_search_form.yml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/config/optional/block.block.oe_whitelabel_eulogin.yml b/config/optional/block.block.oe_whitelabel_eulogin.yml
index 80d9e261..339e2699 100644
--- a/config/optional/block.block.oe_whitelabel_eulogin.yml
+++ b/config/optional/block.block.oe_whitelabel_eulogin.yml
@@ -7,7 +7,7 @@ dependencies:
- oe_whitelabel
id: oe_whitelabel_eulogin
theme: oe_whitelabel
-region: navbar_right
+region: header_top
weight: -4
provider: null
plugin: oe_authentication_login_block
diff --git a/config/optional/block.block.oe_whitelabel_language_switcher.yml b/config/optional/block.block.oe_whitelabel_language_switcher.yml
index b8b46125..e118db63 100644
--- a/config/optional/block.block.oe_whitelabel_language_switcher.yml
+++ b/config/optional/block.block.oe_whitelabel_language_switcher.yml
@@ -7,7 +7,7 @@ dependencies:
- oe_whitelabel
id: oe_whitelabel_language_switcher
theme: oe_whitelabel
-region: navbar_right
+region: header_top
weight: -5
provider: null
plugin: 'language_block:language_interface'
diff --git a/config/optional/block.block.oe_whitelabel_local_actions.yml b/config/optional/block.block.oe_whitelabel_local_actions.yml
index 094fbea4..0fff8fbf 100644
--- a/config/optional/block.block.oe_whitelabel_local_actions.yml
+++ b/config/optional/block.block.oe_whitelabel_local_actions.yml
@@ -5,7 +5,7 @@ dependencies:
- oe_whitelabel
id: oe_whitelabel_local_actions
theme: oe_whitelabel
-region: content
+region: highlighted
weight: -4
provider: null
plugin: local_actions_block
diff --git a/config/optional/block.block.oe_whitelabel_local_tasks.yml b/config/optional/block.block.oe_whitelabel_local_tasks.yml
index 7d547811..ecee83ba 100644
--- a/config/optional/block.block.oe_whitelabel_local_tasks.yml
+++ b/config/optional/block.block.oe_whitelabel_local_tasks.yml
@@ -5,7 +5,7 @@ dependencies:
- oe_whitelabel
id: oe_whitelabel_local_tasks
theme: oe_whitelabel
-region: content
+region: highlighted
weight: -5
provider: null
plugin: local_tasks_block
diff --git a/config/optional/block.block.oe_whitelabel_main_navigation.yml b/config/optional/block.block.oe_whitelabel_main_navigation.yml
index 9494eb72..ed39f8ba 100755
--- a/config/optional/block.block.oe_whitelabel_main_navigation.yml
+++ b/config/optional/block.block.oe_whitelabel_main_navigation.yml
@@ -9,7 +9,7 @@ dependencies:
- oe_whitelabel
id: oe_whitelabel_main_navigation
theme: oe_whitelabel
-region: header_left
+region: navigation_left
weight: 0
provider: null
plugin: 'system_menu_block:main'
diff --git a/config/optional/block.block.oe_whitelabel_messages.yml b/config/optional/block.block.oe_whitelabel_messages.yml
index cf87516d..f21a18c2 100644
--- a/config/optional/block.block.oe_whitelabel_messages.yml
+++ b/config/optional/block.block.oe_whitelabel_messages.yml
@@ -7,7 +7,7 @@ dependencies:
- oe_whitelabel
id: oe_whitelabel_messages
theme: oe_whitelabel
-region: content
+region: highlighted
weight: -6
provider: null
plugin: system_messages_block
diff --git a/config/optional/block.block.oe_whitelabel_search_form.yml b/config/optional/block.block.oe_whitelabel_search_form.yml
index 22437b3a..aad75c89 100644
--- a/config/optional/block.block.oe_whitelabel_search_form.yml
+++ b/config/optional/block.block.oe_whitelabel_search_form.yml
@@ -7,7 +7,7 @@ dependencies:
- oe_whitelabel
id: oe_whitelabel_search_form
theme: oe_whitelabel
-region: header_right
+region: navigation_right
weight: 0
provider: null
plugin: whitelabel_search_block
--
GitLab
From 7d98b9f328557338ab3e1178df552ee55e8a341f Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 19 Apr 2022 17:24:45 +0200
Subject: [PATCH 2/5] OEL-1453: Blocks refactor.
---
oe_whitelabel.info.yml | 24 ++++++++++++------------
templates/overrides/page/page.html.twig | 20 +++++++++++---------
2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/oe_whitelabel.info.yml b/oe_whitelabel.info.yml
index 9ef9fd56..f5f4d6e8 100644
--- a/oe_whitelabel.info.yml
+++ b/oe_whitelabel.info.yml
@@ -18,19 +18,19 @@ ckeditor_stylesheets:
- assets/css/oe-bcl-default.min.css
regions:
- navbar_branding: Navbar branding
- navbar_right: Navbar right
- header_top: Header top
- header_left: Header left
- header_right: Header right
+ navbar_branding: 'Navbar branding'
+ header_top: 'Header top'
+ navigation_left: 'Navigation left'
+ navigation_right: 'Navigation right'
hero: 'Hero (full width)'
- header: Header
- breadcrumbs: Breadcrumbs
- sidebar_left: Sidebar
- content_top: Content top
- content: Content
- page_bottom: Page bottom
- footer: Footer
+ header: 'Header'
+ breadcrumbs: 'Breadcrumbs'
+ highlighted: 'Highlighted'
+ sidebar_left: 'Sidebar'
+ content_top: 'Content top'
+ content: 'Content'
+ page_bottom: 'Page bottom'
+ footer: 'Footer'
config_devel:
install:
diff --git a/templates/overrides/page/page.html.twig b/templates/overrides/page/page.html.twig
index 15f4f253..95a53596 100644
--- a/templates/overrides/page/page.html.twig
+++ b/templates/overrides/page/page.html.twig
@@ -30,10 +30,9 @@
* Regions:
* - page.navbar_branding: Items for the navbar brand region (logo).
* - page.navbar_left: Items for the navbar left region (primary menu).
- * - page.navbar_right: Items for the navbar right region.
- * - page.header_top: Items for the navbar right region.
- * - page.header_left: Items for the navbar right region.
- * - page.header_right: Items for the navbar right region.
+ * - page.header_top: Items for the header top region.
+ * - page.navigation_left: Items for the navbar right region.
+ * - page.navigation_right: Items for the navbar right region.
* - page.header: Items for the header region.
* - page.sidebar_left: Items for the sidebar left region.
* - page.sidebar_right: Items for the sidebar right region.
@@ -75,7 +74,7 @@
{% block head %}
{{ pattern('navbar', {
navigation: corporate_logos,
- right: page.navbar_right,
+ right: page.header_top,
color_scheme: 'light',
background: false,
attributes: create_attribute().addClass(['w-100', 'shadow-sm']),
@@ -87,8 +86,8 @@
{# Navbar. #}
{% block navbar %}
{{ pattern('navbar', {
- navigation: page.header_left,
- right: page.header_right,
+ navigation: page.navigation_left,
+ right: page.navigation_right,
color_scheme: 'dark',
background: false,
expanded_breakpoint: 'lg',
@@ -101,14 +100,17 @@
{{ page.breadcrumbs }}
{% endblock %}
</div>
+ {% if page.header %}
+ {{ page.header }}
+ {% endif %}
</header>
{% endblock %}
<main>
{{ page.hero }}
<div class="container {{ page.header ? 'mt-2': 'mt-5' }}">
<div class="row">
- {% if page.header %}
- {{ page.header }}
+ {% if page.highlighted %}
+ {{ page.highlighted }}
{% endif %}
{% if page.sidebar_left %}
--
GitLab
From 51c39071975a6a429b7822a0d737ed95b28d2d10 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Tue, 19 Apr 2022 19:04:40 +0200
Subject: [PATCH 3/5] OEL-1453: Remove page_bottom region.
---
oe_whitelabel.info.yml | 1 -
templates/overrides/page/page.html.twig | 1 -
2 files changed, 2 deletions(-)
diff --git a/oe_whitelabel.info.yml b/oe_whitelabel.info.yml
index f5f4d6e8..c45b3fc7 100644
--- a/oe_whitelabel.info.yml
+++ b/oe_whitelabel.info.yml
@@ -29,7 +29,6 @@ regions:
sidebar_left: 'Sidebar'
content_top: 'Content top'
content: 'Content'
- page_bottom: 'Page bottom'
footer: 'Footer'
config_devel:
diff --git a/templates/overrides/page/page.html.twig b/templates/overrides/page/page.html.twig
index 95a53596..0594631a 100644
--- a/templates/overrides/page/page.html.twig
+++ b/templates/overrides/page/page.html.twig
@@ -37,7 +37,6 @@
* - page.sidebar_left: Items for the sidebar left region.
* - page.sidebar_right: Items for the sidebar right region.
* - page.content: The main content of the current page.
- * - page.page_bottom: The content of the current page.
* - page.footer: Items for the footer region.
*
* @see template_preprocess_page()
--
GitLab
From cd88ba801730823b8cf2ab74473851a9c7afcd4c Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Thu, 21 Apr 2022 12:56:52 +0200
Subject: [PATCH 4/5] OEL-1453: Rename navbar branding to header branding.
---
config/optional/block.block.oe_whitelabel_branding.yml | 2 +-
oe_whitelabel.info.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/optional/block.block.oe_whitelabel_branding.yml b/config/optional/block.block.oe_whitelabel_branding.yml
index e860d619..6b8c0884 100644
--- a/config/optional/block.block.oe_whitelabel_branding.yml
+++ b/config/optional/block.block.oe_whitelabel_branding.yml
@@ -7,7 +7,7 @@ dependencies:
- oe_whitelabel
id: oe_whitelabel_branding
theme: oe_whitelabel
-region: navbar_branding
+region: header_branding
weight: -2
provider: null
plugin: system_branding_block
diff --git a/oe_whitelabel.info.yml b/oe_whitelabel.info.yml
index c45b3fc7..1e46bc1a 100644
--- a/oe_whitelabel.info.yml
+++ b/oe_whitelabel.info.yml
@@ -18,7 +18,7 @@ ckeditor_stylesheets:
- assets/css/oe-bcl-default.min.css
regions:
- navbar_branding: 'Navbar branding'
+ header_branding: 'Header branding'
header_top: 'Header top'
navigation_left: 'Navigation left'
navigation_right: 'Navigation right'
--
GitLab
From 5f2fda31c2bd53a9b38d366943d82463574c71e7 Mon Sep 17 00:00:00 2001
From: escuriola <escuriola@gmail.com>
Date: Thu, 21 Apr 2022 12:57:17 +0200
Subject: [PATCH 5/5] OEL-1453: Update page docblock with the current blocks.
---
templates/overrides/page/page.html.twig | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/templates/overrides/page/page.html.twig b/templates/overrides/page/page.html.twig
index 0594631a..cd47a91a 100644
--- a/templates/overrides/page/page.html.twig
+++ b/templates/overrides/page/page.html.twig
@@ -28,14 +28,16 @@
* comment/reply/12345).
*
* Regions:
- * - page.navbar_branding: Items for the navbar brand region (logo).
- * - page.navbar_left: Items for the navbar left region (primary menu).
+ * - page.header_branding: Items for the header branding region (logo).
* - page.header_top: Items for the header top region.
- * - page.navigation_left: Items for the navbar right region.
- * - page.navigation_right: Items for the navbar right region.
+ * - page.navigation_left: Items for the navigation right region.
+ * - page.navigation_right: Items for the navigation right region.
+ * - page.hero: Items for the hero region.
* - page.header: Items for the header region.
+ * - page.breadcrumbs: Items for the breadcrumbs region.
+ * - page.highlighted: Items for the highlighted region.
* - page.sidebar_left: Items for the sidebar left region.
- * - page.sidebar_right: Items for the sidebar right region.
+ * - page.content_top: Items for the top content.
* - page.content: The main content of the current page.
* - page.footer: Items for the footer region.
*
@@ -80,7 +82,7 @@
}) }}
{% endblock %}
- {{ page.navbar_branding }}
+ {{ page.header_branding }}
{# Navbar. #}
{% block navbar %}
--
GitLab