--- a/web/wp-admin/menu-header.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/menu-header.php Mon Nov 19 18:26:13 2012 +0100
@@ -13,10 +13,13 @@
* @name $self
* @var string
*/
-$self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
+$self = preg_replace('|^.*/wp-admin/network/|i', '', $_SERVER['PHP_SELF']);
+$self = preg_replace('|^.*/wp-admin/|i', '', $self);
$self = preg_replace('|^.*/plugins/|i', '', $self);
+$self = preg_replace('|^.*/mu-plugins/|i', '', $self);
global $menu, $submenu, $parent_file; //For when admin-header is included from within a function.
+$parent_file = apply_filters("parent_file", $parent_file); // For plugins to move submenu tabs around.
get_admin_page_parent();
@@ -31,78 +34,85 @@
* @param bool $submenu_as_parent
*/
function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
- global $self, $parent_file, $submenu_file, $plugin_page, $pagenow;
+ global $self, $parent_file, $submenu_file, $plugin_page, $pagenow, $typenow;
$first = true;
// 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src
foreach ( $menu as $key => $item ) {
$admin_is_parent = false;
$class = array();
+ $aria_attributes = 'tabindex="1"';
+
if ( $first ) {
$class[] = 'wp-first-item';
$first = false;
}
- if ( !empty($submenu[$item[2]]) )
+
+ $submenu_items = false;
+ if ( ! empty( $submenu[$item[2]] ) ) {
$class[] = 'wp-has-submenu';
-
- if ( ( $parent_file && $item[2] == $parent_file ) || strcmp($self, $item[2]) == 0 ) {
- if ( !empty($submenu[$item[2]]) )
- $class[] = 'wp-has-current-submenu wp-menu-open';
- else
- $class[] = 'current';
+ $submenu_items = $submenu[$item[2]];
}
- if ( isset($item[4]) && ! empty($item[4]) )
+ 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 {
+ $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 = isset($item[5]) && ! empty($item[5]) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+ $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
$img = '';
- if ( isset($item[6]) && ! empty($item[6]) ) {
- if ( 'div' === $item[6] )
- $img = '<br />';
- else
- $img = '<img src="' . $item[6] . '" alt="" />';
- }
- $toggle = '<div class="wp-menu-toggle"><br /></div>';
+ if ( ! empty( $item[6] ) )
+ $img = ( 'div' === $item[6] ) ? '<br />' : '<img src="' . $item[6] . '" alt="" />';
+ $arrow = '<div class="wp-menu-arrow"><div></div></div>';
+
+ $title = wptexturize( $item[0] );
+ $aria_label = esc_attr( strip_tags( $item[0] ) ); // strip the comment/plugins/updates bubbles spans but keep the pending number if any
echo "\n\t<li$class$id>";
- if ( false !== strpos($class, 'wp-menu-separator') ) {
- echo '<a class="separator" href="?unfoldmenu=1"><br /></a>';
- } elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
- $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
- $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
- $menu_file = $submenu[$item[2]][0][2];
- if ( false !== $pos = strpos($menu_file, '?') )
- $menu_file = substr($menu_file, 0, $pos);
- if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") ) || !empty($menu_hook)) {
+ if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+ echo '<div class="separator"></div>';
+ } elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
+ $submenu_items = array_values( $submenu_items ); // Re-index.
+ $menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
+ $menu_file = $submenu_items[0][2];
+ if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+ $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[$item[2]][0][2]}'>$img</a></div>$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
+ echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu_items[0][2]}' aria-label='$aria_label'>$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[$item[2]][0][2]}'>$img</a></div>$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>{$item[0]}</a>";
+ echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}' aria-label='$aria_label'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
}
- } else if ( current_user_can($item[1]) ) {
- $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+ } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
+ $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
$menu_file = $item[2];
- if ( false !== $pos = strpos($menu_file, '?') )
- $menu_file = substr($menu_file, 0, $pos);
- if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") || !empty($menu_hook) ) {
+ if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+ $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>$toggle<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]}' aria-label='$aria_label'>$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>$toggle<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
+ echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}' aria-label='$aria_label'>$img</a></div>$arrow<a href='{$item[2]}'$class $aria_attributes>{$item[0]}</a>";
}
}
- if ( !empty($submenu[$item[2]]) ) {
- echo "\n\t<div class='wp-submenu'><div class='wp-submenu-head'>{$item[0]}</div><ul>";
+ if ( ! empty( $submenu_items ) ) {
+ echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>";
+ echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>";
$first = true;
- foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) {
- if ( !current_user_can($sub_item[1]) )
+ foreach ( $submenu_items as $sub_key => $sub_item ) {
+ if ( ! current_user_can( $sub_item[1] ) )
continue;
+ $aria_attributes = 'tabindex="1"';
$class = array();
if ( $first ) {
$class[] = 'wp-first-item';
@@ -110,15 +120,22 @@
}
$menu_file = $item[2];
- if ( false !== $pos = strpos($menu_file, '?') )
- $menu_file = substr($menu_file, 0, $pos);
+
+ if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+ $menu_file = substr( $menu_file, 0, $pos );
- if ( isset($submenu_file) ) {
+ // Handle current for post_type=post|page|foo pages, which won't match $self.
+ $self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
+
+ if ( isset( $submenu_file ) ) {
if ( $submenu_file == $sub_item[2] )
$class[] = 'current';
// If plugin_page is set the parent must either match the current page or not physically exist.
// This allows plugin pages with the same hook to exist under different parents.
- } else if ( (isset($plugin_page) && $plugin_page == $sub_item[2] && (!file_exists($menu_file) || ($item[2] == $self))) || (!isset($plugin_page) && $self == $sub_item[2]) ) {
+ } else if (
+ ( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
+ ( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
+ ) {
$class[] = 'current';
}
@@ -126,32 +143,40 @@
$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
$sub_file = $sub_item[2];
- if ( false !== $pos = strpos($sub_file, '?') )
+ if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
$sub_file = substr($sub_file, 0, $pos);
- if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) {
- // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
+ $title = wptexturize($sub_item[0]);
- $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($menu_file);
- if ( $parent_exists )
- echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";
- elseif ( 'admin.php' == $pagenow || !$parent_exists )
- echo "<li$class><a href='admin.php?page={$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";
+ if ( ! empty( $menu_hook ) || ( ('index.php' != $sub_item[2]) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) ) ) {
+ // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
+ if ( (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}")) || file_exists($menu_file) )
+ $sub_item_url = add_query_arg( array('page' => $sub_item[2]), $item[2] );
else
- echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";
+ $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 $aria_attributes>$title</a></li>";
} else {
- echo "<li$class><a href='{$sub_item[2]}'$class$tabindex>{$sub_item[0]}</a></li>";
+ echo "<li$class><a href='{$sub_item[2]}'$class $aria_attributes>$title</a></li>";
}
}
- echo "</ul></div>";
+ echo "</ul></div></div>";
}
echo "</li>";
}
+
+ echo '<li id="collapse-menu" class="hide-if-no-js"><div id="collapse-button"><div></div></div>';
+ echo '<span>' . esc_html__( 'Collapse menu' ) . '</span>';
+ echo '</li>';
}
?>
-<ul id="adminmenu">
+<div id="adminmenuback"></div>
+<div id="adminmenuwrap">
+<div id="adminmenushadow"></div>
+<ul id="adminmenu" role="navigation">
<?php
@@ -160,3 +185,4 @@
?>
</ul>
+</div>