diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index b99fc6c..516e668 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1403,7 +1403,6 @@ function template_preprocess_page(&$variables) {
// Move some variables to the top level for themer convenience and template cleanliness.
$variables['show_messages'] = $variables['page']['#show_messages'];
- $variables['title'] = $variables['page']['#title'];
foreach (system_region_list(\Drupal::theme()->getActiveTheme()->getName()) as $region_key => $region_name) {
if (!isset($variables['page'][$region_key])) {
@@ -1428,14 +1427,6 @@ function template_preprocess_page(&$variables) {
$variables['is_front'] = FALSE;
$variables['db_is_active'] = FALSE;
}
- if (!defined('MAINTENANCE_MODE')) {
- $variables['action_links'] = menu_get_local_actions();
- $variables['tabs'] = menu_local_tabs();
- }
- else {
- $variables['action_links'] = array();
- $variables['tabs'] = array();
- }
if ($node = \Drupal::routeMatch()->getParameter('node')) {
$variables['node'] = $node;
diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 9529c8a..480a779 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -469,6 +469,9 @@ public function rebuildThemeData() {
'page_top' => 'Page top',
'page_bottom' => 'Page bottom',
'breadcrumb' => 'Breadcrumb',
+ 'page_title' => 'Page title',
+ 'page_tabs' => 'Page tabs',
+ 'page_actions' => 'Page actions',
),
'description' => '',
'features' => $this->defaultFeatures,
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index 627d7c7..82a7c95 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -28,14 +28,9 @@
* Page content (in order of occurrence in the default page.html.twig):
* - title_prefix: Additional output populated by modules, intended to be
* displayed in front of the main title tag that appears in the template.
- * - title: The page title, for use in the actual content.
* - title_suffix: Additional output populated by modules, intended to be
* displayed after the main title tag that appears in the template.
* - messages: Status and error messages. Should be displayed prominently.
- * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
- * view and edit tabs when displaying a node).
- * - action_links: Actions local to the page, such as "Add menu" on the menu
- * administration interface.
* - node: Fully loaded node, if there is an automatically-loaded node
* associated with the page and the node ID is the second argument in the
* page's path (e.g. node/12345 and node/12345/revisions, but not
@@ -52,6 +47,9 @@
* - page.sidebar_second: Items for the second sidebar.
* - page.footer: Items for the footer region.
* - page.breadcrumb: Items for the breadcrumb region.
+ * - page.title: Items for the page title region.
+ * - page.tabs: Items for the tabs region.
+ * - page.actions: Items for the actions region.
*
* @see template_preprocess_page()
* @see html.html.twig
@@ -107,15 +105,13 @@
{{ page.highlighted }}
{{ title_prefix }}
- {% if title %}
-
{{ title }}
- {% endif %}
+ {{ page.title }}
{{ title_suffix }}
- {{ tabs }}
+ {{ page.tabs }}
- {% if action_links %}
-
+ {% if page.actions %}
+
{% endif %}
{{ page.content }}
diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml
index 37a2c68..9713c39 100644
--- a/core/themes/bartik/bartik.info.yml
+++ b/core/themes/bartik/bartik.info.yml
@@ -21,6 +21,9 @@ regions:
page_bottom: 'Page bottom'
featured_top: 'Featured top'
breadcrumb: Breadcrumb
+ title: Title
+ tabs: Tabs
+ actions: Actions
content: Content
sidebar_first: 'Sidebar first'
sidebar_second: 'Sidebar second'
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 8380892..55009be 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -35,14 +35,9 @@
* Page content (in order of occurrence in the default page.html.twig):
* - title_prefix: Additional output populated by modules, intended to be
* displayed in front of the main title tag that appears in the template.
- * - title: The page title, for use in the actual content.
* - title_suffix: Additional output populated by modules, intended to be
* displayed after the main title tag that appears in the template.
* - messages: Status and error messages. Should be displayed prominently.
- * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
- * view and edit tabs when displaying a node).
- * - action_links: Actions local to the page, such as "Add menu" on the menu
- * administration interface.
* - node: Fully loaded node, if there is an automatically-loaded node
* associated with the page and the node ID is the second argument in the
* page's path (e.g. node/12345 and node/12345/revisions, but not
@@ -66,6 +61,9 @@
* - page.footer_fourth: Items for the fourth footer column.
* - page.footer_fifth: Items for the fifth footer column.
* - page.breadcrumb: Items for the breadcrumb region.
+ * - page.title: Items for the page title region.
+ * - page.tabs: Items for the tabs region.
+ * - page.actions: Items for the actions region.
*
* @see template_preprocess_page()
* @see bartik_preprocess_page()
@@ -128,20 +126,20 @@
{{ title_prefix }}
- {% if title %}
+ {% if page.title %}
- {{ title }}
+ {{ page.title }}
{% endif %}
{{ title_suffix }}
- {% if tabs %}
+ {% if page.tabs %}
{% endif %}
{{ page.help }}
- {% if action_links %}
-
{{ action_links }}
+ {% if page.actions %}
+
{{ page.actions }}
{% endif %}
{{ page.content }}
diff --git a/core/themes/classy/templates/system/page.html.twig b/core/themes/classy/templates/system/page.html.twig
index 627d7c7..eaaed2c 100644
--- a/core/themes/classy/templates/system/page.html.twig
+++ b/core/themes/classy/templates/system/page.html.twig
@@ -28,14 +28,9 @@
* Page content (in order of occurrence in the default page.html.twig):
* - title_prefix: Additional output populated by modules, intended to be
* displayed in front of the main title tag that appears in the template.
- * - title: The page title, for use in the actual content.
* - title_suffix: Additional output populated by modules, intended to be
* displayed after the main title tag that appears in the template.
* - messages: Status and error messages. Should be displayed prominently.
- * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
- * view and edit tabs when displaying a node).
- * - action_links: Actions local to the page, such as "Add menu" on the menu
- * administration interface.
* - node: Fully loaded node, if there is an automatically-loaded node
* associated with the page and the node ID is the second argument in the
* page's path (e.g. node/12345 and node/12345/revisions, but not
@@ -52,6 +47,9 @@
* - page.sidebar_second: Items for the second sidebar.
* - page.footer: Items for the footer region.
* - page.breadcrumb: Items for the breadcrumb region.
+ * - page.title: Items for the page title region.
+ * - page.tabs: Items for the tabs region.
+ * - page.actions: Items for the actions region.
*
* @see template_preprocess_page()
* @see html.html.twig
@@ -107,15 +105,15 @@
{{ page.highlighted }}
{{ title_prefix }}
- {% if title %}
-
{{ title }}
+ {% if page.title %}
+
{{ page.title }}
{% endif %}
{{ title_suffix }}
- {{ tabs }}
+ {{ page.tabs }}
- {% if action_links %}
-
+ {% if page.actions %}
+
{% endif %}
{{ page.content }}
diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml
index 945ceac..4c6ef7f 100644
--- a/core/themes/seven/seven.info.yml
+++ b/core/themes/seven/seven.info.yml
@@ -24,5 +24,7 @@ regions:
page_bottom: 'Page bottom'
sidebar_first: 'First sidebar'
breadcrumb: Breadcrumb
+ title: Title
+ actions: Actions
regions_hidden:
- sidebar_first
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index fc3c7d4..eac229c 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -29,14 +29,9 @@
* Page content (in order of occurrence in the default page.html.twig):
* - title_prefix: Additional output populated by modules, intended to be
* displayed in front of the main title tag that appears in the template.
- * - title: The page title, for use in the actual content.
* - title_suffix: Additional output populated by modules, intended to be
* displayed after the main title tag that appears in the template.
* - messages: Status and error messages. Should be displayed prominently.
- * - tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
- * view and edit tabs when displaying a node).
- * - action_links: Actions local to the page, such as "Add menu" on the menu
- * administration interface.
* - node: Fully loaded node, if there is an automatically-loaded node
* associated with the page and the node ID is the second argument in the
* page's path (e.g. node/12345 and node/12345/revisions, but not
@@ -51,6 +46,8 @@
* - page.sidebar_second: Items for the second sidebar.
* - page.page_bottom: Items for the footer region.
* - page.breadcrumb: Items for the breadcrumb region.
+ * - page.title: Items for the page title region.
+ * - page.actions: Items for the actions region.
*
* @see template_preprocess_page()
* @see seven_preprocess_page()
@@ -60,8 +57,8 @@