');
+ $this->drupalGet('');
// For a logged-out user, expect no secondary links.
$element = $this->xpath('//ul[@id=:menu_id]', array(':menu_id' => 'secondary-menu'));
$this->assertEqual(count($element), 0, 'No secondary-menu for logged-out users.');
+ // The wrapping list should not appear either.
+ $settings = $this->block->get('settings');
+ $this->assertNoRaw($settings['id']);
+ // The entire menu block should not appear either.
+ $this->assertNoRaw(check_plain($this->block->label()));
}
/**
diff --git a/core/profiles/standard/config/block.block.bartik.primary_navigation.yml b/core/profiles/standard/config/block.block.bartik.primary_navigation.yml
new file mode 100644
index 0000000..f26532a
--- /dev/null
+++ b/core/profiles/standard/config/block.block.bartik.primary_navigation.yml
@@ -0,0 +1,11 @@
+id: bartik.primary_navigation
+label: 'Primary Navigation'
+region: main_menu
+weight: ''
+module: menu
+status: '1'
+plugin: menu_navigation
+settings:
+ menu: main
+ level: '0'
+ subject: 'Menu Navigation'
diff --git a/core/profiles/standard/config/block.block.bartik.secondary_navigation.yml b/core/profiles/standard/config/block.block.bartik.secondary_navigation.yml
new file mode 100644
index 0000000..1f3b5fc
--- /dev/null
+++ b/core/profiles/standard/config/block.block.bartik.secondary_navigation.yml
@@ -0,0 +1,12 @@
+id: bartik.secondary_navigation
+label: 'Secondary navigation'
+region: account
+weight: ''
+module: menu
+status: '1'
+plugin: menu_navigation
+settings:
+ menu: account
+ level: '0'
+ id: secondary-menu
+ subject: 'Menu Navigation'
diff --git a/core/themes/bartik/bartik.info b/core/themes/bartik/bartik.info
index c0c206d..acdc4d0 100644
--- a/core/themes/bartik/bartik.info
+++ b/core/themes/bartik/bartik.info
@@ -9,7 +9,9 @@ stylesheets[all][] = css/style.css
stylesheets[all][] = css/colors.css
stylesheets[print][] = css/print.css
+regions[account] = Account links
regions[header] = Header
+regions[main_menu] = Main menu
regions[help] = Help
regions[page_top] = Page top
regions[page_bottom] = Page bottom
diff --git a/core/themes/bartik/template.php b/core/themes/bartik/template.php
index 9a6c8a9..a0a33d1 100644
--- a/core/themes/bartik/template.php
+++ b/core/themes/bartik/template.php
@@ -151,3 +151,39 @@ function bartik_field__taxonomy_term_reference($variables) {
return $output;
}
+
+/**
+ * Implement hook_block_view_alter().
+ */
+function bartik_block_view_alter(&$build, $block) {
+ if ($block->get('id') == 'bartik.primary_navigation') {
+ $build['#block_config']['subject'] = '';
+ $build['#prefix'] = '';
+ $build['#theme'] = 'links__system_main_menu';
+ $build['#attributes'] = array(
+ 'id' => 'main-menu-links',
+ 'class' => array('links', 'clearfix'),
+ );
+ $build['#heading'] = array(
+ 'text' => t('Main menu'),
+ 'level' => 'h2',
+ 'class' => array('element-invisible'),
+ );
+ $build['#suffix'] = '
';
+ }
+ if ($block->get('id') == 'bartik.secondary_navigation') {
+ $build['#block_config']['subject'] = '';
+ $build['#prefix'] = ' ';
+ }
+}
diff --git a/core/themes/bartik/templates/page.tpl.php b/core/themes/bartik/templates/page.tpl.php
index 6f78e85..6eab79f 100644
--- a/core/themes/bartik/templates/page.tpl.php
+++ b/core/themes/bartik/templates/page.tpl.php
@@ -36,10 +36,6 @@
* make the site slogan visually hidden, but still accessible.
*
* 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):
@@ -63,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.
@@ -89,23 +87,8 @@
?>