Changeset 12728

Timestamp:

01/15/2010 04:58:36 PM (17 years ago)

Author:

ryan

Message:

Merge edit-pages.php into edit.php. see #9674

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• admin-header.php (modified) (2 diffs)
• admin.php (modified) (1 diff)
• edit-form-advanced.php (modified) (1 diff)
• edit-link-form.php (modified) (1 diff)
• edit-pages.php (deleted)
• edit-post-rows.php (modified) (2 diffs)
• edit.php (modified) (17 diffs)
• includes/misc.php (modified) (1 diff)
• includes/post.php (modified) (2 diffs)
• includes/template.php (modified) (37 diffs)
• index.php (modified) (1 diff)
• menu.php (modified) (1 diff)
• options-general.php (modified) (1 diff)
• plugin-install.php (modified) (1 diff)
• plugins.php (modified) (1 diff)
• post-new.php (modified) (1 diff)
• post.php (modified) (8 diffs)
• theme-install.php (modified) (1 diff)
• themes.php (modified) (1 diff)
• widgets.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -1004 +1004 @@
         check_ajax_referer( 'autosave', 'autosavenonce' );
         $ID = (int) $_POST['post_ID'];
-        $post_type = ( 'page' == $_POST['post_type'] ) ? 'page' : 'post';
-        if ( current_user_can( "edit_{$post_type}", $ID ) )
+        $post_type = $_POST['post_type'];
+        $post_type_object = get_post_type_object($post_type);
+        if ( !$post_type_object )
+                die('0');
+        if ( current_user_can( $post_type_object->edit_cap, $ID ) )
                 die( json_encode( array( 'updateNonce' => wp_create_nonce( "update-{$post_type}_{$ID}" ), 'deleteURL' => str_replace( '&', '&', wp_nonce_url( admin_url( $post_type . '.php?action=trash&post=' . $ID ), "trash-{$post_type}_{$ID}" ) ) ) ) );
         do_action('autosave_generate_nonces');

trunk/wp-admin/admin-header.php

@@ -29 +29 @@
         wp_admin_css( 'css/ms' );
 wp_enqueue_script('utils');
-
-$hook_suffix = '';
-if ( isset($page_hook) )
-        $hook_suffix = $page_hook;
-else if ( isset($plugin_page) )
-        $hook_suffix = $plugin_page;
-else if ( isset($pagenow) )
-        $hook_suffix = $pagenow;
-
-if ( isset($submenu_file) && (false !== $pos = strpos($submenu_file, 'post_type=')) )
-        $typenow = substr($submenu_file, $pos + 10);
-elseif ( isset($parent_file) && (false !== $pos = strpos($parent_file, 'post_type=')) )
-        $typenow = substr($parent_file, $pos + 10);
-else
-        $typenow = '';
 
 $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
@@ -120 +105 @@
 </div>
 
-<?php favorite_actions($hook_suffix); ?>
+<?php favorite_actions($current_screen); ?>
 </div>
 </div>
 
 <div id="wpbody">
-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
+<?php
+require(ABSPATH . 'wp-admin/menu-header.php');
+
+$current_screen->parent_file = $parent_file;
+$current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
+$current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base);
+?>
 
 <div id="wpbody-content">
 <?php
-screen_meta($hook_suffix);
+screen_meta($current_screen);
 
 do_action('admin_notices');

trunk/wp-admin/admin.php

@@ -178 +178 @@
         do_action('admin_action_' . $_REQUEST['action']);
 
+$hook_suffix = '';
+if ( isset($page_hook) )
+        $hook_suffix = $page_hook;
+else if ( isset($plugin_page) )
+        $hook_suffix = $plugin_page;
+else if ( isset($pagenow) )
+        $hook_suffix = $pagenow;
+
+if ( isset($_GET['post_type']) )
+        $typenow = $_GET['post_type'];
+else
+        $typenow = '';
+// @todo validate typenow against post types.
+
+/**
+ * Global object containing info about the current screen.
+ */
+$current_screen = $hook_suffix;
+$current_screen = str_replace('.php', '', $current_screen);
+$current_screen = str_replace('-new', '', $current_screen);
+$current_screen = str_replace('-add', '', $current_screen);
+$current_screen = array('id' => $current_screen, 'base' => $current_screen);
+$current_screen = (object) $current_screen;
+if ( 'edit' == $current_screen->id ) {
+        if ( empty($typenow) )
+                $typenow = 'post';
+        $current_screen->id .= '-' . $typenow;
+        $current_screen->post_type = $typenow;
+} elseif ( 'post' == $current_screen->id ) {
+        if ( empty($typenow) )
+                $typenow = 'post';
+        $current_screen->id = $typenow;
+        $current_screen->post_type = $typenow;
+} else {
+        $typenow = '';
+}
+
+$current_screen = apply_filters('current_screen', $current_screen);
+
 ?>

trunk/wp-admin/edit-form-advanced.php

@@ -143 +143 @@
 do_action('do_meta_boxes', $post_type, 'side', $post);
 
+add_contextual_help($current_screen, drag_drop_help());
+
 require_once('admin-header.php');
 ?>

trunk/wp-admin/edit-link-form.php

@@ -34 +34 @@
 do_action('do_meta_boxes', 'link', 'advanced', $link);
 do_action('do_meta_boxes', 'link', 'side', $link);
+
+add_contextual_help($current_screen, drag_drop_help());
 
 require_once ('admin-header.php');

trunk/wp-admin/edit-post-rows.php

@@ -14 +14 @@
         <thead>
         <tr>
-<?php print_column_headers('edit'); ?>
+<?php print_column_headers( $current_screen ); ?>
         </tr>
         </thead>
@@ -20 +20 @@
         <tfoot>
         <tr>
-<?php print_column_headers('edit', false); ?>
+<?php print_column_headers($current_screen, false); ?>
         </tr>
         </tfoot>
 
         <tbody>
