');
@@ -87,8 +89,10 @@ var openItem = JSON.parse(localStorage.getItem('Drupal.toolbar.menu.openItem'));
$menu.find('li').each(function (index, element) {
var $item = $(element);
if ($item.find('> ul.menu').length) {
+ var $box = $item.find('> .box');
+ options.text = Drupal.t('@label', {'@label': $box.find('a').text()});
$item.find('> .box')
- .prepend(Drupal.theme('toolbarMenuItemToggle', options));
+ .append(Drupal.theme('toolbarMenuItemToggle', options));
}
});
}
@@ -160,7 +164,7 @@ var openItem = JSON.parse(localStorage.getItem('Drupal.toolbar.menu.openItem'));
* A string representing a DOM fragment.
*/
Drupal.theme.toolbarMenuItemToggle = function (options) {
- return '
';
+ return '
';
};
}(jQuery, Drupal));
diff --git a/core/modules/toolbar/templates/toolbar.twig b/core/modules/toolbar/templates/toolbar.twig
index 84fb641..c2181df 100644
--- a/core/modules/toolbar/templates/toolbar.twig
+++ b/core/modules/toolbar/templates/toolbar.twig
@@ -23,18 +23,17 @@
*/
#}
-
+
+
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 71338a9..60fac4f 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -49,10 +49,10 @@ function toolbar_theme($existing, $type, $theme, $path) {
/**
* Implements hook_page_build().
*
- * Add admin toolbar to the page_bottom region automatically.
+ * Add admin toolbar to the page_top region automatically.
*/
function toolbar_page_build(&$page) {
- $page['page_bottom']['toolbar'] = array(
+ $page['page_top']['toolbar'] = array(
'#pre_render' => array('toolbar_pre_render'),
'#access' => user_access('access toolbar'),
);
@@ -91,12 +91,17 @@ function template_preprocess_toolbar(&$variables) {
// Place the tabs in a top-level variable so that attribute information
// can be associated with each one.
foreach ($variables['toolbar']['trays'] as $key => $tray) {
+ // Create tray heading text. Prefer the provided heading text if it exists.
+ $heading = isset($tray['#heading']) ? $tray['#heading'] : t('@group actions', array('@group' => $key));
+
$variables['trays'][$key] = array(
+ 'heading' => $heading,
'content' => $variables['toolbar']['trays'][$key],
'attributes' => new Attribute(array(
'id' => 'toolbar-tray-' . $key,
'class' => array('tray', 'overlay-displace-top', $key),
'data-toolbar-tray' => $key,
+ 'aria-owned-by' => 'toolbar-tab-' . $key,
)
),
);
@@ -106,7 +111,7 @@ function template_preprocess_toolbar(&$variables) {
/**
* Implements hook_system_info_alter().
*
- * Indicate that the 'page_bottom' region (in which the toolbar will be displayed)
+ * Indicate that the 'page_top' region (in which the toolbar will be displayed)
* is an overlay supplemental region that should be refreshed whenever its
* content is updated.
*
@@ -115,7 +120,7 @@ function template_preprocess_toolbar(&$variables) {
*/
function toolbar_system_info_alter(&$info, $file, $type) {
if ($type == 'theme') {
- $info['overlay_supplemental_regions'][] = 'page_bottom';
+ $info['overlay_supplemental_regions'][] = 'page_top';
}
}
@@ -145,13 +150,15 @@ function toolbar_toolbar() {
// Add attributes to the links before rendering.
toolbar_menu_navigation_links($tree);
- $menu = array();
- $menu['toolbar_administration'] = array(
- '#type' => 'container',
- '#attributes' => array(
- 'class' => array('toolbar-menu',),
+ $menu = array(
+ 'toolbar_administration' => array(
+ '#type' => 'container',
+ '#attributes' => array(
+ 'class' => array('toolbar-menu',),
+ ),
+ 'administration_menu' => menu_tree_output($tree),
),
- 'administration_menu' => menu_tree_output($tree),
+ '#heading' => t('Administration menu'),
);
$items['administration'] = array(
@@ -229,19 +236,19 @@ function($object) {return $object->mediaQuery;},
foreach ($toolbar_groups as $group => $items) {
if ($tab = $items['tab']) {
-
// Merge in the defaults.
$tab += $tab_defaults;
-
- // Provide a data attribute linking each tab to the corresponding tray.
- // Unlike the defaults above, these properties may override values.
+ }
+ // Register a tray if one is associated with this tab.
+ if (!empty($items['tray'])) {
+ // Provide an id, a data attribute linking each tab to the corresponding
+ // tray and aria information.
+ $tab['attributes']['id'] = 'toolbar-tab-' . $group;
$tab['attributes']['data-toolbar-tray'] = $group;
+ $tab['attributes']['aria-owns'] = 'toolbar-tray-' . $group;
$tab['attributes']['role'] = 'button';
+ $tab['attributes']['aria-pressed'] = 'false';
- // Assign the tabs to the build.
- $build['tabs']['#links'][$group] = $tab;
- }
- if (!empty($items['tray'])) {
if (array_key_exists($group, $build['trays'])) {
array_merge($build['trays'][$group], $items['tray']);
}
@@ -250,6 +257,8 @@ function($object) {return $object->mediaQuery;},
$build['trays'][$group] = $items['tray'];
}
}
+ // Assign the tabs to the build.
+ $build['tabs']['#links'][$group] = $tab;
}
return $build;
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 3d4e748..d576afc 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -3132,12 +3132,14 @@ function user_toolbar() {
}
$user_tray = array(
- '#theme' => 'links__toolbar_user',
- '#links' => $links,
- '#attributes' => array(
- 'class' => array('menu'),
+ '#heading' => t('User account actions'),
+ 'content' => array(
+ '#theme' => 'links__toolbar_user',
+ '#links' => $links,
+ '#attributes' => array(
+ 'class' => array('menu',),
+ ),
),
- '#heading' => array('text' => t('User account actions'), 'level' => 'h2', 'class' => 'element-invisible'),
);
$items['user'] = array(