diff --git a/core/includes/form.inc b/core/includes/form.inc index c1d48e3..50c816e 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -3684,7 +3684,7 @@ function theme_vertical_tabs($variables) { // Add required JavaScript and Stylesheet. drupal_add_library('system', 'drupal.vertical-tabs'); - $output = '

' . t('Vertical Tabs') . '

'; + $output = ''; $output .= '
' . $element['#children'] . '
'; return $output; } @@ -4243,7 +4243,7 @@ function theme_form_element_label($variables) { } // Show label only to screen readers to avoid disruption in visual flows. elseif ($element['#title_display'] == 'invisible') { - $attributes['class'] = 'element-invisible'; + $attributes['class'] = 'invisible'; } if (!empty($element['#id'])) { diff --git a/core/includes/menu.inc b/core/includes/menu.inc index 2121619..63b901d 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -1635,7 +1635,7 @@ function theme_menu_local_task($variables) { if (!empty($variables['element']['#active'])) { // Add text to indicate active tab for non-visual users. - $active = '' . t('(active tab)') . ''; + $active = ''; // If the link does not contain HTML already, check_plain() it now. // After we set 'html'=TRUE the link will not be sanitized by l(). @@ -2236,13 +2236,13 @@ function theme_menu_local_tasks(&$variables) { $output = ''; if (!empty($variables['primary'])) { - $variables['primary']['#prefix'] = '

' . t('Primary tabs') . '

'; + $variables['primary']['#prefix'] = ''; $variables['primary']['#prefix'] .= ''; $output .= drupal_render($variables['primary']); } if (!empty($variables['secondary'])) { - $variables['secondary']['#prefix'] = '

' . t('Secondary tabs') . '

'; + $variables['secondary']['#prefix'] = ''; $variables['secondary']['#prefix'] .= ''; $output .= drupal_render($variables['secondary']); diff --git a/core/includes/pager.inc b/core/includes/pager.inc index c579e7e..d0d905a 100644 --- a/core/includes/pager.inc +++ b/core/includes/pager.inc @@ -422,7 +422,7 @@ function theme_pager($variables) { 'data' => $li_last, ); } - return '

' . t('Pages') . '

' . theme('item_list', array( + return '' . theme('item_list', array( 'items' => $items, 'attributes' => array('class' => array('pager')), )); diff --git a/core/includes/theme.inc b/core/includes/theme.inc index d044f06..6d8ff75 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1609,7 +1609,7 @@ function theme_status_messages($variables) { foreach (drupal_get_messages($display) as $type => $messages) { $output .= "
\n"; if (!empty($status_heading[$type])) { - $output .= '

' . $status_heading[$type] . "

\n"; + $output .= '\n"; } if (count($messages) > 1) { $output .= "
diff --git a/core/modules/forum/forum-list.tpl.php b/core/modules/forum/forum-list.tpl.php index 257cea9..76b208c 100644 --- a/core/modules/forum/forum-list.tpl.php +++ b/core/modules/forum/forum-list.tpl.php @@ -51,7 +51,7 @@ */ ?> ', $forum->depth); ?>
- icon_title; ?> +
name; ?>
description): ?> diff --git a/core/modules/node/node.module b/core/modules/node/node.module index be60e48..3682f4e 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -1431,7 +1431,7 @@ function node_build_content($node, $view_mode = 'full', $langcode = NULL) { if ($view_mode == 'teaser') { $node_title_stripped = strip_tags($node->title); $links['node-readmore'] = array( - 'title' => t('Read more about @title', array('@title' => $node_title_stripped)), + 'title' => t('Read more', array('@title' => $node_title_stripped)), 'href' => 'node/' . $node->nid, 'html' => TRUE, 'attributes' => array('rel' => 'tag', 'title' => $node_title_stripped), diff --git a/core/modules/node/node.test b/core/modules/node/node.test index 1dbcaf3..263557b 100644 --- a/core/modules/node/node.test +++ b/core/modules/node/node.test @@ -326,7 +326,7 @@ class PageEditTestCase extends NodeWebTestCase { $this->assertEqual($edit_url, $actual_url, t('On edit page.')); // Check that the title and body fields are displayed with the correct values. - $active = '' . t('(active tab)') . ''; + $active = ''; $link_text = t('!local-task-title!active', array('!local-task-title' => t('Edit'), '!active' => $active)); $this->assertText(strip_tags($link_text), 0, t('Edit tab found and marked active.')); $this->assertFieldByName($title_key, $edit[$title_key], t('Title field displayed.')); diff --git a/core/modules/overlay/overlay-child.js b/core/modules/overlay/overlay-child.js index 9096db7..7ad4527 100644 --- a/core/modules/overlay/overlay-child.js +++ b/core/modules/overlay/overlay-child.js @@ -62,11 +62,11 @@ Drupal.behaviors.overlayChild = { $('#overlay-disable-message', context) .focusin(function () { $(this).addClass('overlay-disable-message-focused'); - $('a.element-focusable', this).removeClass('element-invisible'); + $('a.focusable', this).removeClass('invisible'); }) .focusout(function () { $(this).removeClass('overlay-disable-message-focused'); - $('a.element-focusable', this).addClass('element-invisible'); + $('a.focusable', this).addClass('invisible'); }); } }; @@ -150,7 +150,7 @@ Drupal.overlayChild.behaviors.tabs = function (context, settings) { $('#overlay-tabs > li > a').bind('click.drupal-overlay', function () { var active_tab = Drupal.t('(active tab)'); - $tabsLinks.parent().siblings().removeClass('active').find('element-invisible:contains(' + active_tab + ')').appendTo(this); + $tabsLinks.parent().siblings().removeClass('active').find('invisible:contains(' + active_tab + ')').appendTo(this); $(this).parent().addClass('active'); }); }; diff --git a/core/modules/overlay/overlay-parent.css b/core/modules/overlay/overlay-parent.css index dad6d55..9845f98 100644 --- a/core/modules/overlay/overlay-parent.css +++ b/core/modules/overlay/overlay-parent.css @@ -37,10 +37,10 @@ html.overlay-open .displace-bottom { /** * Within the overlay parent, the message about disabling the overlay is for - * screen-reader users only. It is always kept invisible with the - * element-invisible class, and removed from the tab order. Overlay-child.css - * contains styling for the same message appearing within the overlay, and - * intended for sighted users. + * screen-reader users only. It is always kept invisible with the invisible + * class, and removed from the tab order. overlay-child.css contains styling for + * the same message appearing within the overlay, and intended for sighted + * users. */ #overlay-disable-message { display: none; diff --git a/core/modules/overlay/overlay-parent.js b/core/modules/overlay/overlay-parent.js index 19d2d64..23cc055 100644 --- a/core/modules/overlay/overlay-parent.js +++ b/core/modules/overlay/overlay-parent.js @@ -324,7 +324,7 @@ Drupal.overlay.loadChild = function (event) { Drupal.overlay.setFocusBefore = function ($element, document) { // Create an anchor inside the placeholder document. var placeholder = document.createElement('a'); - var $placeholder = $(placeholder).addClass('element-invisible').attr('href', '#'); + var $placeholder = $(placeholder).addClass('invisible').attr('href', '#'); // Put the placeholder where it belongs, and set the document focus to it. $placeholder.insertBefore($element); $placeholder.focus(); diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module index 58dcbab..108a641 100644 --- a/core/modules/overlay/overlay.module +++ b/core/modules/overlay/overlay.module @@ -392,9 +392,9 @@ function theme_overlay_disable_message($variables) { // 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'; + $element[$key]['#options']['attributes']['class'][] = 'invisible'; if (overlay_get_mode() == 'child') { - $element[$key]['#options']['attributes']['class'][] = 'element-focusable'; + $element[$key]['#options']['attributes']['class'][] = 'focusable'; } } @@ -403,7 +403,7 @@ function theme_overlay_disable_message($variables) { // 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; + $output = '' . $output; // Wrap in a container for styling. $output = '
' . $output . '
'; diff --git a/core/modules/overlay/overlay.tpl.php b/core/modules/overlay/overlay.tpl.php index 54b10af..0dd2719 100644 --- a/core/modules/overlay/overlay.tpl.php +++ b/core/modules/overlay/overlay.tpl.php @@ -27,9 +27,9 @@

>

- +
-

+
> diff --git a/core/modules/simpletest/tests/form.test b/core/modules/simpletest/tests/form.test index 3946374..ff6a882 100644 --- a/core/modules/simpletest/tests/form.test +++ b/core/modules/simpletest/tests/form.test @@ -715,8 +715,8 @@ class FormsElementsLabelsTestCase extends DrupalWebTestCase { $elements = $this->xpath('//input[@id="edit-form-textfield-test-no-title-required"]/preceding-sibling::label[@for="edit-form-textfield-test-no-title-required"]/abbr[@class="form-required"]'); $this->assertTrue(isset($elements[0]), t("Label tag with required marker precedes required textfield with no title.")); - $elements = $this->xpath('//input[@id="edit-form-textfield-test-title-invisible"]/preceding-sibling::label[@for="edit-form-textfield-test-title-invisible" and @class="element-invisible"]'); - $this->assertTrue(isset($elements[0]), t("Label preceding field and label class is element-invisible.")); + $elements = $this->xpath('//input[@id="edit-form-textfield-test-title-invisible"]/preceding-sibling::label[@for="edit-form-textfield-test-title-invisible" and @class="invisible"]'); + $this->assertTrue(isset($elements[0]), t("Label preceding field and label class is invisible.")); $elements = $this->xpath('//input[@id="edit-form-textfield-test-title"]/preceding-sibling::abbr[@class="form-required"]'); $this->assertFalse(isset($elements[0]), t("No required marker on non-required field.")); diff --git a/core/modules/system/html.tpl.php b/core/modules/system/html.tpl.php index 960eefb..18ff966 100644 --- a/core/modules/system/html.tpl.php +++ b/core/modules/system/html.tpl.php @@ -49,7 +49,7 @@ > diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 978b0f4..5ffed47 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -1501,7 +1501,7 @@ function system_site_information_settings() { '#default_value' => variable_get('default_nodes_main', 10), '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), '#description' => t('The maximum number of posts displayed on overview pages such as the front page.'), - '#access' => (variable_get('site_frontpage') == 'node'), + '#access' => (variable_get('site_frontpage')=='node'), ); $form['error_page'] = array( '#type' => 'fieldset', @@ -2568,7 +2568,7 @@ function theme_status_report($variables) { foreach ($requirements as $requirement) { if (empty($requirement['#type'])) { $severity = $severities[isset($requirement['severity']) ? (int) $requirement['severity'] : 0]; - $severity['icon'] = '
' . $severity['title'] . '
'; + $severity['icon'] = '
'; // Output table row(s) if (!empty($requirement['description'])) { diff --git a/core/modules/system/system.base.css b/core/modules/system/system.base.css index 68a1683..81f409a 100644 --- a/core/modules/system/system.base.css +++ b/core/modules/system/system.base.css @@ -220,7 +220,7 @@ tr .ajax-progress-throbber .throbber { * from a user. The effect of this class can be toggled with the jQuery show() * and hide() functions. */ -.element-hidden { +.hidden { display: none; } @@ -232,17 +232,17 @@ tr .ajax-progress-throbber .throbber { * manner should be kept concise, to avoid unnecessary burden on the user. * "!important" is used to prevent unintentional overrides. */ -.element-invisible { +.invisible { position: absolute !important; clip: rect(1px, 1px, 1px, 1px); } /** - * The .element-focusable class extends the .element-invisible class to allow - * the element to be focusable when navigated to via the keyboard. + * The .focusable class extends the .invisible class to allow the element to be + * focusable when navigated to via the keyboard. */ -.element-invisible.element-focusable:active, -.element-invisible.element-focusable:focus { +.invisible.focusable:active, +.invisible.focusable:focus { position: static !important; clip: auto; } diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index e2bff73..a6595cb 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -212,7 +212,7 @@ function toolbar_view() { '#theme' => 'links__toolbar_menu', '#links' => $links, '#attributes' => array('id' => 'toolbar-menu'), - '#heading' => array('text' => t('Administrative toolbar'), 'level' => 'h2', 'class' => 'element-invisible'), + '#heading' => array('text' => t('Administrative toolbar'), 'level' => 'h2', 'class' => 'invisible'), ); // Add logout & user account links or login link. @@ -324,7 +324,7 @@ function toolbar_menu_navigation_links($tree) { // Add admin link ID. $link['attributes'] = array('id' => 'toolbar-link-' . $id); if (!empty($item['link']['description'])) { - $link['title'] .= ' (' . $item['link']['description'] . ')'; + $link['title'] .= ' '; $link['attributes']['title'] = $item['link']['description']; } $link['html'] = TRUE; diff --git a/core/themes/bartik/template.php b/core/themes/bartik/template.php index 459a593..7bf8f89 100644 --- a/core/themes/bartik/template.php +++ b/core/themes/bartik/template.php @@ -107,7 +107,7 @@ function bartik_process_maintenance_page(&$variables) { function bartik_preprocess_block(&$variables) { // In the header region visually hide block titles. if ($variables['block']->region == 'header') { - $variables['title_attributes_array']['class'][] = 'element-invisible'; + $variables['title_attributes_array']['class'][] = 'invisible'; } } diff --git a/core/themes/bartik/templates/maintenance-page.tpl.php b/core/themes/bartik/templates/maintenance-page.tpl.php index f2b998e..0444832 100644 --- a/core/themes/bartik/templates/maintenance-page.tpl.php +++ b/core/themes/bartik/templates/maintenance-page.tpl.php @@ -23,23 +23,23 @@ >