-<?php post_rows(); ?>
+<?php
+if ( $post_type_object->hierarchical )
+        page_rows($posts, $pagenum, $per_page);
+else
+        post_rows();
+?>
         </tbody>
 </table>

trunk/wp-admin/edit.php

@@ -21 +21 @@
 }
 
-if ( isset($_GET['post_type']) && in_array( $_GET['post_type'], get_post_types( array('_show' => true) ) ) )
+if ( isset($_GET['post_type']) && ( in_array( $_GET['post_type'], get_post_types( array('_show' => true ) ) ) || in_array( $_GET['post_type'], get_post_types( array('_builtin' => true ) ) ) ) )
         $post_type = $_GET['post_type'];
 else
@@ -28 +28 @@
 
 $post_type_object = get_post_type_object($post_type);
+$post_type_cap = $post_type_object->capability_type;
 
 if ( 'post' != $post_type ) {
@@ -38 +39 @@
         $post_new_file = 'post-new.php';
 }
+
+$pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
+if ( empty($pagenum) )
+        $pagenum = 1;
+$per_page = 'edit_' . $post_type . '_per_page';
+$per_page = (int) get_user_option( $per_page );
+if ( empty( $per_page ) || $per_page < 1 )
+        $per_page = 15;
+// @todo filter based on type
+$per_page = apply_filters( 'edit_posts_per_page', $per_page );
 
 // Handle bulk actions
