Wordpress 3.5

[autoinstalls/wordpress.git] / wp-admin / menu-header.php

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 017f676acfb88c55ff48c0baad5b04da79cd34a5..25ebaa00fa8db9fdf40613c6aa51612863110f26 100644 (file)
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -41,7 +41,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
        foreach ( $menu as $key => $item ) {
                $admin_is_parent = false;
                $class = array();
        foreach ( $menu as $key => $item ) {
                $admin_is_parent = false;
                $class = array();

-               $aria_attributes = 'tabindex="1"';
+               $aria_attributes = '';

 
                if ( $first ) {
                        $class[] = 'wp-first-item';
 
                if ( $first ) {
                        $class[] = 'wp-first-item';


@@ -59,7 +59,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                } else {
                        $class[] = 'wp-not-current-submenu';
                        if ( ! empty( $submenu_items ) )
                } else {
                        $class[] = 'wp-not-current-submenu';
                        if ( ! empty( $submenu_items ) )

-                               $aria_attributes .= ' aria-haspopup="true"';
+                               $aria_attributes .= 'aria-haspopup="true"';

                }
 
                if ( ! empty( $item[4] ) )
                }
 
                if ( ! empty( $item[4] ) )


@@ -68,8 +68,10 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
                $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
                $img = '';
                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
                $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
                $img = '';

+               // if the string 'none' (previously 'div') is passed instead of an URL, don't output the default menu image
+               // so an icon can be added to div.wp-menu-image as background with CSS.

                if ( ! empty( $item[6] ) )
                if ( ! empty( $item[6] ) )

-                       $img = ( 'div' === $item[6] ) ? '<br />' : '<img src="' . $item[6] . '" alt="" />';
+                       $img = ( 'none' === $item[6] || 'div' === $item[6] ) ? '<br />' : '<img src="' . $item[6] . '" alt="" />';

                $arrow = '<div class="wp-menu-arrow"><div></div></div>';
 
                $title = wptexturize( $item[0] );
                $arrow = '<div class="wp-menu-arrow"><div></div></div>';
 
                $title = wptexturize( $item[0] );


@@ -87,9 +89,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;
                                $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]}' aria-label='$aria_label'>$img</a></div>$arrow<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
+                               echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>$title</div></a>";

                        } else {
                        } else {

-                               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>";
+                               echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>$title</div></a>";

                        }
                } elseif ( ! empty( $item[2] ) && 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' );


@@ -98,21 +100,21 @@ 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;
                                $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]}' aria-label='$aria_label'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class $aria_attributes>{$item[0]}</a>";
+                               echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";

                        } else {
                        } else {

-                               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>";
+                               echo "\n\t<a href='{$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";

                        }
                }
 
                if ( ! empty( $submenu_items ) ) {
                        }
                }
 
                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>";
+                       echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
+                       echo "<li class='wp-submenu-head'>{$item[0]}</li>";
+

                        $first = true;
                        foreach ( $submenu_items as $sub_key => $sub_item ) {
                                if ( ! current_user_can( $sub_item[1] ) )
                                        continue;
 
                        $first = true;
                        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';
                                $class = array();
                                if ( $first ) {
                                        $class[] = 'wp-first-item';


@@ -156,12 +158,12 @@ 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 );
                                                $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>";
+                                       echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";

                                } else {
                                } else {

-                                       echo "<li$class><a href='{$sub_item[2]}'$class $aria_attributes>$title</a></li>";
+                                       echo "<li$class><a href='{$sub_item[2]}'$class>$title</a></li>";

                                }
                        }
                                }
                        }

-                       echo "</ul></div></div>";
+                       echo "</ul>";

                }
                echo "</li>";
        }
                }
                echo "</li>";
        }