commit 937784309a15a84328d19c8162e869fe66c839de Author: Joel Pittet Date: Thu Mar 21 19:54:01 2013 -0700 clean-up 1898436-7 diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module index 13348a5..0c3b6ed 100644 --- a/core/modules/overlay/overlay.module +++ b/core/modules/overlay/overlay.module @@ -440,44 +440,6 @@ function overlay_disable_message() { } /** - * Returns the HTML for the message about how to disable the overlay. - * - * @param $variables - * An associative array with an 'element' element, which itself is an - * associative array containing: - * - profile_link: The link to this user's account. - * - dismiss_message_link: The link to dismiss the overlay. - * - * @ingroup themeable - */ -function theme_overlay_disable_message($variables) { - $element = $variables['element']; - - // Add CSS classes to hide the links from most sighted users, while keeping - // them accessible to screen-reader users and keyboard-only users. To assist - // screen-reader users, this message appears in both the parent and child - // documents, but only the one in the child document is part of the tab order. - foreach (array('profile_link', 'dismiss_message_link') as $key) { - $element[$key]['#options']['attributes']['class'][] = 'element-invisible'; - if (overlay_get_mode() == 'child') { - $element[$key]['#options']['attributes']['class'][] = 'element-focusable'; - } - } - - // Render the links. - $output = drupal_render($element['profile_link']) . ' ' . drupal_render($element['dismiss_message_link']); - - // Add a heading for screen-reader users. The heading doesn't need to be seen - // by sighted users. - $output = '

' . t('Options for the administrative overlay') . '

' . $output; - - // Wrap in a container for styling. - $output = '
' . $output . '
'; - - return $output; -} - -/** * Implements hook_block_access(). */ function overlay_block_access($block) { @@ -573,8 +535,8 @@ function template_preprocess_overlay_disable_message(&$variables) { } // Render the links. - $variables['profile_link'] = drupal_render($element['profile_link']); - $variables['dismiss_link'] = drupal_render($element['dismiss_message_link']); + $variables['profile_link'] = $element['profile_link']; + $variables['dismiss_link'] = $element['dismiss_message_link']; } /** diff --git a/core/modules/overlay/templates/overlay.html.twig b/core/modules/overlay/templates/overlay.html.twig index ac205f3..e86ecd6 100644 --- a/core/modules/overlay/templates/overlay.html.twig +++ b/core/modules/overlay/templates/overlay.html.twig @@ -22,14 +22,13 @@

{{ title }}

- {{ 'Close overlay' | t }} + {{ 'Close overlay'|t }}
{% if tabs %} -

{{ 'Primary tabs' | t }}

+

{{ 'Primary tabs'|t }}

{% endif %}
{{ page }}
-