@@ -62 +73 @@
                         $trashed = 0;
                         foreach( (array) $post_ids as $post_id ) {
-                                if ( !current_user_can('delete_post', $post_id) )
-                                        wp_die( __('You are not allowed to move this post to the trash.') );
+                                if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+                                        wp_die( __('You are not allowed to move this item to the trash.') );
 
                                 if ( !wp_trash_post($post_id) )
@@ -75 +86 @@
                         $untrashed = 0;
                         foreach( (array) $post_ids as $post_id ) {
-                                if ( !current_user_can('delete_post', $post_id) )
-                                        wp_die( __('You are not allowed to restore this post from the trash.') );
+                                if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
+                                        wp_die( __('You are not allowed to restore this item from the trash.') );
 
                                 if ( !wp_untrash_post($post_id) )
@@ -90 +101 @@
                                 $post_del = & get_post($post_id);
 
-                                if ( !current_user_can('delete_post', $post_id) )
-                                        wp_die( __('You are not allowed to delete this post.') );
+                                if ( !current_user_can('delete_' .  $post_type_cap, $post_id) )
+                                        wp_die( __('You are not allowed to delete this item.') );
 
                                 if ( $post_del->post_type == 'attachment' ) {
@@ -131 +142 @@
 
 $user_posts = false;
-if ( !current_user_can('edit_others_posts') ) {
+if ( !current_user_can('edit_others_' . $post_type_cap . 's') ) {
         $user_posts_count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(1) FROM $wpdb->posts WHERE post_type = '%s' AND post_status != 'trash' AND post_author = %d", $post_type, $current_user->ID) );
         $user_posts = true;
@@ -140 +151 @@
 $avail_post_stati = wp_edit_posts_query();
 
+if ( $post_type_object->hierarchical )
+        $num_pages = ceil($wp_query->post_count / $per_page);
+else
+        $num_pages = $wp_query->max_num_pages;
+
 require_once('admin-header.php');
-
-if ( !isset( $_GET['paged'] ) )
-        $_GET['paged'] = 1;
 
 if ( empty($_GET['mode']) )
@@ -159 +172 @@
 <?php
 if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
-<div id="message" class="updated"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
+<div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 endif; ?>
@@ -174 +187 @@
 
 if ( isset($_GET['locked']) && (int) $_GET['locked'] ) {
-        printf( _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
+        printf( _n( '%s item not updated, somebody is editing it.', '%s items not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
         unset($_GET['locked']);
 }
 
 if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
-        printf( _n( 'Post permanently deleted.', '%s posts permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
+        printf( _n( 'Item permanently deleted.', '%s items permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
         unset($_GET['deleted']);
 }
 
 if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
-        printf( _n( 'Post moved to the trash.', '%s posts moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
+        printf( _n( 'Item moved to the trash.', '%s items moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
         $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
         echo ' <a href="' . esc_url( wp_nonce_url( "edit.php?doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a><br />';
@@ -191 +204 @@
 
 if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
-        printf( _n( 'Post restored from the trash.', '%s posts restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
+        printf( _n( 'Item restored from the trash.', '%s items restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
         unset($_GET['undeleted']);
 }
@@ -213 +226 @@
         if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user->ID ) )
                 $class = ' class="current"';
-        $status_links[] = "<li><a href='edit.php?author=$current_user->ID'$class>" . sprintf( _nx( 'My Posts <span class="count">(%s)</span>', 'My Posts <span class="count">(%s)</span>', $user_posts_count, 'posts' ), number_format_i18n( $user_posts_count ) ) . '</a>';
+        $status_links[] = "<li><a href='edit.php?author=$current_user->ID'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $user_posts_count, 'posts' ), number_format_i18n( $user_posts_count ) ) . '</a>';
         $allposts = '?all_posts=1';
 }
@@ -262 +275 @@
         'prev_text' => __('&laquo;'),
         'next_text' => __('&raquo;'),
-        'total' => $wp_query->max_num_pages,
-        'current' => $_GET['paged']
+        'total' => $num_pages,
+        'current' => $pagenum
 ));
 
@@ -319 +332 @@
 
 <?php
-$dropdown_options = array('show_option_all' => __('View all categories'), 'hide_empty' => 0, 'hierarchical' => 1,
-        'show_count' => 0, 'orderby' => 'name', 'selected' => $cat);
-wp_dropdown_categories($dropdown_options);
-do_action('restrict_manage_posts');
+if ( is_object_in_taxonomy($post_type, 'category') ) {
+        $dropdown_options = array('show_option_all' => __('View all categories'), 'hide_empty' => 0, 'hierarchical' => 1,
+                'show_count' => 0, 'orderby' => 'name', 'selected' => $cat);
+        wp_dropdown_categories($dropdown_options);
+        do_action('restrict_manage_posts');
+}
 ?>
 <input type="submit" id="post-query-submit" value="<?php esc_attr_e('Filter'); ?>" class="button-secondary" />
 <?php }
 
-if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
+if ( $is_trash && current_user_can('edit_others_' . $post_type_cap .'s') ) { ?>
 <input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>
@@ -334 +349 @@
 <?php if ( $page_links ) { ?>
 <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-        number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
-        number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
+        number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
+        number_format_i18n( min( $pagenum * $per_page, $wp_query->found_posts ) ),
         number_format_i18n( $wp_query->found_posts ),
         $page_links
@@ -374 +389 @@
 </select>
 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
+<?php if ( $is_trash && current_user_can('edit_others_' . $post_type_cap . 's') ) { ?>
 <input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>
@@ -394 +409 @@
 </form>
 
-<?php inline_edit_row( 'post' ); ?>
+<?php inline_edit_row( $current_screen ); ?>
 
 <div id="ajax-response"></div>

trunk/wp-admin/includes/misc.php

@@ -411 +411 @@
                 switch ( $map_option ) {
                         case 'edit_per_page':
-                        case 'edit_pages_per_page':
                         case 'edit_comments_per_page':
                         case 'upload_per_page':

trunk/wp-admin/includes/post.php

@@ -820 +820 @@
         $post_stati  = get_post_stati();
 
-        if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types( array('_show' => true) ) ) )
+        if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
                 $post_type = $q['post_type'];
         else
                 $post_type = 'post';
+        $post_type_object = get_post_type_object($post_type);
 
         $avail_post_stati = get_available_post_statuses($post_type);
@@ -843 +844 @@
         }
 
-        if ( 'post' != $post_type )
-                $per_page = 'edit_' . $post_type . '_per_page';
-        else
-                $per_page = 'edit_per_page';
-        $posts_per_page = (int) get_user_option( 'edit_per_page' );
+        $per_page = 'edit_' . $post_type . '_per_page';
+        $posts_per_page = (int) get_user_option( $per_page );
         if ( empty( $posts_per_page ) || $posts_per_page < 1 )
                 $posts_per_page = 15;
-        $posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page );
-
-        wp( compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page') );
+        $posts_per_page = apply_filters( $per_page, $posts_per_page );
+
+
+        $query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
+
+        // Hierarchical types require special args.
+        if ( $post_type_object->hierarchical ) {
+                $query['orderby'] = 'menu_order title';
+                $query['order'] = 'asc';
+                $query['posts_per_page'] = -1;
+                $query['posts_per_archive_page'] = -1;
+        }
+
+        wp( $query );
 
         return $avail_post_stati;

trunk/wp-admin/includes/template.php

@@ -749 +749 @@
  * @return unknown
  */
-function wp_manage_posts_columns() {
-        global $typenow;
+function wp_manage_posts_columns( $screen = '') {
+        if ( empty($screen) )
+                $post_type = 'post';
+        else
+                $post_type = $screen->post_type;
 
         $posts_columns = array();
         $posts_columns['cb'] = '<input type="checkbox" />';
         /* translators: manage posts column name */
-        $posts_columns['title'] = _x('Post', 'column name');
+        $posts_columns['title'] = _x('Title', 'column name');
         $posts_columns['author'] = __('Author');
-        if ( empty($typenow) || is_object_in_taxonomy($typenow, 'category') )
+        if ( empty($post_type) || is_object_in_taxonomy($post_type, 'category') )
                 $posts_columns['categories'] = __('Categories');
-        if ( empty($typenow) || is_object_in_taxonomy($typenow, 'category') )
+        if ( empty($post_type) || is_object_in_taxonomy($post_type, 'category') )
                 $posts_columns['tags'] = __('Tags');
         $post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
-        if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($typenow) || post_type_supports($typenow, 'comments') ) )
+        if ( !in_array( $post_status, array('pending', 'draft', 'future') ) && ( empty($post_type) || post_type_supports($post_type, 'comments') ) )
                 $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="images/comment-grey-bubble.png" /></div>';
         $posts_columns['date'] = __('Date');
+        // @todo filter per type
         $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
 
@@ -805 +809 @@
  */
 function wp_manage_pages_columns() {
-        $posts_columns = array();
-        $posts_columns['cb'] = '<input type="checkbox" />';
-        $posts_columns['title'] = __('Title');
-        $posts_columns['author'] = __('Author');
-        $post_status = !empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
-        if ( !in_array( $post_status, array('pending', 'draft', 'future') ) )
-                $posts_columns['comments'] = '<div class="vers"><img alt="" src="images/comment-grey-bubble.png" /></div>';
-        $posts_columns['date'] = __('Date');
-        $posts_columns = apply_filters('manage_pages_columns', $posts_columns);
-
-        return $posts_columns;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $page
+        return wp_manage_posts_columns();
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $screen
  * @return unknown
  */
-function get_column_headers($page) {
+function get_column_headers($screen) {
         global $_wp_column_headers;
 
@@ -832 +826 @@
                 $_wp_column_headers = array();
 
-        $map_screen = $page;
-        $type = str_replace('edit-', '', $map_screen);
-        if ( in_array($type, get_post_types()) )
-                $map_screen = 'edit';
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
 
         // Store in static to avoid running filters on each call
-        if ( isset($_wp_column_headers[$page]) )
-                return $_wp_column_headers[$page];
-
-        switch ($map_screen) {
+        if ( isset($_wp_column_headers[$screen->id]) )
+                return $_wp_column_headers[$screen->id];
+
+        switch ($screen->base) {
                 case 'edit':
-                         $_wp_column_headers[$page] = wp_manage_posts_columns();
+                         $_wp_column_headers[$screen->id] = wp_manage_posts_columns( $screen );
                          break;
-                case 'edit-pages':
-                        $_wp_column_headers[$page] = wp_manage_pages_columns();
-                        break;
                 case 'edit-comments':
-                        $_wp_column_headers[$page] = array(
+                        $_wp_column_headers[$screen->id] = array(
                                 'cb' => '<input type="checkbox" />',
                                 'author' => __('Author'),
@@ -860 +849 @@
                         break;
                 case 'link-manager':
-                        $_wp_column_headers[$page] = array(
+                        $_wp_column_headers[$screen->id] = array(
                                 'cb' => '<input type="checkbox" />',
                                 'name' => __('Name'),
@@ -872 +861 @@
                         break;
                 case 'upload':
-                        $_wp_column_headers[$page] = wp_manage_media_columns();
+                        $_wp_column_headers[$screen->id] = wp_manage_media_columns();
                         break;
                 case 'categories':
-                        $_wp_column_headers[$page] = array(
+                        $_wp_column_headers[$screen->id] = array(
                                 'cb' => '<input type="checkbox" />',
                                 'name' => __('Name'),
@@ -885 +874 @@
                         break;
                 case 'edit-link-categories':
-                        $_wp_column_headers[$page] = array(
+                        $_wp_column_headers[$screen->id] = array(
                                 'cb' => '<input type="checkbox" />',
                                 'name' => __('Name'),
@@ -895 +884 @@
                         break;
                 case 'edit-tags':
-                        $_wp_column_headers[$page] = array(
+                        $_wp_column_headers[$screen->id] = array(
                                 'cb' => '<input type="checkbox" />',
                                 'name' => __('Name'),
@@ -905 +894 @@
                         break;
                 case 'users':
-                        $_wp_column_headers[$page] = array(
+                        $_wp_column_headers[$screen->id] = array(
                                 'cb' => '<input type="checkbox" />',
                                 'username' => __('Username'),
@@ -915 +904 @@
                         break;
                 default :
-                        $_wp_column_headers[$page] = array();
-        }
-
-        $_wp_column_headers[$page] = apply_filters('manage_' . $page . '_columns', $_wp_column_headers[$page]);
-        return $_wp_column_headers[$page];
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $type
+                        $_wp_column_headers[$screen->id] = array();
+        }
+
+        $_wp_column_headers[$screen->id] = apply_filters('manage_' . $screen->id . '_columns', $_wp_column_headers[$screen->id]);
+        return $_wp_column_headers[$screen->id];
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $screen
  * @param unknown_type $id
  */
-function print_column_headers( $type, $id = true ) {
-        $type = str_replace('.php', '', $type);
-        $columns = get_column_headers( $type );
-        $hidden = get_hidden_columns($type);
+function print_column_headers( $screen, $id = true ) {
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
+
+        $columns = get_column_headers( $screen );
+        $hidden = get_hidden_columns($screen);
         $styles = array();
 
@@ -952 +943 @@
                         $style = 'display:none;';
 
-                if ( isset($styles[$type]) && isset($styles[$type][$column_key]) )
-                        $style .= ' ' . $styles[$type][$column_key];
+                if ( isset($styles[$screen->id]) && isset($styles[$screen->id][$column_key]) )
+                        $style .= ' ' . $styles[$screen>id][$column_key];
                 $style = ' style="' . $style . '"';
 ?>
@@ -972 +963 @@
         global $_wp_column_headers;
 
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
+
         if ( !isset($_wp_column_headers) )
                 $_wp_column_headers = array();
 
-        $_wp_column_headers[$screen] = $columns;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $page
- */
-function get_hidden_columns($page) {
-        $page = str_replace('.php', '', $page);
-        return (array) get_user_option( 'manage-' . $page . '-columns-hidden' );
+        $_wp_column_headers[$screen->id] = $columns;
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $screen
+ */
+function get_hidden_columns($screen) {
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
+
+        return (array) get_user_option( 'manage-' . $screen->id. '-columns-hidden' );
 }
 
@@ -999 +995 @@
  * @param string $type 'post' or 'page'
  */
-function inline_edit_row( $type ) {
+function inline_edit_row( $screen ) {
         global $current_user, $mode;
 
-        $is_page = 'page' == $type;
-        if ( $is_page ) {
-                $screen = 'edit-pages';
-                $post = get_default_page_to_edit();
-        } else {
-                $screen = 'edit';
-                $post = get_default_post_to_edit();
-        }
-
-        $columns = $is_page ? wp_manage_pages_columns() : wp_manage_posts_columns();
+        if ( is_string($screen) ) {
+                $screen = array('id' => 'edit-' . $screen, 'base' => 'edit', 'post_type' => $screen );
+                $screen = (object) $screen;
+        }
+
+        $post = get_default_post_to_edit( $screen->post_type );
+        $post_type_object = get_post_type_object( $screen->post_type );
+
+        $columns = wp_manage_posts_columns($screen);
         $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($screen) ) );
         $col_count = count($columns) - count($hidden);
         $m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
-        $can_publish = current_user_can("publish_{$type}s");
+        // @todo use capability_type
+        $can_publish = current_user_can("publish_{$screen->post_type}s");
         $core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
 
@@ -1025 +1021 @@
         while ( $bulk < 2 ) { ?>
 
-        <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$type ";
-                echo $bulk ? "bulk-edit-row bulk-edit-row-$type" : "quick-edit-row quick-edit-row-$type";
+        <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$screen->post_type ";
+                echo $bulk ? "bulk-edit-row bulk-edit-row-$screen->post_type" : "quick-edit-row quick-edit-row-$screen->post_type";
         ?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
 
         <fieldset class="inline-edit-col-left"><div class="inline-edit-col">
-                <h4><?php echo $bulk ? ( $is_page ? __( 'Bulk Edit Pages' ) : __( 'Bulk Edit Posts' ) ) : __( 'Quick Edit' ); ?></h4>
+                <h4><?php echo $bulk ? ( __( 'Bulk Edit' ) ) : __( 'Quick Edit' ); ?></h4>
 
 
@@ -1063 +1059 @@
 <?php endif; // $bulk
 
-                $authors = get_editable_user_ids( $current_user->id, true, $type ); // TODO: ROLE SYSTEM
+                $authors = get_editable_user_ids( $current_user->id, true, $screen->post_type ); // TODO: ROLE SYSTEM
                 $authors_dropdown = '';
                 if ( $authors && count( $authors ) > 1 ) :
@@ -1093 +1089 @@
                         <label class="alignleft inline-edit-private">
                                 <input type="checkbox" name="keep_private" value="private" />
-                                <span class="checkbox-title"><?php echo $is_page ? __('Private page') : __('Private post'); ?></span>
+                                <span class="checkbox-title"><?php echo __('Private'); ?></span>
                         </label>
                 </div>
@@ -1101 +1097 @@
         </div></fieldset>
 
-<?php if ( !$is_page && !$bulk ) : ?>
+<?php if ( is_object_in_taxonomy($screen->post_type, 'categories') && !$bulk ) : ?>
 
         <fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
@@ -1113 +1109 @@
         </div></fieldset>
 
-<?php endif; // !$is_page && !$bulk ?>
+<?php endif; // !hierarchical && !$bulk ?>
 
         <fieldset class="inline-edit-col-right"><div class="inline-edit-col">
@@ -1122 +1118 @@
 ?>
 
-<?php if ( $is_page ) : ?>
+<?php if ( $post_type_object->hierarchical ) : ?>
 
                 <label>
@@ -1222 +1218 @@
                         </label>
 
-<?php if ( !$is_page && $can_publish && current_user_can( 'edit_others_posts' ) ) : ?>
+<?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( 'edit_others_posts' ) ) : ?>
 
 <?php   if ( $bulk ) : ?>
@@ -1261 +1257 @@
                 <?php if ( ! $bulk ) {
                         wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
-                        $update_text = ( $is_page ) ? __( 'Update Page' ) : __( 'Update Post' );
+                        $update_text = __( 'Update' );
                         ?>
                         <a accesskey="s" href="#inline-edit" title="<?php _e('Update'); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
                         <img class="waiting" style="display:none;" src="images/wpspin_light.gif" alt="" />
                 <?php } else {
-                        $update_text = ( $is_page ) ? __( 'Update Pages' ) : __( 'Update Posts' );
+                        $update_text = __( 'Update' );
                 ?>
                         <input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo esc_attr( $update_text ); ?>" />
@@ -1370 +1366 @@
  */
 function _post_row($a_post, $pending_comments, $mode) {
-        global $post, $current_user;
+        global $post, $current_user, $current_screen;
         static $rowclass;
 
@@ -1384 +1380 @@
         <tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status ); ?> iedit' valign="top">
 <?php
-        $posts_columns = get_column_headers('edit');
-        $hidden = get_hidden_columns('edit');
+        $posts_columns = get_column_headers( $current_screen );
+        $hidden = get_hidden_columns( $current_screen );
         foreach ( $posts_columns as $column_name=>$column_display_name ) {
                 $class = "class=\"$column_name column-$column_name\"";
@@ -1580 +1576 @@
  */
 function display_page_row( $page, $level = 0 ) {
-        global $post;
+        global $post, $current_screen;
         static $rowclass;
 
@@ -1607 +1603 @@
         $id = (int) $page->ID;
         $rowclass = 'alternate' == $rowclass ? '' : 'alternate';
-        $posts_columns = get_column_headers('edit-pages');
-        $hidden = get_hidden_columns('edit-pages');
+        $posts_columns = get_column_headers( $current_screen );
+        $hidden = get_hidden_columns(  $current_screen );
         $title = _draft_or_post_title();
 ?>
@@ -3057 +3053 @@
  * @since unknown
  *
- * @param unknown_type $page
- */
-function meta_box_prefs($page) {
+ * @param unknown_type $screen
+ */
+function meta_box_prefs($screen) {
         global $wp_meta_boxes;
 
-        if ( empty($wp_meta_boxes[$page]) )
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
+
+        if ( empty($wp_meta_boxes[$screen->id]) )
                 return;
 
-        $hidden = get_hidden_meta_boxes($page);
-
-        foreach ( array_keys($wp_meta_boxes[$page]) as $context ) {
-                foreach ( array_keys($wp_meta_boxes[$page][$context]) as $priority ) {
-                        foreach ( $wp_meta_boxes[$page][$context][$priority] as $box ) {
+        $hidden = get_hidden_meta_boxes($screen);
+
+        foreach ( array_keys($wp_meta_boxes[$screen->id]) as $context ) {
+                foreach ( array_keys($wp_meta_boxes[$screen->id][$context]) as $priority ) {
+                        foreach ( $wp_meta_boxes[$screen->id][$context][$priority] as $box ) {
                                 if ( false == $box || ! $box['title'] )
                                         continue;
@@ -3084 +3083 @@
 }
 
-function get_hidden_meta_boxes($page) {
-        $hidden = (array) get_user_option( "meta-box-hidden_$page" );
+function get_hidden_meta_boxes($screen) {
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
+
+        $hidden = (array) get_user_option( "meta-box-hidden_$screen->id" );
 
         // Hide slug boxes by default
@@ -3280 +3282 @@
  */
 function favorite_actions( $screen = null ) {
-        switch ( $screen ) {
-                case 'post-new.php':
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
+
+        switch ( $screen->id ) {
+                case 'post':
                         $default_action = array('edit.php' => array(__('Edit Posts'), 'edit_posts'));
                         break;
-                case 'edit-pages.php':
-                        $default_action = array('page-new.php' => array(__('New Page'), 'edit_pages'));
+                case 'edit-page':
+                        $default_action = array('post-new.php?post_type=page' => array(__('New Page'), 'edit_pages'));
                         break;
-                case 'page-new.php':
-                        $default_action = array('edit-pages.php' => array(__('Edit Pages'), 'edit_pages'));
+                case 'page':
+                        $default_action = array('edit.php?post_type=page' => array(__('Edit Pages'), 'edit_pages'));
                         break;
                 case 'upload.php':
                         $default_action = array('media-new.php' => array(__('New Media'), 'upload_files'));
                         break;
-                case 'media-new.php':
+                case 'media':
                         $default_action = array('upload.php' => array(__('Edit Media'), 'upload_files'));
                         break;
-                case 'link-manager.php':
+                case 'link-manager':
                         $default_action = array('link-add.php' => array(__('New Link'), 'manage_links'));
                         break;
-                case 'link-add.php':
+                case 'link-add':
                         $default_action = array('link-manager.php' => array(__('Edit Links'), 'manage_links'));
                         break;
-                case 'users.php':
+                case 'users':
                         $default_action = array('user-new.php' => array(__('New User'), 'create_users'));
                         break;
-                case 'user-new.php':
+                case 'user':
                         $default_action = array('users.php' => array(__('Edit Users'), 'edit_users'));
                         break;
-                case 'plugins.php':
+                case 'plugins':
                         $default_action = array('plugin-install.php' => array(__('Install Plugins'), 'install_plugins'));
                         break;
-                case 'plugin-install.php':
+                case 'plugin-install':
                         $default_action = array('plugins.php' => array(__('Manage Plugins'), 'activate_plugins'));
                         break;
-                case 'themes.php':
+                case 'themes':
                         $default_action = array('theme-install.php' => array(__('Install Themes'), 'install_themes'));
                         break;
-                case 'theme-install.php':
+                case 'theme-install':
                         $default_action = array('themes.php' => array(__('Manage Themes'), 'switch_themes'));
                         break;
@@ -3485 +3490 @@
 }
 
-function screen_meta($screen) {
-        global $wp_meta_boxes, $_wp_contextual_help, $typenow;
-
+// Convert a screen string to a screen object
+function convert_to_screen( $screen ) {
         $screen = str_replace('.php', '', $screen);
         $screen = str_replace('-new', '', $screen);
@@ -3493 +3497 @@
         $screen = apply_filters('screen_meta_screen', $screen);
 
+        $screen = array('id' => $screen, 'base' => $screen);
+        return (object) $screen;
+}
+
+function screen_meta($screen) {
+        global $wp_meta_boxes, $_wp_contextual_help, $post_type;
+
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
+
         $column_screens = get_column_headers($screen);
         $meta_screens = array('index' => 'dashboard');
 
-        // Give post_type pages their own screen
-        if ( 'post' == $screen ) {
-                if ( !empty($typenow) )
-                        $screen = $typenow;
-        }
-        if ( 'edit' == $screen ) {
-                if ( !empty($typenow) )
-                        $screen = 'edit-' . $typenow;
-        }
-
-        if ( isset($meta_screens[$screen]) )
-                $screen = $meta_screens[$screen];
+        if ( isset($meta_screens[$screen->id]) ) {
+                $screen->id = $meta_screens[$screen->id];
+                $screen->base = $screen->id;
+        }
+
         $show_screen = false;
         $show_on_screen = false;
-        if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) ) {
+        if ( !empty($wp_meta_boxes[$screen->id]) || !empty($column_screens) ) {
                 $show_screen = true;
                 $show_on_screen = true;
@@ -3524 +3531 @@
         $settings = '';
 
-        switch ( $screen ) {
-                case 'post':
-                        if ( !isset($_wp_contextual_help['post']) ) {
-                                $help = drag_drop_help();
-                                $help .= '<p>' . __('<a href="http://codex.wordpress.org/Writing_Posts" target="_blank">Writing Posts</a>') . '</p>';
-                                $_wp_contextual_help['post'] = $help;
-                        }
-                        break;
-                case 'page':
-                        if ( !isset($_wp_contextual_help['page']) ) {
-                                $help = drag_drop_help();
-                                $_wp_contextual_help['page'] = $help;
-                        }
-                        break;
-                case 'dashboard':
-                        if ( !isset($_wp_contextual_help['dashboard']) ) {
-                                $help = '<p>' . __('The modules on this screen can be arranged in several columns. You can select the number of columns from the Screen Options tab.') . "</p>\n";
-                                $help .= drag_drop_help();
-                                $_wp_contextual_help['dashboard'] = $help;
-                        }
-                        break;
-                case 'link':
-                        if ( !isset($_wp_contextual_help['link']) ) {
-                                $help = drag_drop_help();
-                                $_wp_contextual_help['link'] = $help;
-                        }
-                        break;
-                case 'options-general':
-                        if ( !isset($_wp_contextual_help['options-general']) )
-                                $_wp_contextual_help['options-general'] = __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>');
-                        break;
-                case 'theme-install':
-                case 'plugin-install':
-                        if ( ( !isset($_GET['tab']) || 'dashboard' == $_GET['tab'] ) && !isset($_wp_contextual_help[$screen]) ) {
-                                $help = plugins_search_help();
-                                $_wp_contextual_help[$screen] = $help;
-                        }
-                        break;
+        switch ( $screen->id ) {
                 case 'widgets':
-                        if ( !isset($_wp_contextual_help['widgets']) ) {
-                                $help = widgets_help();
-                                $_wp_contextual_help['widgets'] = $help;
-                        }
                         $settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
                         $show_screen = true;
@@ -3606 +3572 @@
         <?php
         $contextual_help = '';
-        if ( isset($_wp_contextual_help[$screen]) ) {
+        if ( isset($_wp_contextual_help[$screen->id]) ) {
                 if ( !empty($title) )
                         $contextual_help .= '<h5>' . sprintf(__('Get help with &#8220;%s&#8221;'), $title) . '</h5>';
                 else
                         $contextual_help .= '<h5>' . __('Get help with this page') . '</h5>';
-                $contextual_help .= '<div class="metabox-prefs">' . $_wp_contextual_help[$screen] . "</div>\n";
+                $contextual_help .= '<div class="metabox-prefs">' . $_wp_contextual_help[$screen->id] . "</div>\n";
 
                 $contextual_help .= '<h5>' . __('Other Help') . '</h5>';
@@ -3653 +3619 @@
         global $_wp_contextual_help;
 
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
+
         if ( !isset($_wp_contextual_help) )
                 $_wp_contextual_help = array();
 
-        $_wp_contextual_help[$screen] = $help;
+        $_wp_contextual_help[$screen->id] = $help;
 }
 
@@ -3676 +3645 @@
 }
 
-function widgets_help() {
-        return '
-        <p>' . __('Widgets are added and arranged by simple drag &#8217;n&#8217; drop. If you hover your mouse over the titlebar of a widget, you&#8217;ll see a 4-arrow cursor which indicates that the widget is movable.  Click on the titlebar, hold down the mouse button and drag the widget to a sidebar. As you drag, you&#8217;ll see a dotted box that also moves. This box shows where the widget will go once you drop it.') . '</p>
-        <p>' . __('To remove a widget from a sidebar, drag it back to Available Widgets or click on the arrow on its titlebar to reveal its settings, and then click Remove.') . '</p>
-        <p>' . __('To remove a widget from a sidebar <em>and keep its configuration</em>, drag it to Inactive Widgets.') . '</p>
-        <p>' . __('The Inactive Widgets area stores widgets that are configured but not curently used. If you change themes and the new theme has fewer sidebars than the old, all extra widgets will be stored to Inactive Widgets automatically.') . '</p>
-';
-}
-
 function screen_layout($screen) {
         global $screen_layout_columns;
+
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
 
         $columns = array('dashboard' => 4, 'post' => 2, 'page' => 2, 'link' => 2);
@@ -3694 +3657 @@
                 $columns[$post_type] = 2;
 
-        $columns = apply_filters('screen_layout_columns', $columns, $screen);
-
-        if ( !isset($columns[$screen]) ) {
+        $columns = apply_filters('screen_layout_columns', $columns, $screen->id, $screen);
+
+        if ( !isset($columns[$screen->id]) ) {
                 $screen_layout_columns = 0;
                 return '';
         }
 
-        $screen_layout_columns = get_user_option("screen_layout_$screen");
-        $num = $columns[$screen];
+        $screen_layout_columns = get_user_option("screen_layout_$screen->id");
+        $num = $columns[$screen->id];
 
         if ( ! $screen_layout_columns )
@@ -3718 +3681 @@
 
 function screen_options($screen) {
-        $map_screen = $screen;
-        $type = str_replace('edit-', '', $map_screen);
-        if ( in_array($type, get_post_types()) )
-                $map_screen = 'edit';
-
-        switch ( $map_screen ) {
+        if ( is_string($screen) )
+                $screen = convert_to_screen($screen);
+
+        switch ( $screen->base ) {
                 case 'edit':
                         $per_page_label = __('Posts per page:');
@@ -3749 +3710 @@
         }
 
-        $option = str_replace( '-', '_', "${screen}_per_page" );
+        $option = str_replace( '-', '_', "{$screen->id}_per_page" );
         $per_page = (int) get_user_option( $option );
         if ( empty( $per_page ) || $per_page < 1 ) {
-                if ( 'plugins' == $screen )
+                if ( 'plugins' == $screen->id )
                         $per_page = 999;
                 else
@@ -3774 +3735 @@
 }
 
-function screen_icon($name = '') {
-        global $parent_file, $hook_suffix;
+function screen_icon($screen = '') {
+        global $current_screen;
+
+        if ( empty($screen) )
+                $screen = $current_screen;
+        elseif ( is_string($screen) )
+                $name = $screen;
 
         if ( empty($name) ) {
-                if ( isset($parent_file) && !empty($parent_file) ) {
-                        $name = $parent_file;
-                        if ( false !== $pos = strpos($name, '?post_type=') )
-                                $name = substr($name, 0, $pos);
-                        $name = substr($name, 0, -4);
-                }
+                if ( !empty($screen->parent_base) )
+                        $name = $screen->parent_base;
                 else
-                        $name = str_replace(array('.php', '-new', '-add'), '', $hook_suffix);
+                        $name = $screen->base;
         }
 ?>

trunk/wp-admin/index.php

@@ -24 +24 @@
 $title = __('Dashboard');
 $parent_file = 'index.php';
+
+add_contextual_help($current_screen, '<p>' . __('The modules on this screen can be arranged in several columns. You can select the number of columns from the Screen Options tab.') . "</p>\n" . drag_drop_help() );
+
 require_once('admin-header.php');
 

trunk/wp-admin/menu.php

@@ -69 +69 @@
         $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
 
-$menu[20] = array( __('Pages'), 'edit_pages', 'edit-pages.php', '', 'menu-top', 'menu-pages', 'div' );
-        $submenu['edit-pages.php'][5] = array( __('Edit'), 'edit_pages', 'edit-pages.php' );
+$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top', 'menu-pages', 'div' );
+        $submenu['edit.php?post_type=page'][5] = array( __('Edit'), 'edit_pages', 'edit.php?post_type=page' );
         /* translators: add new page */
-        $submenu['edit-pages.php'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
+        $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
 
 $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-comments', 'div' );

trunk/wp-admin/options-general.php

@@ -50 +50 @@
 }
 add_filter('admin_head', 'add_js');
+
+add_contextual_help($current_screen, __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">General Settings</a>'));
 
 include('./admin-header.php');

trunk/wp-admin/plugin-install.php

@@ -53 +53 @@
 do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information.
 
+add_contextual_help($current_screen, plugins_search_help());
+
 include('admin-header.php');
 ?>

trunk/wp-admin/plugins.php

@@ -237 +237 @@
 }
 
-add_contextual_help('plugins', $help);
+add_contextual_help($current_screen, $help);
 
 if ( is_multisite() && is_super_admin() ) {

trunk/wp-admin/post-new.php

@@ -18 +18 @@
         $parent_file = "edit.php?post_type=$post_type";
         $submenu_file = "post-new.php?post_type=$post_type";
-        if ( 'page' == $post_type )
-                $parent_file = 'edit-pages.php';
 } else {
         $parent_file = 'edit.php';

trunk/wp-admin/post.php

@@ -24 +24 @@
         $post_id = 0;
 $post_ID = $post_id;
-
 $post = null;
 $post_type_object = null;
 $post_type_cap = null;
+$post_type = null;
 if ( $post_id ) {
         $post = get_post($post_id);
         if ( $post ) {
                 $post_type_object = get_post_type_object($post->post_type);
-                if ( $post_type_object )
+                if ( $post_type_object ) {
+                        $post_type = $post->post_type;
+                        $current_screen->post_type = $post->post_type;
+                        $current_screen->id = $current_screen->post_type;
                         $post_type_cap = $post_type_object->capability_type;
+                }
+        }
+} elseif ( isset($_POST['post_type']) ) {
+        $post_type_object = get_post_type_object($_POST['post_type']);
+        if ( $post_type_object ) {
+                $post_type = $post_type_object->name;
+                $current_screen->post_type = $post_type;
+                $current_screen->id = $current_screen->post_type;
+                $post_type_cap = $post_type_object->capability_type;
         }
 }
@@ -109 +121 @@
 case 'post-quickpress-publish':
 case 'post-quickpress-save':
-        check_admin_referer('add-post');
+        check_admin_referer('add-' . $post_type);
 
         if ( 'post-quickpress-publish' == $action )
@@ -164 +176 @@
                 $parent_file = "edit.php";
                 $submenu_file = "edit.php";
-        } elseif ( 'page' == $post_type ) {
-                $parent_file = "edit-pages.php";
-                $submenu_file = "edit-pages.php";
-        } else {
-                if ( $post_type_object->hierarchical ) {
-                        $parent_file = "edit-pages.php?post_type=$post_type";
-                        $submenu_file = "edit-pages.php?post_type=$post_type";
-                } else {
-                        $parent_file = "edit.php?post_type=$post_type";
-                        $submenu_file = "edit.php?post_type=$post_type";
-                }
+        } else {
+                $parent_file = "edit.php?post_type=$post_type";
+                $submenu_file = "edit.php?post_type=$post_type";
         }
 
@@ -214 +218 @@
 
 case 'editpost':
-        check_admin_referer('update-' . $post->post_type . '_' . $post_id);
+        check_admin_referer('update-' . $post_type . '_' . $post_id);
 
         $post_id = edit_post();
@@ -224 +228 @@
 
 case 'trash':
-        check_admin_referer('trash-post_' . $post_id);
+        check_admin_referer('trash-' . $post_type . '_' . $post_id);
 
         $post = & get_post($post_id);
@@ -239 +243 @@
 
 case 'untrash':
-        check_admin_referer('untrash-post_' . $post_id);
+        check_admin_referer('untrash-' . $post_type . '_' . $post_id);
 
         if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
@@ -252 +256 @@
 
 case 'delete':
-        check_admin_referer('delete-post_' . $post_id);
+        check_admin_referer('delete-' . $post_type . '_' . $post_id);
 
         if ( !current_user_can('delete_' . $post_type_cap, $post_id) )
@@ -281 +285 @@
 
 default:
-        if ( $post_type_object->hierarchical )
-                wp_redirect('edit-pages.php');
-        else
                 wp_redirect('edit.php');
         exit();

trunk/wp-admin/theme-install.php

@@ -53 +53 @@
 do_action('install_themes_pre_' . $tab); //Used to override the general interface, Eg, install or theme information.
 
+add_contextual_help($current_screen, plugins_search_help());
+
 include('admin-header.php');
 ?>

trunk/wp-admin/themes.php

@@ -62 +62 @@
 }
 
-add_contextual_help('themes', $help);
+add_contextual_help($current_screen, $help);
 
 add_thickbox();

trunk/wp-admin/widgets.php

@@ -33 +33 @@
 $title = __( 'Widgets' );
 $parent_file = 'themes.php';
+
+$help = '
+        <p>' . __('Widgets are added and arranged by simple drag &#8217;n&#8217; drop. If you hover your mouse over the titlebar of a widget, you&#8217;ll see a 4-arrow cursor which indicates that the widget is movable.  Click on the titlebar, hold down the mouse button and drag the widget to a sidebar. As you drag, you&#8217;ll see a dotted box that also moves. This box shows where the widget will go once you drop it.') . '</p>
+        <p>' . __('To remove a widget from a sidebar, drag it back to Available Widgets or click on the arrow on its titlebar to reveal its settings, and then click Remove.') . '</p>
+        <p>' . __('To remove a widget from a sidebar <em>and keep its configuration</em>, drag it to Inactive Widgets.') . '</p>
+        <p>' . __('The Inactive Widgets area stores widgets that are configured but not curently used. If you change themes and the new theme has fewer sidebars than the old, all extra widgets will be stored to Inactive Widgets automatically.') . '</p>
+';
+add_contextual_help($current_screen, $help);
 
 // register the inactive_widgets area as sidebar