Changeset 31955

Timestamp:

04/01/2015 01:16:47 PM (10 years ago)

Author:

ocean90

Message:

Accessibility: Add landmark roles to WordPress admin areas.

props afercia, joedolson.
fixes #31450.

Location:

trunk/src

Files:

• wp-admin/admin-footer.php (modified) (1 diff)
• wp-admin/admin-header.php (modified) (2 diffs)
• wp-admin/menu-header.php (modified) (2 diffs)
• wp-includes/class-wp-admin-bar.php (modified) (1 diff)

trunk/src/wp-admin/admin-footer.php

@@ -16 +16 @@
 <div class="clear"></div></div><!-- wpcontent -->
 
-<div id="wpfooter">
+<div id="wpfooter" role="contentinfo">
     <?php
     /**

trunk/src/wp-admin/admin-header.php

@@ -191 +191 @@
 
 <div id="wpwrap">
-<a tabindex="1" href="#wpbody-content" class="screen-reader-shortcut"><?php _e('Skip to main content'); ?></a>
 <?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
 <div id="wpcontent">
@@ -204 +203 @@
 ?>
 
-<div id="wpbody">
+<div id="wpbody" role="main">
 <?php
 unset($title_class, $blog_name, $total_update_count, $update_title);

trunk/src/wp-admin/menu-header.php

@@ -220 +220 @@
 ?>
 
+<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e( 'Main menu' ); ?>">
+<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e( 'Skip to main content' ); ?></a>
+<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e( 'Skip to toolbar' ); ?></a>
 <div id="adminmenuback"></div>
 <div id="adminmenuwrap">
-<ul id="adminmenu" role="navigation">
+<ul id="adminmenu">
 
 <?php
@@ -237 +240 @@
 </ul>
 </div>
+</div>

trunk/src/wp-includes/class-wp-admin-bar.php

@@ -364 +364 @@
 
         ?>
-        <div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
-            <a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
-            <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Top navigation toolbar.'); ?>" tabindex="0">
+        <div id="wpadminbar" class="<?php echo $class; ?>">
+            <?php if ( ! is_admin() ) { ?>
+                <a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
+            <?php } ?>
+            <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">
                 <?php foreach ( $root->children as $group ) {
                     $this->_render_group( $group );