Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#961292 by yoroy: 'Close the drawer' needs a better title for screen readers

merge-requests/26/head
Angie Byron 2010-12-01 07:05:26 +00:00
parent 35dfb42fa6
commit 5afa4e1852
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/toolbar/toolbar.js
View File

@ -42,7 +42,7 @@ Drupal.toolbar.init = function() {
* Collapse the toolbar. * Collapse the toolbar.
*/ */
Drupal.toolbar.collapse = function() { Drupal.toolbar.collapse = function() {
var toggle_text = Drupal.t('Open the drawer'); var toggle_text = Drupal.t('Show shortcuts');
$('#toolbar div.toolbar-drawer').addClass('collapsed'); $('#toolbar div.toolbar-drawer').addClass('collapsed');
$('#toolbar a.toggle') $('#toolbar a.toggle')
.removeClass('toggle-active') .removeClass('toggle-active')
@ -64,7 +64,7 @@ Drupal.toolbar.collapse = function() {
* Expand the toolbar. * Expand the toolbar.
*/ */
Drupal.toolbar.expand = function() { Drupal.toolbar.expand = function() {
var toggle_text = Drupal.t('Close the drawer'); var toggle_text = Drupal.t('Hide shortcuts');
$('#toolbar div.toolbar-drawer').removeClass('collapsed'); $('#toolbar div.toolbar-drawer').removeClass('collapsed');
$('#toolbar a.toggle') $('#toolbar a.toggle')
.addClass('toggle-active') .addClass('toggle-active')

6
modules/toolbar/toolbar.module
View File

@ -17,7 +17,7 @@ function toolbar_help($path, $arg) {
$output .= '<h3>' . t('Uses') . '</h3>'; $output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>'; $output .= '<dl>';
$output .= '<dt>' . t('Displaying administrative links') . '</dt>'; $output .= '<dt>' . t('Displaying administrative links') . '</dt>';
$output .= '<dd>' . t('The Toolbar module displays a bar containing top-level administrative links across the top of the screen. Below that, the Toolbar module has a <em>drawer</em> section where it displays links provided by other modules, such as the core <a href="@shortcuts-help">Shortcut module</a>. The drawer can be hidden/shown by using the close/open drawer link at the end of the toolbar.', array('@shortcuts-help' => url('admin/help/shortcut'))) . '</dd>'; $output .= '<dd>' . t('The Toolbar module displays a bar containing top-level administrative links across the top of the screen. Below that, the Toolbar module has a <em>drawer</em> section where it displays links provided by other modules, such as the core <a href="@shortcuts-help">Shortcut module</a>. The drawer can be hidden/shown by using the show/hide shortcuts link at the end of the toolbar.', array('@shortcuts-help' => url('admin/help/shortcut'))) . '</dd>';
$output .= '</dl>'; $output .= '</dl>';
return $output; return $output;
} }
@ -90,11 +90,11 @@ function toolbar_toggle_page() {
*/ */
function theme_toolbar_toggle($variables) { function theme_toolbar_toggle($variables) {
if ($variables['collapsed']) { if ($variables['collapsed']) {
$toggle_text = t('Open the drawer'); $toggle_text = t('Show shortcuts');
return '<a href="' . url('toolbar/toggle', array('query' => drupal_get_destination())) . '" title="' . $toggle_text . '"' . drupal_attributes($variables['attributes']) . '>' . $toggle_text . '</a>'; return '<a href="' . url('toolbar/toggle', array('query' => drupal_get_destination())) . '" title="' . $toggle_text . '"' . drupal_attributes($variables['attributes']) . '>' . $toggle_text . '</a>';
} }
else { else {
$toggle_text = t('Close the drawer'); $toggle_text = t('Hide shortcuts');
$variables['attributes']['class'][] = 'toggle-active'; $variables['attributes']['class'][] = 'toggle-active';
return '<a href="' . url('toolbar/toggle', array('query' => drupal_get_destination())) . '" title="' . $toggle_text . '"' . drupal_attributes($variables['attributes']) . '>' . $toggle_text . '</a>'; return '<a href="' . url('toolbar/toggle', array('query' => drupal_get_destination())) . '" title="' . $toggle_text . '"' . drupal_attributes($variables['attributes']) . '>' . $toggle_text . '</a>';
} }