Commit e0505159 authored by alexpott's avatar alexpott

Issue #2470807 by LewisNyman, Dom., davidhernandez, emma.maria, lauriii,...

Issue #2470807 by LewisNyman, Dom., davidhernandez, emma.maria, lauriii, jp.stacey: Rename the default "Messages" region for all themes to "Highlighted"
parent 4a576b0b
......@@ -265,7 +265,6 @@ public function rebuildThemeData() {
'secondary_menu' => 'Secondary menu',
'footer' => 'Footer',
'highlighted' => 'Highlighted',
'messages' => 'Messages',
'help' => 'Help',
'page_top' => 'Page top',
'page_bottom' => 'Page bottom',
......
......@@ -52,7 +52,7 @@ public function renderBarePage(array $content, $title, $page_theme_property, arr
// For backwards compatibility.
// @todo In Drupal 9, add a $show_messages function parameter.
if (!isset($page_additions['#show_messages']) || $page_additions['#show_messages'] === TRUE) {
$html['page']['messages'] = ['#type' => 'status_messages'];
$html['page']['highlighted'] = ['#type' => 'status_messages'];
}
// We must first render the contents of the html.html.twig template, see
......
......@@ -30,7 +30,7 @@
{% if title %}
<h1>{{ title }}</h1>
{% endif %}
{{ page.messages }}
{{ page.highlighted }}
{{ page.content }}
</main>
......
......@@ -41,7 +41,7 @@
<h1>{{ title }}</h1>
{% endif %}
{{ page.messages }}
{{ page.highlighted }}
{{ page.content }}
</main>
......
......@@ -46,7 +46,6 @@
* - page.primary_menu: Items for the primary menu region.
* - page.secondary_menu: Items for the secondary menu region.
* - page.highlighted: Items for the highlighted content region.
* - page.messages: Status messages block can be placed in messages region.
* - page.help: Dynamic help text, mostly for admin pages.
* - page.content: The main content of the current page.
* - page.sidebar_first: Items for the first sidebar.
......@@ -97,7 +96,7 @@
{{ page.breadcrumb }}
{{ page.messages }}
{{ page.highlighted }}
{{ page.help }}
......@@ -105,7 +104,6 @@
<a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
<div class="layout-content">
{{ page.highlighted }}
{{ title_prefix }}
{% if title %}
......
......@@ -3,7 +3,7 @@ theme: stark
weight: 0
status: true
langcode: en
region: messages
region: highlighted
plugin: system_messages_block
settings:
id: system_messages_block
......
......@@ -3,7 +3,7 @@ theme: bartik
weight: 0
status: true
langcode: en
region: messages
region: highlighted
plugin: system_messages_block
settings:
id: system_messages_block
......
......@@ -3,7 +3,7 @@ theme: seven
weight: 0
status: true
langcode: en
region: messages
region: highlighted
plugin: system_messages_block
settings:
id: system_messages_block
......
......@@ -21,7 +21,7 @@ regions:
help: Help
page_top: 'Page top'
page_bottom: 'Page bottom'
messages: Messages
highlighted: Highlighted
featured_top: 'Featured top'
breadcrumb: Breadcrumb
content: Content
......
......@@ -39,7 +39,7 @@
<h1 class="title" id="page-title">{{ title }}</h1>
{% endif %}
{{ page.content }}
{{ page.messages }}
{{ page.highlighted }}
</section>
</main>
</div>
......
......@@ -49,7 +49,7 @@
*
* Regions:
* - page.header: Items for the header region.
* - page.messages: Status and error messages. Should be displayed prominently.
* - page.highlighted: Items for the highlighted region.
* - page.primary_menu: Items for the primary menu region.
* - page.secondary_menu: Items for the secondary menu region.
* - page.featured_top: Items for the featured top region.
......@@ -109,7 +109,7 @@
{{ page.primary_menu }}
</div>
</header>
{{ page.messages }}
{{ page.highlighted }}
{% if page.featured_top %}
<div class="featured-top">
<aside class="featured-top__inner section layout-container clearfix" role="complementary">
......
......@@ -39,7 +39,7 @@
<h1>{{ title }}</h1>
{% endif %}
{{ page.messages }}
{{ page.highlighted }}
{{ page.content }}
</main>
......
......@@ -42,7 +42,7 @@
*
* Regions:
* - page.header: Items for the header region.
* - page.messages: Status and error messages. Should be displayed prominently.
* - page.highlighted: Items for the highlighted region.
* - page.primary_menu: Items for the primary menu region.
* - page.secondary_menu: Items for the secondary menu region.
* - page.highlighted: Items for the highlighted content region.
......@@ -94,7 +94,7 @@
{{ page.breadcrumb }}
{{ page.messages }}
{{ page.highlighted }}
{{ page.help }}
......
......@@ -15,7 +15,7 @@ quickedit_stylesheets:
- css/components/quickedit.css
regions:
content: Content
messages: Messages
highlighted: Highlighted
help: Help
page_top: 'Page top'
page_bottom: 'Page bottom'
......
......@@ -27,7 +27,7 @@
{% if title %}
<h1>{{ title }}</h1>
{% endif %}
{{ page.messages }}
{{ page.highlighted }}
{{ page.content }}
</main>
......
......@@ -27,7 +27,7 @@
{% if title %}
<h1>{{ title }}</h1>
{% endif %}
{{ page.messages }}
{{ page.highlighted }}
{{ page.content }}
</main>
......
......@@ -43,8 +43,7 @@
*
* Regions:
* - page.page_top: Items for the header region.
* - page.highlighted: Items for the highlighted content region.
* - page.messages: Status and error messages. Should be displayed prominently.
* - page.highlighted: Items for the highlighted region.
* - page.help: Dynamic help text, mostly for admin pages.
* - page.content: The main content of the current page.
* - page.sidebar_first: Items for the first sidebar.
......@@ -79,7 +78,7 @@
<main class="page-content clearfix" role="main">
<div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
{{ page.messages }}
{{ page.highlighted }}
{% if page.help %}
<div class="help">
{{ page.help }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment