diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php index 976ea9f36..9b1d10cbe 100644 --- a/wp-admin/includes/nav-menu.php +++ b/wp-admin/includes/nav-menu.php @@ -55,7 +55,7 @@ function wp_nav_menu_post_type_metaboxes() { foreach ( $post_types as $post_type ) { $id = $post_type->name; - add_meta_box( "add-{$id}", sprintf( __('Add an Existing %s'), $post_type->singular_label ), 'wp_nav_menu_item_post_type_metabox', 'nav-menus', 'side', 'default', $post_type ); + add_meta_box( "add-{$id}", sprintf( __('Add %s'), $post_type->label ), 'wp_nav_menu_item_post_type_metabox', 'nav-menus', 'side', 'default', $post_type ); } } @@ -72,8 +72,7 @@ function wp_nav_menu_taxonomy_metaboxes() { foreach ( $taxonomies as $tax ) { $id = $tax->name; - - add_meta_box( "add-{$id}", sprintf( __('Add an Existing %s'), $tax->singular_label ), 'wp_nav_menu_item_taxonomy_metabox', 'nav-menus', 'side', 'default', $tax ); + add_meta_box( "add-{$id}", sprintf( __('Add %s'), $tax->label ), 'wp_nav_menu_item_taxonomy_metabox', 'nav-menus', 'side', 'default', $tax ); } } diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index ff51e1e5f..f7b30afea 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -274,7 +274,7 @@ require_once( 'admin-header.php' );
diff --git a/wp-content/themes/twentyten/style.css b/wp-content/themes/twentyten/style.css index ae8b577e7..ff6b25c5a 100644 --- a/wp-content/themes/twentyten/style.css +++ b/wp-content/themes/twentyten/style.css @@ -113,6 +113,7 @@ textarea, h3#comments-title, h3#reply-title, #access .menu, +#access div.menu ul, #cancel-comment-reply-link, .form-allowed-tags, #site-info, @@ -153,6 +154,7 @@ code { /* The main theme structure */ #access .menu-header, +div.menu, #colophon, #branding, #main, @@ -360,15 +362,15 @@ a:hover { display:block; float:left; } -#access .menu-header { +#access .menu-header, div.menu { font-size: 13px; margin-left: 12px; } -#access .menu-header ul { +#access .menu-header ul, div.menu ul { list-style: none; margin: 0; } -#access .menu-header li { +#access .menu-header li, div.menu li { float:left; position: relative; } diff --git a/wp-includes/classes.php b/wp-includes/classes.php index 15ce7c6f5..6d1507fed 100644 --- a/wp-includes/classes.php +++ b/wp-includes/classes.php @@ -1178,7 +1178,7 @@ class Walker_Nav_Menu extends Walker { * @param object $item Menu item data object. * @param int $depth Depth of menu item. Used for padding. * @param int $current_page Menu item ID. - * @param array $args + * @param object $args */ function start_el(&$output, $item, $depth, $args) { $indent = ( $depth ) ? str_repeat( "\t", $depth ) : ''; @@ -1217,7 +1217,6 @@ class Walker_Nav_Menu extends Walker { function end_el(&$output, $item, $depth) { $output .= "\n"; } - } /** diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 673497b80..9751b9ada 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -22,7 +22,8 @@ * link_before - Text before the link. * link_after - Text after the link. * echo - Whether to echo the menu or return it. Defaults to echo. - * show_home - If you set this argument, then it will display the link to the home page. The show_home argument really just needs to be set to the value of the text of the link. + * + * @todo show_home - If you set this argument, then it will display the link to the home page. The show_home argument really just needs to be set to the value of the text of the link. * * @since 3.0.0 * @@ -31,7 +32,7 @@ function wp_nav_menu( $args = array() ) { $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'menu_class' => 'menu', 'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', - 'depth' => 0, 'walker' => '' ); + 'depth' => 0, 'walker' => '', 'context' => 'frontend' ); $args = wp_parse_args( $args, $defaults ); $args = apply_filters( 'wp_nav_menu_args', $args ); @@ -51,70 +52,26 @@ function wp_nav_menu( $args = array() ) { } } } - - if ( $menu && ! is_wp_error( $menu ) ) - $args->menu = $menu->term_id; - $nav_menu = ''; - - if ( 'div' == $args->container ) { - $class = $args->container_class ? ' class="' . esc_attr($args->container_class) . '"' : ''; - - if ( is_nav_menu($menu) ) { - $nav_menu .= '