WordPress.org

Make WordPress Core

Changeset 17864


Ignore:
Timestamp:
05/11/2011 08:09:28 PM (7 years ago)
Author:
markjaquith
Message:

Rename submenus to not clash with top level menus. Introduce all_items CPT string, defaulting to menu_name. fixes #17378

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/menu.php

    r17822 r17864  
    2525$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'div' );
    2626
    27 $submenu[ 'index.php' ][0] = array( __('Dashboard'), 'read', 'index.php' );
     27$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
    2828
    2929if ( is_multisite() ) {
     
    7373
    7474$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
    75     $submenu['edit.php'][5]  = array( __('Posts'), 'edit_posts', 'edit.php' );
     75    $submenu['edit.php'][5]  = array( __('All Posts'), 'edit_posts', 'edit.php' );
    7676    /* translators: add new post */
    7777    $submenu['edit.php'][10]  = array( _x('Add New', 'post'), 'edit_posts', 'post-new.php' );
     
    9292
    9393$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'div' );
    94     $submenu['link-manager.php'][5] = array( __('Links'), 'manage_links', 'link-manager.php' );
     94    $submenu['link-manager.php'][5] = array( __('All Links'), 'manage_links', 'link-manager.php' );
    9595    /* translators: add new links */
    9696    $submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
     
    9898
    9999$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'div' );
    100     $submenu['edit.php?post_type=page'][5] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page' );
     100    $submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
    101101    /* translators: add new page */
    102102    $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
     
    114114$menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top menu-icon-comments', 'menu-comments', 'div' );
    115115unset($awaiting_mod);
     116
     117$submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'edit-comments.php' );
    116118
    117119$_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
     
    138140
    139141    $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
    140     $submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->menu_name, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
     142    $submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
    141143    $submenu["edit.php?post_type=$ptype"][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->edit_posts, "post-new.php?post_type=$ptype" );
    142144
     
    181183        if ( ! is_multisite() ) {
    182184            /* translators: add new plugin */
    183             $submenu['plugins.php'][5]  = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
     185            $submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
    184186            $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
    185187            $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
     
    195197if ( current_user_can('list_users') ) {
    196198    $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
    197     $submenu['users.php'][5] = array(__('Users'), 'list_users', 'users.php');
     199    $submenu['users.php'][5] = array(__('All Users'), 'list_users', 'users.php');
    198200    if ( current_user_can('create_users') )
    199201        $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
  • trunk/wp-includes/post.php

    r17748 r17864  
    11671167        'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
    11681168        'parent_item_colon' => array( null, __('Parent Page:') ),
     1169        'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) )
    11691170    );
    11701171    $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
     
    11881189    if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
    11891190        $object->labels['menu_name'] = $object->labels['name'];
     1191
     1192    if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
     1193        $object->labels['all_items'] = $object->labels['menu_name'];
    11901194
    11911195    foreach ( $nohier_vs_hier_defaults as $key => $value )
     
    12081212        if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true )
    12091213            continue;
    1210         add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->menu_name, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
     1214        add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
    12111215    }
    12121216}
Note: See TracChangeset for help on using the changeset viewer.