Index: wp-admin/css/wp-admin.css =================================================================== --- wp-admin/css/wp-admin.css (revision 23658) +++ wp-admin/css/wp-admin.css (working copy) @@ -6001,6 +6001,10 @@ overflow: auto; } +.wp-full-overlay-sidebar-content .accordion-section:first-child { + border-top: 1px solid #fff; +} + /* Close Link */ .wp-full-overlay .close-full-overlay { text-decoration: none; @@ -7166,6 +7170,29 @@ display: block; } +#nav-menu-meta ul.outer-border { + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.accordion-section ul.category-tabs, +.accordion-section ul.add-menu-item-tabs, +.accordion-section ul.wp-tab-bar { + margin: 0; +} + +.accordion-section .categorychecklist { + margin: 13px 0; +} + +#nav-menu-meta .accordion-section-content { + padding: 18px 13px; +} + +#nav-menu-meta .button-controls { + margin-bottom: 0; +} + #nav-menus-frame { margin-left: 300px; margin-top: 28px; @@ -7295,7 +7322,7 @@ } .nav-menus-php #post-body { - padding: 0 10px; + padding: 0 10px 10px; border-width: 1px 0; border-style: solid; } @@ -7365,15 +7392,38 @@ } /* Add Menu Item Boxes */ -.postbox .howto input { +.postbox .howto input, +.accordion-container .howto input { width: 180px; float: right; } +.accordion-container .outer-border { + margin-top: 0; +} + +.accordion-container .accordion-section:first-child { + -webkit-border-top-right-radius: 3px; + -webkit-border-top-left-radius: 3px; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} + +.accordion-container .accordion-section:last-child { + -webkit-border-bottom-right-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} + .customlinkdiv .howto input { - width: 200px; + width: 180px; } +.customlinkdiv p { + margin-top: 0 +} + #nav-menu-theme-locations .howto select { width: 100%; } @@ -8782,6 +8832,10 @@ margin: 0; } +.accordion-section:first-child { + border-top: 1px solid #dfdfdf; +} + .accordion-section:last-child { box-shadow: 0 1px 0 0px #fff; } @@ -8789,6 +8843,8 @@ .accordion-section.open .accordion-section-content { display: block; background: #fdfdfd; + border-left: 1px solid #dfdfdf; + border-right: 1px solid #dfdfdf; } .accordion-section.open:hover { @@ -8805,6 +8861,8 @@ margin: 0; padding: 15px 20px; position: relative; + border-left: 1px solid #dfdfdf; + border-right: 1px solid #dfdfdf; cursor: pointer; @@ -8878,6 +8936,8 @@ background-image: -moz-linear-gradient(bottom, #6d6d6d, #808080); background-image: -o-linear-gradient(bottom, #6d6d6d, #808080); background-image: linear-gradient(to top, #6d6d6d, #808080); + border-left: 1px solid #808080; + border-right: 1px solid #808080; } .control-section.accordion-section:hover, Index: wp-admin/includes/nav-menu.php =================================================================== --- wp-admin/includes/nav-menu.php (revision 23658) +++ wp-admin/includes/nav-menu.php (working copy) @@ -385,14 +385,10 @@ * @since 3.0.0 **/ function wp_nav_menu_setup() { - // Register meta boxes wp_nav_menu_post_type_meta_boxes(); - add_meta_box( 'add-custom-links', __( 'Add Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' ); + wp_nav_menu_item_link_meta_box(); wp_nav_menu_taxonomy_meta_boxes(); - // Register advanced menu items (columns) - add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns'); - // If first time editing, disable advanced items by default. if( false === get_user_option( 'managenav-menuscolumnshidden' ) ) { $user = wp_get_current_user(); @@ -438,7 +434,8 @@ * @since 3.0.0 */ function wp_nav_menu_post_type_meta_boxes() { - $post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' ); + // Reverse array to show pages as first item + $post_types = array_reverse( get_post_types( array( 'show_in_nav_menus' => true ), 'object' ) ); if ( ! $post_types ) return; @@ -447,7 +444,7 @@ $post_type = apply_filters( 'nav_menu_meta_box_object', $post_type ); if ( $post_type ) { $id = $post_type->name; - add_meta_box( "add-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', 'default', $post_type ); + wp_nav_menu_item_post_type_meta_box( $post_type ); } } } @@ -467,7 +464,7 @@ $tax = apply_filters( 'nav_menu_meta_box_object', $tax ); if ( $tax ) { $id = $tax->name; - add_meta_box( "add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax ); + wp_nav_menu_item_taxonomy_meta_box( $tax ); } } } @@ -564,7 +561,9 @@ ); ?> -
+
  • +

    +
    -

    - - class="button-secondary submit-add-to-menu right" value="" name="add-custom-menu-item" id="submit-customlinkdiv" /> - - -

    +

    + + class="button-secondary submit-add-to-menu right" value="" name="add-custom-menu-item" id="submit-customlinkdiv" /> + + +

    -
    +
    • + name; + $post_type_name = $post_type->name; // paginate browsing for large numbers of post objects $per_page = 50; @@ -621,18 +621,24 @@ 'update_post_meta_cache' => false ); - if ( isset( $post_type['args']->_default_query ) ) - $args = array_merge($args, (array) $post_type['args']->_default_query ); + if ( isset( $post_type->_default_query ) ) + $args = array_merge( $args, (array) $post_type->_default_query ); // @todo transient caching of these results with proper invalidation on updating of a post of this type $get_posts = new WP_Query; $posts = $get_posts->query( $args ); - if ( ! $get_posts->post_count ) { - echo '

    ' . __( 'No items.' ) . '

    '; - return; + if ( ! $get_posts->post_count ) { ?> + +
  • +

    labels->name ); ?>

    +
    + +
    +
    • + max_num_pages; @@ -681,132 +687,125 @@ ); ?> -
    - +
  • +

    labels->name ); ?>

    +
    +
      +
    • >
      • +
    • >
      • +
    • >
      • +
    -
    -
      - 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) ); - $most_recent = $get_posts->query( $recent_args ); - $args['walker'] = $walker; - echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args ); - ?> -
    -
    +
    +
      + 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) ); + $most_recent = $get_posts->query( $recent_args ); + $args['walker'] = $walker; + echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args ); + ?> +
    +
    -
    - $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC', ) ); - } else { - $searched = ''; - $search_results = array(); - } - ?> -

    - - - 'submit-quick-search-posttype-' . $post_type_name ) ); ?> -

    +
    + $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC', ) ); + } else { + $searched = ''; + $search_results = array(); + } + ?> +

    + + + 'submit-quick-search-posttype-' . $post_type_name ) ); ?> +

    -
      - - - -
    • get_error_message(); ?>
      • - -
      • - -
    -
    +
      + + + +
    • get_error_message(); ?>
      • + +
      • + +
    +
    -
    - -
    - -
    - -
      - -all" class="tabs-panel tabs-panel-view-all "> + +
      + +
      + +
        + front_or_home = true; - array_unshift( $posts, $front_page_obj ); - } else { - $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1; - array_unshift( $posts, (object) array( - 'front_or_home' => true, - 'ID' => 0, - 'object_id' => $_nav_menu_placeholder, - 'post_content' => '', - 'post_excerpt' => '', - 'post_parent' => '', - 'post_title' => _x('Home', 'nav menu home label'), - 'post_type' => 'nav_menu_item', - 'type' => 'custom', - 'url' => home_url('/'), - ) ); + // if we're dealing with pages, let's put a checkbox for the front page at the top of the list + if ( 'page' == $post_type_name ) { + $front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0; + if ( ! empty( $front_page ) ) { + $front_page_obj = get_post( $front_page ); + $front_page_obj->front_or_home = true; + array_unshift( $posts, $front_page_obj ); + } else { + $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1; + array_unshift( $posts, (object) array( + 'front_or_home' => true, + 'ID' => 0, + 'object_id' => $_nav_menu_placeholder, + 'post_content' => '', + 'post_excerpt' => '', + 'post_parent' => '', + 'post_title' => _x( 'Home', 'nav menu home label' ), + 'post_type' => 'nav_menu_item', + 'type' => 'custom', + 'url' => home_url(), + ) ); + } } - } - $posts = apply_filters( 'nav_menu_items_'.$post_type_name, $posts, $args, $post_type ); - $checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args ); + $posts = apply_filters( 'nav_menu_items_' . $post_type_name, $posts, $args, $post_type ); + $checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args ); - if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) { - $checkbox_items = preg_replace('/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items); + if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) + $checkbox_items = preg_replace( '/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items ); - } + echo $checkbox_items; + ?> +
      + +
      + +
      + +
    - echo $checkbox_items; - ?> - - -
    - -
    - -
    +

    + + + -

    - - - + + class="button-secondary submit-add-to-menu right" value="" name="add-post-type-menu-item" id="submit-posttype-" /> + + +

    - - class="button-secondary submit-add-to-menu right" value="" name="add-post-type-menu-item" id="" /> - - -

    - -
    • + + name; + $taxonomy_name = $taxonomy->name; // paginate browsing for large numbers of objects $per_page = 50; @@ -842,9 +841,14 @@ $terms = get_terms( $taxonomy_name, $args ); - if ( ! $terms || is_wp_error($terms) ) { - echo '

    ' . __( 'No items.' ) . '

    '; - return; + if ( is_wp_error( $terms ) ) { ?> +
  • +

    labels->name ); ?>

    +
    + +
    +
    • + '', 'offset' => '') ) ) / $per_page ); @@ -891,98 +895,91 @@ ); ?> -
    - +
  • +

    labels->name ); ?>

    +
    +
      +
    • >
      • +
    • >
      • +
    • >
      • +
    -
    -
      - 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) ); - $args['walker'] = $walker; - echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args ); - ?> -
    -
    +
    +
      + 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) ); + $args['walker'] = $walker; + echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $popular_terms ), 0, (object) $args ); + ?> +
    +
    -
    - -
    - -
    - -
      - -
    - -
    - -
    - -
    +
    + +
    + +
    + +
      + +
    + +
    + +
    + +
    -
    - $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) ); - } else { - $searched = ''; - $search_results = array(); - } - ?> -

    - - - 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?> -

    +
    + $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) ); + } else { + $searched = ''; + $search_results = array(); + } + ?> +

    + + + 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?> +

    -
      - - - -
    • get_error_message(); ?>
      • - -
      • - -
    -
    +
      + + + +
    • get_error_message(); ?>
      • + +
      • + +
    +
    -

    - - - - - - class="button-secondary submit-add-to-menu right" value="" name="add-taxonomy-menu-item" id="" /> - - -

    - -
    +

    + + + + + class="button-secondary submit-add-to-menu right" value="" name="add-taxonomy-menu-item" id="submit-taxonomy-" /> + + +

    +
    • + " /> - +
    + +