diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 336f84b..8042c7c 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -2975,6 +2975,8 @@ function _system_rebuild_theme_data() { $defaults = array( 'engine' => 'phptemplate', 'regions' => array( + 'account' => 'Account links', + 'main_menu' => 'Main navigation', 'sidebar_first' => 'Left sidebar', 'sidebar_second' => 'Right sidebar', 'content' => 'Content', diff --git a/core/modules/system/templates/page.tpl.php b/core/modules/system/templates/page.tpl.php index 6ddeeed..fd6e3cc 100644 --- a/core/modules/system/templates/page.tpl.php +++ b/core/modules/system/templates/page.tpl.php @@ -29,10 +29,6 @@ * in theme settings. * * Navigation: - * - $main_menu (array): An array containing the Main menu links for the - * site, if they have been configured. - * - $secondary_menu (array): An array containing the Secondary menu links for - * the site, if they have been configured. * - $breadcrumb: The breadcrumb trail for the current page. * * Page content (in order of occurrence in the default page.tpl.php): @@ -56,6 +52,8 @@ * comment/reply/12345). * * Regions: + * - $page['account']: Items for the account region. + * - $page['main_menu']: Items for the main menu region. * - $page['help']: Dynamic help text, mostly for admin pages. * - $page['highlighted']: Items for the highlighted content region. * - $page['content']: The main content of the current page. @@ -102,14 +100,18 @@ + + + - + diff --git a/core/profiles/standard/config/block.block.bartik.secondary_navigation.yml b/core/profiles/standard/config/block.block.bartik.secondary_navigation.yml index 166ef31..505e907 100644 --- a/core/profiles/standard/config/block.block.bartik.secondary_navigation.yml +++ b/core/profiles/standard/config/block.block.bartik.secondary_navigation.yml @@ -1,7 +1,7 @@ id: bartik.secondary_navigation label: 'Secondary navigation' uuid: 1ec67be5-c7b2-4769-ba08-8c17ca65f99e -region: preheader +region: account weight: '' module: menu status: '1' diff --git a/core/themes/bartik/bartik.info b/core/themes/bartik/bartik.info index b4bbc9b..acdc4d0 100644 --- a/core/themes/bartik/bartik.info +++ b/core/themes/bartik/bartik.info @@ -9,7 +9,7 @@ stylesheets[all][] = css/style.css stylesheets[all][] = css/colors.css stylesheets[print][] = css/print.css -regions[preheader] = Preheader +regions[account] = Account links regions[header] = Header regions[main_menu] = Main menu regions[help] = Help diff --git a/core/themes/bartik/templates/page.tpl.php b/core/themes/bartik/templates/page.tpl.php index e802058..6eab79f 100644 --- a/core/themes/bartik/templates/page.tpl.php +++ b/core/themes/bartik/templates/page.tpl.php @@ -59,7 +59,9 @@ * comment/reply/12345). * * Regions: + * - $page['account']: Items for the account region. * - $page['header']: Items for the header region. + * - $page['main_menu']: Items for the main menu region. * - $page['featured']: Items for the featured region. * - $page['highlighted']: Items for the highlighted content region. * - $page['help']: Dynamic help text, mostly for admin pages. @@ -86,7 +88,7 @@