diff --git a/core/modules/block/tests/themes/block_test_theme/block_test_theme.info.yml b/core/modules/block/tests/themes/block_test_theme/block_test_theme.info.yml index c19cbf5..6057fb5 100644 --- a/core/modules/block/tests/themes/block_test_theme/block_test_theme.info.yml +++ b/core/modules/block/tests/themes/block_test_theme/block_test_theme.info.yml @@ -10,6 +10,8 @@ regions: footer: Footer highlighted: Highlighted help: Help + main_menu: Main Menu + account: Account regions_hidden: - sidebar_first - sidebar_second diff --git a/core/modules/menu/lib/Drupal/menu/Plugin/block/block/MenuNavigation.php b/core/modules/menu/lib/Drupal/menu/Plugin/block/block/MenuNavigation.php index a641abf..f3edd28 100644 --- a/core/modules/menu/lib/Drupal/menu/Plugin/block/block/MenuNavigation.php +++ b/core/modules/menu/lib/Drupal/menu/Plugin/block/block/MenuNavigation.php @@ -16,7 +16,7 @@ * * @Plugin( * id = "menu_navigation", - * subject = @Translation("Menu navigation"), + * admin_label = @Translation("Menu navigation"), * module = "menu" * ) */ diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index d13655e..ac103e6 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -18,6 +18,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Drupal\menu_link\Plugin\Core\Entity\MenuLink; use Drupal\menu_link\MenuLinkStorageController; +use Drupal\menu\Plugin\block\block\MenuNavigation; /** * Maximum length of menu name as entered by the user. Database length is 32 @@ -720,6 +721,12 @@ function menu_preprocess_block(&$variables) { if ($variables['block']->module == 'menu') { $variables['attributes']['role'] = 'navigation'; } + if ($variables['block']->id == 'menu_navigation') { + $variables['attributes']['class'][] = 'links'; + $variables['attributes']['class'][] = 'inline'; + $variables['attributes']['class'][] = 'clearfix'; + $variables['title_attributes']['class'][] = 'element-invisible'; + } } /** diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php index 9e85386..27da925 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php @@ -77,7 +77,6 @@ function testUserPasswordReset() { $this->account->session_id = $this->session_id; } $this->assertUserIsLoggedIn($this->account); - $this->assertLink(t('Log out')); $this->assertTitle(t('@name | @site', array('@name' => $this->account->name, '@site' => config('system.site')->get('name'))), 'Logged in using password reset link.'); // Log out, and try to log in again using the same one-time link. diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install index a0594b0..2dad891 100644 --- a/core/profiles/standard/standard.install +++ b/core/profiles/standard/standard.install @@ -3,6 +3,7 @@ * @file * Install, update and uninstall functions for the standard installation profile. */ +use Drupal\Component\Uuid\Uuid; /** * Implements hook_install(). @@ -265,3 +266,51 @@ function standard_install() { config('system.theme')->set('admin', 'seven')->save(); variable_set('node_admin_theme', '1'); } + +/** + * Place and create the main menu and secondary links menu navigation blocks. + * + * @ingroup config_upgrade + */ +function standard_update_8000() { + // Place main-menu. + $block = config('block.block.bartik.main_menu'); + $uuid = new UUID(); + $block + ->set('id', 'bartik.main_menu') + ->set('uuid', $uuid->generate()) + ->set('plugin', 'menu_navigation') + ->set('module', 'menu') + ->set('region', 'main_menu') + ->set('weight', 0) + ->set('status', 1) + ->set('visibility', array()) + ->set('label', 'Main menu') + ->set('settings', array( + 'menu' => 'main', + 'level' => 0, + 'id' => 'main-menu', + 'subject' => 'Menu Navigation', + )); + $block->save(); + // Place secondary-menu (account links). + $block = config('block.block.bartik.account_links'); + $uuid = new UUID(); + $block + ->set('id', 'bartik.account_links') + ->set('uuid', $uuid->generate()) + ->set('plugin', 'menu_navigation') + ->set('module', 'menu') + ->set('region', 'account') + ->set('weight', 0) + ->set('status', 1) + ->set('visibility', array()) + ->set('label', 'Account links') + ->set('settings', array( + 'menu' => 'account', + 'level' => 0, + 'id' => 'secondary-menu', + 'subject' => 'Menu Navigation', + )); + $block->save(); +} diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme index 0f07e5a..df07ed2 100644 --- a/core/themes/bartik/bartik.theme +++ b/core/themes/bartik/bartik.theme @@ -159,13 +159,10 @@ function bartik_field__taxonomy_term_reference($variables) { */ function bartik_block_view_alter(array &$build, Block $block) { if ($block->id() == 'bartik.main_menu') { - $build['#prefix'] = ''; + $build['#prefix'] = ''; $build['#theme'] = 'links__system_main_menu'; - $build['#attributes'] = array( - 'id' => 'main-menu-links', - 'class' => array('links', 'clearfix'), - ); + $build['content']['#attributes']['id'] = 'main-menu-links'; $build['#heading'] = array( 'text' => t('Main menu'), 'level' => 'h2', @@ -173,13 +170,11 @@ function bartik_block_view_alter(array &$build, Block $block) { ); } if ($block->id() == 'bartik.account_links') { - $build['#prefix'] = ''; + $build['#prefix'] = ''; $build['#theme'] = 'links__system_secondary_menu'; - $build['#attributes'] = array( - 'id' => 'secondary-menu-links', - 'class' => array('links', 'inline', 'clearfix'), - ); + $build['content']['#attributes']['id'] = 'secondary-menu-links'; + $build['content']['#attributes']['class'][] = 'inline'; $build['#heading'] = array( 'text' => t('Secondary menu'), 'level' => 'h2',