diff --git a/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php b/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php index 7efb671..0a1b6eb 100644 --- a/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php +++ b/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php @@ -72,6 +72,7 @@ function testPageCacheTags() { 'theme:bartik', 'theme_global_settings', 'block_view', + 'block:bartik_breadcrumbs', 'block:bartik_content', 'block:bartik_tools', 'block:bartik_login', @@ -79,6 +80,7 @@ function testPageCacheTags() { 'block:bartik_powered', 'block:bartik_main_menu', 'block:bartik_account_menu', + 'block_plugin:system_breadcrumb_block', 'block_plugin:system_main_block', 'block_plugin:system_menu_block__account', 'block_plugin:system_menu_block__main', @@ -102,6 +104,7 @@ function testPageCacheTags() { 'theme:bartik', 'theme_global_settings', 'block_view', + 'block:bartik_breadcrumbs', 'block:bartik_content', 'block:bartik_tools', 'block:bartik_login', @@ -110,6 +113,7 @@ function testPageCacheTags() { 'block:bartik_powered', 'block:bartik_main_menu', 'block:bartik_account_menu', + 'block_plugin:system_breadcrumb_block', 'block_plugin:system_main_block', 'block_plugin:system_menu_block__account', 'block_plugin:system_menu_block__main', diff --git a/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml index c89b728..5589c10 100644 --- a/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml +++ b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml @@ -1,9 +1,9 @@ id: bartik_breadcrumbs theme: bartik -weight: -5 -status: false +weight: 0 +status: true langcode: en -region: '-1' +region: breadcrumb plugin: system_breadcrumb_block settings: id: system_breadcrumb_block diff --git a/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml index 8ce13d8..fc95b02 100644 --- a/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml +++ b/core/profiles/standard/config/install/block.block.seven_breadcrumbs.yml @@ -1,9 +1,9 @@ id: seven_breadcrumbs theme: seven -weight: -2 -status: false +weight: 0 +status: true langcode: en -region: '-1' +region: breadcrumb plugin: system_breadcrumb_block settings: id: system_breadcrumb_block diff --git a/core/themes/bartik/bartik.info.yml b/core/themes/bartik/bartik.info.yml index cb1bcb1..dee3306 100644 --- a/core/themes/bartik/bartik.info.yml +++ b/core/themes/bartik/bartik.info.yml @@ -17,6 +17,7 @@ regions: page_top: 'Page top' page_bottom: 'Page bottom' highlighted: Highlighted + breadcrumb: Breadcrumb featured: Featured content: Content sidebar_first: 'Sidebar first' diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig index 2b34b1a..1afb7bc 100644 --- a/core/themes/bartik/templates/page.html.twig +++ b/core/themes/bartik/templates/page.html.twig @@ -32,9 +32,6 @@ * on the theme settings page. If hidden, the "visually-hidden" class is * added to make the site slogan visually hidden, but still accessible. * - * Navigation: - * - breadcrumb: The breadcrumb trail for the current page. - * * 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. @@ -69,6 +66,7 @@ * - page.footer_thirdcolumn: Items for the third footer column. * - page.footer_fourthcolumn: Items for the fourth footer column. * - page.footer: Items for the footer region. + * - page.breadcrumb: Items for the breadcrumb region. * * @see template_preprocess_page() * @see bartik_preprocess_page() @@ -130,7 +128,7 @@ {% endif %}
- {{ breadcrumb }} + {{ page.breadcrumb }}
{% if page.highlighted %}
{{ page.highlighted }}
{% endif %} diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml index fdf916e..58cbe39 100644 --- a/core/themes/seven/seven.info.yml +++ b/core/themes/seven/seven.info.yml @@ -23,5 +23,6 @@ regions: page_top: 'Page top' page_bottom: 'Page bottom' sidebar_first: 'First sidebar' + breadcrumb: breadcrumb regions_hidden: - sidebar_first diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig index b2cc0bf..606efa5 100644 --- a/core/themes/seven/templates/page.html.twig +++ b/core/themes/seven/templates/page.html.twig @@ -26,9 +26,6 @@ * - site_slogan: The slogan of the site. This is empty when displaying the site * slogan has been disabled in theme settings. * - * Navigation: - * - breadcrumb: The breadcrumb trail for the current page. - * * 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. @@ -77,7 +74,7 @@ {% endif %} - {{ breadcrumb }} + {{ page.breadcrumb }}