From 7f81dbfe3ff68fefd08897d584f951812d25e026 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 30 Nov 2011 01:27:33 +0000
Subject: [PATCH] Add ARIA related attributes (first take), props DrewAPicture,
 see #19394

git-svn-id: http://svn.automattic.com/wordpress/trunk@19484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu-header.php           | 27 +++++++++++++++------------
 wp-includes/class-wp-admin-bar.php | 23 +++++++++++++++--------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 6986e0798..4d7ec201d 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -41,6 +41,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 	foreach ( $menu as $key => $item ) {
 		$admin_is_parent = false;
 		$class = array();
+		$aria_attributes = 'tabindex="1" role="menuitem"';
 
 		if ( $first ) {
 			$class[] = 'wp-first-item';
@@ -53,16 +54,18 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 			$submenu_items = $submenu[$item[2]];
 		}
 
-		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) )
+		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
 			$class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
-		else
+		} else {
 			$class[] = 'wp-not-current-submenu';
+			if ( ! empty( $submenu_items ) )
+				$aria_attributes .= ' aria-haspopup="true"';	
+		}
 
 		if ( ! empty( $item[4] ) )
 			$class[] = $item[4];
 
 		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
-		$tabindex = ' tabindex="1"';
 		$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
 		$img = '';
 		if ( ! empty( $item[6] ) )
@@ -83,9 +86,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 				$menu_file = substr( $menu_file, 0, $pos );
 			if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
 				$admin_is_parent = true;
-				echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu_items[0][2]}'>$img</a></div>$arrow<a href='admin.php?page={$submenu_items[0][2]}'$class$tabindex>$title</a>";
+				echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu_items[0][2]}'>$img</a></div>$arrow<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
 			} else {
-				echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class$tabindex>$title</a>";
+				echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
 			}
 		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
 			$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
@@ -94,14 +97,14 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 				$menu_file = substr( $menu_file, 0, $pos );
 			if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
 				$admin_is_parent = true;
-				echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
+				echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class $aria_attributes>{$item[0]}</a>";
 			} else {
-				echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$arrow<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
+				echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$arrow<a href='{$item[2]}'$class $aria_attributes>{$item[0]}</a>";
 			}
 		}
 
 		if ( ! empty( $submenu_items ) ) {
-			echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>";
+			echo "\n\t<div class='wp-submenu' role='menu'><div class='wp-submenu-wrap'>";
 			echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>";
 			$first = true;
 			foreach ( $submenu_items as $sub_key => $sub_item ) {
@@ -151,9 +154,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 						$sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' );
 
 					$sub_item_url = esc_url( $sub_item_url );
-					echo "<li$class><a href='$sub_item_url'$class$tabindex>$title</a></li>";
+					echo "<li$class><a href='$sub_item_url'$class $aria_attributes>$title</a></li>";
 				} else {
-					echo "<li$class><a href='{$sub_item[2]}'$class$tabindex>$title</a></li>";
+					echo "<li$class><a href='{$sub_item[2]}'$class $aria_attributes>$title</a></li>";
 				}
 			}
 			echo "</ul></div></div>";
@@ -169,9 +172,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 ?>
 
 <div id="adminmenuback"></div>
-<div id="adminmenuwrap">
+<div id="adminmenuwrap" role="navigation">
 <div id="adminmenushadow"></div>
-<ul id="adminmenu">
+<ul id="adminmenu" role="menu">
 
 <?php
 
diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php
index 7a3e03243..b69e472c4 100644
--- a/wp-includes/class-wp-admin-bar.php
+++ b/wp-includes/class-wp-admin-bar.php
@@ -179,8 +179,8 @@ class WP_Admin_Bar {
 		}
 
 		?>
-		<div id="wpadminbar" class="<?php echo $class; ?>">
-			<div class="quicklinks">
+		<div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
+			<div class="quicklinks" role="menubar">
 				<?php foreach ( $this->root->children as $group ) {
 					$this->render_group( $group, 'ab-top-menu' );
 				} ?>
@@ -218,7 +218,7 @@ class WP_Admin_Bar {
 			if ( ! empty( $node->meta['class'] ) )
 				$class .= ' ' . $node->meta['class'];
 
-			?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>"><?php
+			?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>" role="menu"><?php
 				foreach ( $node->children as $item ) {
 					$this->render_item( $item );
 				}
@@ -226,7 +226,7 @@ class WP_Admin_Bar {
 
 		// Wrap the subgroups in a div and render each individual subgroup.
 		elseif ( ! $is_single_group ):
-			?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container"><?php
+			?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container" role="menu"><?php
 				foreach ( $groups as $group ) {
 					$this->render_group( $group, $class );
 				}
@@ -240,17 +240,24 @@ class WP_Admin_Bar {
 
 		$is_parent = (bool) $node->children;
 		$has_link  = (bool) $node->href;
+		$tabindex = isset($node->meta['tabindex']) ? (int) $node->meta['tabindex'] : 10;
+
+		$menuclass = '';
+		$aria_attributes = 'tabindex="' . $tabindex . '" role="menuitem"';
+
+		if ( $is_parent ) {
+			$menuclass = 'menupop';
+			$aria_attributes .= ' aria-haspopup="true"';
+		}
 
-		$menuclass = $is_parent ? 'menupop' : '';
 		if ( ! empty( $node->meta['class'] ) )
 			$menuclass .= ' ' . $node->meta['class'];
 
-		$tabindex = !empty($node->meta['tabindex']) ? $node->meta['tabindex'] : 10;
 		?>
 
 		<li id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>"><?php
 			if ( $has_link ):
-				?><a class="ab-item" tabindex="<?php echo (int) $tabindex; ?>" href="<?php echo esc_url( $node->href ) ?>"<?php
+				?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
 					if ( ! empty( $node->meta['onclick'] ) ) :
 						?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
 					endif;
@@ -262,7 +269,7 @@ class WP_Admin_Bar {
 				endif;
 				?>><?php
 			else:
-				?><div class="ab-item ab-empty-item" tabindex="<?php echo (int) $tabindex; ?>"><?php
+				?><div class="ab-item ab-empty-item" <?php echo $aria_attributes; ?>><?php
 			endif;
 
 			echo $node->title;