Changeset 17864

Timestamp:

05/11/2011 08:09:28 PM (14 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:

• wp-admin/menu.php (modified) (8 diffs)
• wp-includes/post.php (modified) (3 diffs)

trunk/wp-admin/menu.php

@@ -25 +25 @@
 $menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'div' );
 
-$submenu[ 'index.php' ][0] = array( __('Dashboard'), 'read', 'index.php' );
+$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
 
 if ( is_multisite() ) {
@@ -73 +73 @@
 
 $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
-    $submenu['edit.php'][5]  = array( __('Posts'), 'edit_posts', 'edit.php' );
+    $submenu['edit.php'][5]  = array( __('All Posts'), 'edit_posts', 'edit.php' );
     /* translators: add new post */
     $submenu['edit.php'][10]  = array( _x('Add New', 'post'), 'edit_posts', 'post-new.php' );
@@ -92 +92 @@
 
 $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'div' );
-    $submenu['link-manager.php'][5] = array( __('Links'), 'manage_links', 'link-manager.php' );
+    $submenu['link-manager.php'][5] = array( __('All Links'), 'manage_links', 'link-manager.php' );
     /* translators: add new links */
     $submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
@@ -98 +98 @@
 
 $menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'div' );
-    $submenu['edit.php?post_type=page'][5] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page' );
+    $submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
     /* translators: add new page */
     $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
@@ -114 +114 @@
 $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' );
 unset($awaiting_mod);
+
+$submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'edit-comments.php' );
 
 $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
@@ -138 +140 @@
 
     $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 );
-    $submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->menu_name, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
+    $submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
     $submenu["edit.php?post_type=$ptype"][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->edit_posts, "post-new.php?post_type=$ptype" );
 
@@ -181 +183 @@
         if ( ! is_multisite() ) {
             /* translators: add new plugin */
-            $submenu['plugins.php'][5]  = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
+            $submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
             $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
             $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
@@ -195 +197 @@
 if ( current_user_can('list_users') ) {
     $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
-    $submenu['users.php'][5] = array(__('Users'), 'list_users', 'users.php');
+    $submenu['users.php'][5] = array(__('All Users'), 'list_users', 'users.php');
     if ( current_user_can('create_users') )
         $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');

trunk/wp-includes/post.php

@@ -1167 +1167 @@
         'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
         'parent_item_colon' => array( null, __('Parent Page:') ),
+        'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) )
     );
     $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
@@ -1188 +1189 @@
     if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
         $object->labels['menu_name'] = $object->labels['name'];
+
+    if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
+        $object->labels['all_items'] = $object->labels['menu_name'];
 
     foreach ( $nohier_vs_hier_defaults as $key => $value )
@@ -1208 +1212 @@
         if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true )
             continue;
-        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" );
+        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" );
     }
 }