Issue #2470807 by LewisNyman, Dom., davidhernandez, emma.maria, jp.stacey, lauriii: Rename the default "Messages" region for all themes to "Highlighted"

2015-05-15 10:07:31 -07:00 · 2015-05-15 10:07:31 -07:00 · 249e520b4b
parent 5a54339636
commit 249e520b4b
17 changed files with 19 additions and 23 deletions
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@ -455,7 +455,6 @@ class ThemeHandler implements ThemeHandlerInterface {
        'secondary_menu' => 'Secondary menu',
        'footer' => 'Footer',
        'highlighted' => 'Highlighted',
-        'messages' => 'Messages',
        'help' => 'Help',
        'page_top' => 'Page top',
        'page_bottom' => 'Page bottom',
--- a/core/lib/Drupal/Core/Render/BareHtmlPageRenderer.php
+++ b/core/lib/Drupal/Core/Render/BareHtmlPageRenderer.php
@ -52,7 +52,7 @@ class BareHtmlPageRenderer implements BareHtmlPageRendererInterface {
    // 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
--- a/core/modules/system/templates/install-page.html.twig
+++ b/core/modules/system/templates/install-page.html.twig
@ -30,7 +30,7 @@
      {% if title %}
        <h1>{{ title }}</h1>
      {% endif %}
-      {{ page.messages }}
+      {{ page.highlighted }}
      {{ page.content }}
    </main>

--- a/core/modules/system/templates/maintenance-page.html.twig
+++ b/core/modules/system/templates/maintenance-page.html.twig
@ -41,7 +41,7 @@
      <h1>{{ title }}</h1>
    {% endif %}

-    {{ page.messages }}
+    {{ page.highlighted }}

    {{ page.content }}
  </main>
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@ -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 %}
--- a/core/profiles/minimal/config/install/block.block.stark_messages.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_messages.yml
@ -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
--- a/core/profiles/standard/config/install/block.block.bartik_messages.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_messages.yml
@ -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
--- a/core/profiles/standard/config/install/block.block.seven_messages.yml
+++ b/core/profiles/standard/config/install/block.block.seven_messages.yml
@ -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
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@ -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
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@ -39,7 +39,7 @@
              <h1 class="title" id="page-title">{{ title }}</h1>
            {% endif %}
            {{ page.content }}
-            {{ page.messages }}
+            {{ page.highlighted }}
          </section>
        </main>
      </div>
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@ -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">
--- a/core/themes/classy/templates/layout/maintenance-page.html.twig
+++ b/core/themes/classy/templates/layout/maintenance-page.html.twig
@ -39,7 +39,7 @@
      <h1>{{ title }}</h1>
    {% endif %}

-    {{ page.messages }}
+    {{ page.highlighted }}

    {{ page.content }}
  </main>
--- a/core/themes/classy/templates/layout/page.html.twig
+++ b/core/themes/classy/templates/layout/page.html.twig
@ -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 }}

--- a/core/themes/seven/seven.info.yml
+++ b/core/themes/seven/seven.info.yml
@ -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'
--- a/core/themes/seven/templates/install-page.html.twig
+++ b/core/themes/seven/templates/install-page.html.twig
@ -27,7 +27,7 @@
    {% if title %}
      <h1>{{ title }}</h1>
    {% endif %}
-    {{ page.messages }}
+    {{ page.highlighted }}
    {{ page.content }}
  </main>

--- a/core/themes/seven/templates/maintenance-page.html.twig
+++ b/core/themes/seven/templates/maintenance-page.html.twig
@ -27,7 +27,7 @@
    {% if title %}
      <h1>{{ title }}</h1>
    {% endif %}
-    {{ page.messages }}
+    {{ page.highlighted }}
    {{ page.content }}
  </main>

--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@ -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 }}