Changeset 8973

Timestamp:

09/25/2008 01:42:34 PM (18 years ago)

Author:

azaozz

Message:

Batch editing, first cut, see #6815

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• categories.php (modified) (1 diff)
• css/global.css (modified) (1 diff)
• edit-comments.php (modified) (1 diff)
• edit-link-categories.php (modified) (1 diff)
• edit-pages.php (modified) (4 diffs)
• edit-post-rows.php (modified) (1 diff)
• edit-tags.php (modified) (1 diff)
• edit.php (modified) (6 diffs)
• inbox.php (modified) (1 diff)
• includes/post.php (modified) (1 diff)
• includes/template.php (modified) (16 diffs)
• js/inline-edit.js (modified) (7 diffs)
• link-manager.php (modified) (1 diff)
• plugins.php (modified) (2 diffs)
• upload.php (modified) (1 diff)
• users.php (modified) (1 diff)
• wp-admin.css (modified) (7 diffs)

trunk/wp-admin/admin-ajax.php

@@ -732 +732 @@
         check_ajax_referer( 'inlineeditnonce', '_inline_edit' );
         
-        if ( ! isset($_POST['post_ID']) )
+        if ( ! isset($_POST['post_ID']) || ! ( $id = (int) $_POST['post_ID'] ) )
                 exit;
+
+        if ( $last = wp_check_post_lock( $id ) ) {
+                $last_user = get_userdata( $last );
+                $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
+                echo '<tr><td colspan="8"><div class="error"><p>' . sprintf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ),   wp_specialchars( $last_user_name ) ) . '</p></div></td></tr>';
+                exit;
+        }
         
         inline_save_row( $_POST );

trunk/wp-admin/categories.php

@@ -179 +179 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-categories'); ?>
 </div>

trunk/wp-admin/css/global.css

@@ -205 +205 @@
 }
 */
-.widefat .num {
+.widefat .num,
+.widefat .column-comments {
         text-align: center;
 }

trunk/wp-admin/edit-comments.php

@@ -196 +196 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" name="doaction" value="<?php _e('Apply'); ?>" class="button-secondary apply" />
+<input type="submit" name="doaction" id="doaction" value="<?php _e('Apply'); ?>" class="button-secondary apply" />
 <?php wp_nonce_field('bulk-comments'); ?>
 <?php if ( isset($_GET['apage']) ) { ?>

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

@@ -119 +119 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-link-categories'); ?>
 </div>

trunk/wp-admin/edit-pages.php

@@ -10 +10 @@
 require_once('admin.php');
 
-// Handle bulk deletes
-if ( isset($_GET['action']) && isset($_GET['post']) && isset($_GET['doaction']) ) {
-        check_admin_referer('bulk-pages');
-        if ( $_GET['action'] == 'delete' ) {
-                foreach( (array) $_GET['post'] as $post_id_del ) {
-                        $post_del = & get_post($post_id_del);
-
-                        if ( !current_user_can('delete_page', $post_id_del) )
-                                wp_die( __('You are not allowed to delete this page.') );
-
-                        if ( $post_del->post_type == 'attachment' ) {
-                                if ( ! wp_delete_attachment($post_id_del) )
-                                        wp_die( __('Error in deleting...') );
-                        } else {
-                                if ( !wp_delete_post($post_id_del) )
-                                        wp_die( __('Error in deleting...') );
+// Handle bulk actions
+if ( isset($_GET['action']) && $_GET['action'] != -1 ) {
+        switch ( $_GET['action'] ) {
+                case 'delete':
+                        if ( isset($_GET['post']) && isset($_GET['doaction']) ) {
+                                check_admin_referer('bulk-pages');
+                                foreach( (array) $_GET['post'] as $post_id_del ) {
+                                        $post_del = & get_post($post_id_del);
+                
+                                        if ( !current_user_can('delete_page', $post_id_del) )
+                                                wp_die( __('You are not allowed to delete this page.') );
+                
+                                        if ( $post_del->post_type == 'attachment' ) {
+                                                if ( ! wp_delete_attachment($post_id_del) )
+                                                        wp_die( __('Error in deleting...') );
+                                        } else {
+                                                if ( !wp_delete_post($post_id_del) )
+                                                        wp_die( __('Error in deleting...') );
+                                        }
+                                }
                         }
-                }
-
-                $sendback = wp_get_referer();
-                if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php');
-                elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
-                $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
-
-                wp_redirect($sendback);
-                exit();
+                        break;
+                case 'edit':
+                        if ( isset($_GET['post']) ) {
+                                check_admin_referer('bulk-pages');
+                                $_GET['post_status'] = $_GET['_status'];
+        
+                                if ( -1 == $_GET['post_author'] )
+                                        unset($_GET['post_author']);
+        
+                                $done = bulk_edit_posts($_GET);
+                        }
+                        break;
         }
+        $sendback = wp_get_referer();
+        if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php');
+        elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
+        $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
+        if ( isset($done) ) {
+                $done['upd'] = count( $done['upd'] );
+                $done['skip'] = count( $done['skip'] );
+                $sendback = add_query_arg( $done, $sendback );
+                unset($done);
+        }
+        wp_redirect($sendback);
+        exit();
 } elseif ( !empty($_GET['_wp_http_referer']) ) {
          wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
@@ -86 +105 @@
 </form>
 
+<?php if ( isset($_GET['upd']) && (int) $_GET['upd'] ) { ?>
+<div id="message" class="updated fade"><p>
+<?php printf( __ngettext( '%d page updated.', '%d pages updated.', $_GET['upd'] ), number_format_i18n( $_GET['upd'] ) );
+unset($_GET['upd']);
+        
+        if ( isset($_GET['skip']) && (int) $_GET['skip'] ) {
+                printf( __ngettext( ' %d page not updated. Somebody is editing it.', ' %d pages not updated. Somebody is editing them.', $_GET['skip'] ), number_format_i18n( $_GET['skip'] ) );
+                unset($_GET['skip']);
+        } ?>
+</p></div>
+<?php } ?>
+
 <div class="wrap">
 <form id="adv-settings" action="" method="get">
@@ -176 +207 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-pages'); ?>
 </div>
@@ -198 +229 @@
   </thead>
   <tbody>
-  <?php inline_edit_row( 'page' ) ?>
   <?php page_rows($posts, $pagenum, $per_page); ?>
   </tbody>
 </table>
 </form>
+
+<?php inline_edit_row( 'page' ) ?>
 
 <div id="ajax-response"></div>

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

@@ -16 +16 @@
         </thead>
         <tbody>
-          
-<?php inline_edit_row( 'post' ) ?>        
 
 <?php

trunk/wp-admin/edit-tags.php

@@ -185 +185 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-tags'); ?>
 </div>

trunk/wp-admin/edit.php

@@ -11 +11 @@
 
 // Handle bulk actions
-if ( isset($_GET['action']) && $_GET['action'] != -1 && isset($_GET['doaction']) ) {
+if ( isset($_GET['action']) && $_GET['action'] != -1 ) {
         switch ( $_GET['action'] ) {
                 case 'delete':
-                        if ( isset($_GET['post']) ) {
+                        if ( isset($_GET['post']) && isset($_GET['doaction']) ) {
                                 check_admin_referer('bulk-posts');
                                 foreach( (array) $_GET['post'] as $post_id_del ) {
@@ -33 +33 @@
                         break;
                 case 'edit':
-                        // TODO: Decide what to do here - add bulk edit feature, or just disallow if >1 post selected
+                        if ( isset($_GET['post']) ) {
+                                check_admin_referer('bulk-posts');
+                                $_GET['post_status'] = $_GET['_status'];
+        
+                                if ( -1 == $_GET['post_author'] )
+                                        unset($_GET['post_author']);
+        
+                                $done = bulk_edit_posts($_GET);
+                        }
                         break;
         }
+
         $sendback = wp_get_referer();
         if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('post-new.php');
         elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php');
         $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
-
+        if ( isset($done) ) {
+                $done['upd'] = count( $done['upd'] );
+                $done['skip'] = count( $done['skip'] );
+                $sendback = add_query_arg( $done, $sendback );
+                unset($done);
+        }
         wp_redirect($sendback);
         exit();
@@ -79 +93 @@
         </p>
 </form>
+
+<?php if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
+<div id="message" class="updated fade"><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>
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+endif; ?>
+
+<?php if ( isset($_GET['upd']) && (int) $_GET['upd'] ) { ?>
+<div id="message" class="updated fade"><p>
+<?php printf( __ngettext( '%d post updated.', '%d posts updated.', $_GET['upd'] ), number_format_i18n( $_GET['upd'] ) );
+unset($_GET['upd']);
+        
+        if ( isset($_GET['skip']) && (int) $_GET['skip'] ) {
+                printf( __ngettext( ' %d post not updated. Somebody is editing it.', ' %d posts not updated. Somebody is editing them.', $_GET['skip'] ), number_format_i18n( $_GET['skip'] ) );
+                unset($_GET['skip']);
+        } ?>
+</p></div>
+<?php } ?>
 
 <div class="wrap">
@@ -155 +186 @@
 <?php if ( isset($_GET['post_status'] ) ) : ?>
 <input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" />
-<?php endif;
-
-if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
-<div id="message" class="updated fade"><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>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
-endif;
-?>
-
+<?php endif; ?>
 <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
 
@@ -190 +214 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-posts'); ?>
 <?php
@@ -243 +267 @@
 
 </form>
+
+<?php inline_edit_row( 'post' ); ?>
 
 <div id="ajax-response"></div>

trunk/wp-admin/inbox.php

@@ -32 +32 @@
 <option value="archive"><?php _e('Archive'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 </div>
 <br class="clear" />

trunk/wp-admin/includes/post.php

@@ -176 +176 @@
 
         return $post_ID;
+}
+
+function bulk_edit_posts( $post_data = null ) {
+
+        if ( empty($post_data) )
+                $post_data = &$_POST;
+
+        if ( 'page' == $post_data['post_type'] ) {
+                if ( ! current_user_can( 'edit_pages' ) )
+                        wp_die( __('You are not allowed to edit pages.') );
+        } else {
+                if ( ! current_user_can( 'edit_posts' ) )
+                        wp_die( __('You are not allowed to edit posts.') );
+        }
+
+        $post_IDs = array_map( intval, (array) $post_data['post'] );
+
+        if ( isset($post_data['post_category']) ) {
+                if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) )
+                        $new_cats = array_map( absint, $post_data['post_category'] );
+                else
+                        unset($post_data['post_category']);
+        }
+
+        if ( isset($post_data['tags_input']) ) {
+                if ( ! empty($post_data['tags_input']) ) {
+                        $new_tags = preg_replace( '/\s*,\s*/', ',', rtrim($post_data['tags_input'], ' ,') );
+                        $new_tags = explode(',', $new_tags);
+                } else {
+                        unset($post_data['tags_input']);
+                }
+        }
+
+        $reset = array( 'post_author', 'post_status', 'post_password', 'post_parent', 'page_template', 'comment_status', 'ping_status', 'keep_private' );
+        foreach ( $reset as $field ) {
+                if ( isset($post_data[$field]) && '' == $post_data[$field] )
+                        unset($post_data[$field]);
+        }
+
+        $updated = $skipped = array();
+        foreach ( $post_IDs as $post_ID ) {
+
+                if ( wp_check_post_lock( $post_ID ) ) {
+                        $skipped[] = $post_ID;
+                        continue;
+                }
+
+                if ( isset($new_cats) ) {
+                        $cats = (array) wp_get_post_categories($post_ID);
+                        $post_data['post_category'] = array_unique( array_merge($cats, $new_cats) );
+                }
+
+                if ( isset($new_tags) ) {
+                        $tags = wp_get_post_tags($post_ID, array('fields' => 'names'));
+                        $post_data['tags_input'] = array_unique( array_merge($tags, $new_tags) );
+                }
+
+                $post_data['ID'] = $post_ID;
+                $updated[] = wp_update_post( $post_data );
+        }
+
+        return array( 'upd' => $updated, 'skip' => $skipped );
 }
 

trunk/wp-admin/includes/template.php

@@ -623 +623 @@
         $col_count = count($columns) - $hidden_count;
         $m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
-        ?>
-        <tr title="<?php _e('Double-click to cancel'); ?>" id="inline-edit" style="display: none"><td colspan="<?php echo $col_count; ?>">
+        $can_publish = current_user_can('publish_posts'); ?>
+
+<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
+        <?php
+        $bulk = 0;
+        while ( $bulk < 2 ) { ?>
+        
+        <tr title="<?php _e('Double-click to cancel'); ?>" id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" style="display: none"><td colspan="<?php echo $col_count; ?>">
         <?php
         foreach($columns as $column_name=>$column_display_name) {
@@ -641 +647 @@
                         case 'modified':
                         case 'date':
-                        ?>
+                                if ( ! $bulk ) { ?>
                                 <div <?php echo $attributes; ?> title="<?php _e('Timestamp'); ?>">
                                         <div class="title"><?php _e('Timestamp'); ?></div>
@@ -649 +655 @@
                                 </div>
                                 <?php
+                                }
                                 break;
 
                         case 'title':
                                 $attributes = "class=\"$type-title column-title quick-edit-div\"" . $style; ?>
+                                <?php if ( $bulk ) { ?>
+                                <div <?php echo $attributes; ?> id="bulk-title-div" title="<?php $is_page ? _e('Selected pages') : _e('Selected posts'); ?>">
+                                        <div class="title"><?php $is_page ? _e('Selected pages') : _e('Selected posts'); ?></div>
+                                        <div class="in">
+                                        <div id="bulk-titles"></div>
+                                        </div>
+                                </div>
+                                <?php } else { ?>
                                 <div <?php echo $attributes ?>>
                                         <div class="title"><?php _e('Title'); ?></div>
@@ -661 +676 @@
                                         </div>
                                 </div>
+                                <?php } ?>
+
                                 <?php if ( $is_page ) { ?>
                                 <div class="parent quick-edit-div" title="<?php _e('Page Parent'); ?>">
@@ -666 +683 @@
                                         <div class="in">
                                         <select name="post_parent">
+                                                <?php if ( $bulk ) { ?>
+                                                <option value=""><?php _e('- No Change -'); ?></option>
+                                                <?php } ?>
                                                 <option value="0"><?php _e('Main Page (no parent)'); ?></option>
                                                 <?php parent_dropdown(); ?>
@@ -671 +691 @@
                                         </div>
                                 </div>
+
                                 <div class="template quick-edit-div" title="<?php _e('Page Template'); ?>">
                                         <div class="title"><?php _e('Page Template'); ?></div>
                                         <div class="in">
                                         <select name="page_template">
-                                                <option value='default'><?php _e('Default Template'); ?></option>
+                                                <?php if ( $bulk ) { ?>
+                                                <option value=""><?php _e('- No Change -'); ?></option>
+                                                <?php } ?>
+                                                <option value="default"><?php _e('Default Template'); ?></option>
                                                 <?php page_template_dropdown() ?>
                                         </select>
                                         </div>
                                 </div>
+
+                                <?php if ( ! $bulk ) { ?>
                                 <div class="order quick-edit-div" title="<?php _e('Page Order'); ?>">
                                         <div class="title"><?php _e('Page Order'); ?></div>
@@ -687 +713 @@
                                 </div>
                                 <?php }
+                                }
 
                                 break;
 
                         case 'categories': ?>
+                                <?php if ( ! $bulk ) { ?>
                                 <div <?php echo $attributes ?> title="<?php _e('Categories'); ?>">
                                         <div class="title"><?php _e('Categories'); ?>
@@ -699 +727 @@
                                         </ul>
                                 </div>
-                                <?php
+                                <?php }
                                 break;
 
                         case 'tags': ?>
+                                <?php if ( ! $bulk ) { ?>
                                 <div <?php echo $attributes ?> title="<?php _e('Tags'); ?>">
                                         <div class="title"><?php _e('Tags'); ?></div>
@@ -709 +738 @@
                                         </div>
                                 </div>
-                                <?php
+                                <?php }
                                 break;
 
                         case 'comments':
-                                $attributes = 'class="comments column-comments num quick-edit-div"' . $style; ?>
+                                ?>
                                 <div <?php echo $attributes ?> title="<?php _e('Comments and Pings'); ?>">
                                         <div class="title"><?php _e('Comments and Pings'); ?></div>
                                         <div class="in">
+                                        <?php if ( $bulk ) { ?>
+                                        <select name="comment_status">
+                                                <option value=""><?php _e('- No Change -'); ?></option>
+                                                <option value="open"><?php _e('Allow Comments'); ?></option>
+                                                <option value="closed"><?php _e('Disallow Comments'); ?></option>
+                                        </select>
+                                        <select name="ping_status">
+                                                <option value=""><?php _e('- No Change -'); ?></option>
+                                                <option value="open"><?php _e('Allow Pings'); ?></option>
+                                                <option value="closed"><?php _e('Disallow Pings'); ?></option>
+                                        </select>
+                                        <?php } else { ?>
                                         <label><input type="checkbox" name="comment_status" value="open" />
                                         <?php _e('Allow Comments'); ?></label><br />
                                         <label><input type="checkbox" name="ping_status" value="open" />
                                         <?php _e('Allow Pings'); ?></label>
+                                        <?php } ?>
                                         </div>
                                 </div>
@@ -732 +774 @@
                                         <div class="title"><?php _e('Author'); ?></div>
                                         <div class="in">
-                                        <?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'selected' => $post->post_author) ); ?>
+                                        <?php 
+                                        $users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors');
+                                        if ( $bulk ) $users_opt['show_option_none'] = __('- No Change -');
+                                        wp_dropdown_users( $users_opt ); ?>
                                         </div>
                                 </div>
                                 <?php } ?>
 
+                                <?php if ( ! $bulk ) { ?>
                                 <div class="password quick-edit-div" title="<?php _e('Password'); ?>">
                                         <div class="title"><?php _e('Password'); ?></div>
                                         <div class="in">
-                                        <input type="text" name="post_password" value="<?php the_post_password(); ?>" />
+                                        <input type="text" name="post_password" value="" />
                                         <label title="<?php _e('Privacy'); ?>">
                                         <input type="checkbox" name="keep_private" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php echo $is_page ? __('Keep this page private') : __('Keep this post private'); ?></label>
                                         </div>
                                 </div>
-                                <?php
+                                <?php }
                                 break;
 
@@ -753 +799 @@
                                         <div class="in">
                                         <select name="_status">
-                                                <?php if ( current_user_can('publish_posts') ) { // Contributors only get "Unpublished" and "Pending Review" ?>
-                                                <option value='publish'><?php _e('Published') ?></option>
-                                                <option value='future'><?php _e('Scheduled') ?></option>
+                                                <?php if ( $bulk ) { ?>
+                                                <option value=""><?php _e('- No Change -'); ?></option>
+                                                        <?php if ( $can_publish ) { ?>
+                                                        <option value="private"><?php _e('Private') ?></option>
+                                                        <?php } ?>
                                                 <?php } ?>
-                                                <option value='pending'><?php _e('Pending Review') ?></option>
-                                                <option value='draft'><?php _e('Unpublished') ?></option>
+                                                <?php if ( $can_publish ) { // Contributors only get "Unpublished" and "Pending Review" ?>
+                                                <option value="publish"><?php _e('Published') ?></option>
+                                                <option value="future"><?php _e('Scheduled') ?></option>
+                                                <?php } ?>
+                                                <option value="pending"><?php _e('Pending Review') ?></option>
+                                                <option value="draft"><?php _e('Unpublished') ?></option>
                                         </select>
                                         </div>
                                 </div>
 
-                                <?php if ( current_user_can( 'edit_others_posts' ) && ! $is_page ) { ?>
+                                <?php if ( ! $is_page && ! $bulk && current_user_can( 'edit_others_posts' ) ) { ?>
                                 <div class="sticky quick-edit-div" <?php echo $style; ?> title="<?php _e('Sticky') ?>">
                                         <div class="title"><?php _e('Sticky'); ?></div>
@@ -774 +826 @@
                                 break;
 
-                        case 'control_view': ?>
-                                <div><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></div>
-                                <?php
-                                break;
-
-                        case 'control_edit': ?>
-                                <div><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></div>
-                                <?php
-                                break;
-
-                        case 'control_delete': ?>
-                                <div><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></div>
-                                <?php
-                                break;
-
-                        default: ?>
-                                <div><?php do_action('manage_posts_custom_column', $column_name, $post->ID); ?></div>
-                                <?php
+                        default:
+                                if ( $bulk )
+                                        do_action('bulk_edit_custom_box', $column_name, $type);
+                                else
+                                        do_action('quick_edit_custom_box', $column_name, $type);
+
                                 break;
                 }
@@ -800 +840 @@
                 <a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="button-secondary cancel"><?php _e('Cancel'); ?></a>
                 <a accesskey="s" href="#inline-edit" title="<?php _e('Save'); ?>" class="button-secondary save"><?php _e('Save'); ?></a>
-                <?php wp_nonce_field( 'inlineeditnonce', '_inline_edit', false ) ?>
+                <?php if ( ! $bulk ) wp_nonce_field( 'inlineeditnonce', '_inline_edit', false ); ?>
                 <input type="hidden" name="post_view" value="<?php echo $m; ?>" />
         </div>
         </td></tr>
+<?php
+        $bulk++;
+        } ?>
+        </tbody></table></form>
 <?php
 }
@@ -845 +889 @@
 
         echo '
-<div id="inline_' . $post->ID . '">
-        <input type="hidden" name="" class="post_title" value="' . $title . '" />
-        <input type="hidden" name="" class="post_name" value="' . $post->post_name . '" />
-        <input type="hidden" name="" class="post_author" value="' . $post->post_author . '" />
-        <input type="hidden" name="" class="comment_status" value="' . $post->comment_status . '" />
-        <input type="hidden" name="" class="ping_status" value="' . $post->ping_status . '" />
-        <input type="hidden" name="" class="_status" value="' . $post->post_status . '" />
-        <input type="hidden" name="" class="jj" value="' . mysql2date( 'd', $post->post_date ) . '" />
-        <input type="hidden" name="" class="mm" value="' . mysql2date( 'm', $post->post_date ) . '" />
-        <input type="hidden" name="" class="aa" value="' . mysql2date( 'Y', $post->post_date ) . '" />
-        <input type="hidden" name="" class="hh" value="' . mysql2date( 'H', $post->post_date ) . '" />
-        <input type="hidden" name="" class="mn" value="' . mysql2date( 'i', $post->post_date ) . '" />
-        <input type="hidden" name="" class="post_password" value="' . wp_specialchars($post->post_password, 1) . '" />';
+<div class="hidden" id="inline_' . $post->ID . '">
+        <div class="post_title">' . $title . '</div>
+        <div class="post_name">' . $post->post_name . '</div>
+        <div class="post_author">' . $post->post_author . '</div>
+        <div class="comment_status">' . $post->comment_status . '</div>
+        <div class="ping_status">' . $post->ping_status . '</div>
+        <div class="_status">' . $post->post_status . '</div>
+        <div class="jj">' . mysql2date( 'd', $post->post_date ) . '</div>
+        <div class="mm">' . mysql2date( 'm', $post->post_date ) . '</div>
+        <div class="aa">' . mysql2date( 'Y', $post->post_date ) . '</div>
+        <div class="hh">' . mysql2date( 'H', $post->post_date ) . '</div>
+        <div class="mn">' . mysql2date( 'i', $post->post_date ) . '</div>
+        <div class="post_password">' . wp_specialchars($post->post_password, 1) . '</div>';
 
         if( $post->post_type == 'page' )
                 echo '
-        <input type="hidden" name="" class="post_parent" value="' . $post->post_parent . '" />
-        <input type="hidden" name="" class="page_template" value="' . wp_specialchars(get_post_meta( $post->ID, '_wp_page_template', true ), 1) . '" />
-        <input type="hidden" name="" class="menu_order" value="' . $post->menu_order . '" />';
+        <div class="post_parent">' . $post->post_parent . '</div>
+        <div class="page_template">' . wp_specialchars(get_post_meta( $post->ID, '_wp_page_template', true ), 1) . '</div>
+        <div class="menu_order">' . $post->menu_order . '</div>';
         
         if( $post->post_type == 'post' )
                 echo '
-        <input type="hidden" name="" class="tags_input" value="' . wp_specialchars( str_replace( ',', ', ', get_tags_to_edit($post->ID) ), 1) . '" />
-        <input type="hidden" name="" class="post_category" value="' . implode( ',', wp_get_post_categories( $post->ID ) ) . '" />
-        <input type="hidden" name="" class="sticky" value="' . (is_sticky($post->ID) ? 'sticky' : '') . '" />';
+        <div class="tags_input">' . wp_specialchars( str_replace( ',', ', ', get_tags_to_edit($post->ID) ), 1) . '</div>
+        <div class="post_category">' . implode( ',', wp_get_post_categories( $post->ID ) ) . '</div>
+        <div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
                 
         echo '</div>';
@@ -1036 +1080 @@
 
                 case 'comments':
-                        $attributes = 'class="comments column-comments num"' . $style;
                 ?>
                 <td <?php echo $attributes ?>><div class="post-com-count-wrapper">
@@ -1211 +1254 @@
 
         case 'comments':
-                $attributes = 'class="comments column-comments num"' . $style;
                 ?>
                 <td <?php echo $attributes ?>><div class="post-com-count-wrapper">

trunk/wp-admin/js/inline-edit.js

@@ -2 +2 @@
 (function($) {
 inlineEdit = {
-        type : '',
-        rows : '',
 
         init : function() {
-                var t = this, blankRow = $('#inline-edit');
+                var t = this, qeRow = $('#inline-edit'), bulkRow = $('#bulk-edit');
 
                 t.type = $('table.widefat').hasClass('page') ? 'page' : 'post';
+                t.what = '#'+t.type+'-';
 
                 // get all editable rows
@@ -14 +13 @@
 
                 // prepare the edit row
-                blankRow.dblclick(function() { inlineEdit.toggle(this); })
-                        .keyup(function(e) { if(e.which == 27) return inlineEdit.revert(this); });
-
-                $('a.cancel', blankRow).click(function() { return inlineEdit.revert(this); });
-                $('a.save', blankRow).click(function() { return inlineEdit.save(this); });
+                qeRow.dblclick(function() { inlineEdit.toggle(this); })
+                        .keyup(function(e) { if(e.which == 27) return inlineEdit.revert(); });
+
+                bulkRow.dblclick(function() { inlineEdit.revert(); })
+                        .keyup(function(e) { if (e.which == 27) return inlineEdit.revert(); });
+
+                $('a.cancel', qeRow).click(function() { return inlineEdit.revert(); });
+                $('a.save', qeRow).click(function() { return inlineEdit.save(this); });
+
+                $('a.cancel', bulkRow).click(function() { return inlineEdit.revert(); });
+                $('a.save', bulkRow).click(function() { return inlineEdit.saveBulk(); });
 
                 // add events
                 t.rows.dblclick(function() { inlineEdit.toggle(this); });
                 t.addEvents(t.rows);
+
+                $('#bulk-title-div').after(
+                        $('#inline-edit div.categories').clone(),
+                        $('#inline-edit div.tags').clone()
+                );
+
+                // categories expandable?
+                $('span.catshow').click(function() {
+                        $('.inline-editor ul.cat-checklist').addClass("cat-hover");
+                        $('.inline-editor span.cathide').show();
+                        $(this).hide();
+                });
+
+                $('span.cathide').click(function() {
+                        $('.inline-editor ul.cat-checklist').removeClass("cat-hover");
+                        $('.inline-editor span.catshow').show();
+                        $(this).hide();
+                });
+
+                $('select[name="_status"] option[value="future"]', bulkRow).remove();
+
+                $('#doaction').click(function(e){
+                        if ( $('select[name="action"]').val() == 'edit' ) {
+                                e.preventDefault();
+                                t.setBulk();
+                        } else if ( $('form#posts-filter tr.inline-editor').length > 0 ) {
+                                t.revert();
+                        }
+                });
+                
+                $('#post-query-submit').click(function(e){
+                        if ( $('form#posts-filter tr.inline-editor').length > 0 )
+                                t.revert();
+                });
+                
         },
 
@@ -28 +68 @@
                 var t = this;
 
-                $('#'+t.type+'-'+t.getId(el)).css('display') == 'none' ? t.revert(el) : t.edit(el);
+                $(t.what+t.getId(el)).css('display') == 'none' ? t.revert() : t.edit(el);
         },
 
@@ -39 +79 @@
         },
 
+        setBulk : function() {
+                var te = '', c = '';
+                this.revert();
+
+                $('table.widefat tbody').prepend( $('#bulk-edit') );
+                $('#bulk-edit').addClass('inline-editor').show();
+
+                $('tbody th.check-column input[type="checkbox"]').each(function(i){
+                        if ( $(this).attr('checked') ) {
+                                var id = $(this).val();
+                                c = c == '' ? ' class="alternate"' : '';
+                                te += '<div'+c+'>'+$('#inline_'+id+' .post_title').text()+'</div>';
+                        }
+                });
+
+                $('#bulk-titles').html(te);
+
+                // enable autocomplete for tags
+                if ( this.type == 'post' )
+                        $('tr.inline-editor textarea[name="tags_input"]').suggest( 'admin-ajax.php?action=ajax-tag-search', { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
+        },
+
         edit : function(id) {
-                var t = this, type = t.type, old = $('tr.inline-editor').attr('id');
-
-                if( typeof(id) == 'object' )
+                var t = this;
+                t.revert();
+
+                if ( typeof(id) == 'object' )
                         id = t.getId(id);
 
-                if ( old ) {
-                        old = old.split('-')[1];
-                        t.revert(old);
-                }
-
                 var fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'post_password'];
-                if ( type == 'page' ) fields.push('post_parent', 'menu_order', 'page_template');
-                if ( type == 'post' ) fields.push('tags_input');
+                if ( t.type == 'page' ) fields.push('post_parent', 'menu_order', 'page_template');
+                if ( t.type == 'post' ) fields.push('tags_input');
 
                 // add the new blank row
                 var editRow = $('#inline-edit').clone(true);
 
-                if ( $('#'+type+'-'+id).hasClass('alternate') )
+                if ( $(t.what+id).hasClass('alternate') )
                         $(editRow).addClass('alternate');
-                $('#'+type+'-'+id).hide().after(editRow);
+                $(t.what+id).hide().after(editRow);
 
                 // populate the data
                 var rowData = $('#inline_'+id);
                 for ( var f = 0; f < fields.length; f++ ) {
-                        $(':input[name="'+fields[f]+'"]', editRow).val( $('.'+fields[f], rowData).val() );
+                        $(':input[name="'+fields[f]+'"]', editRow).val( $('.'+fields[f], rowData).text() );
                 }
 
-                if ( $('.comment_status', rowData).val() == 'open' )
+                if ( $('.comment_status', rowData).text() == 'open' )
                         $('input[name="comment_status"]', editRow).attr("checked", "checked");
-                if ( $('.ping_status', rowData).val() == 'open' )
+                if ( $('.ping_status', rowData).text() == 'open' )
                         $('input[name="ping_status"]', editRow).attr("checked", "checked");
-                if ( $('.sticky', rowData).val() == 'sticky' )
+                if ( $('.sticky', rowData).text() == 'sticky' )
                         $('input[name="sticky"]', editRow).attr("checked", "checked");
 
                 // categories
                 var cats;
-                if ( cats = $('.post_category', rowData).val() )
-                        $('ul.cat-checklist :checkbox').val(cats.split(','));
+                if ( cats = $('.post_category', rowData).text() )
+                        $('ul.cat-checklist :checkbox', editRow).val(cats.split(','));
 
                 // handle the post status
-                var status = $('._status', rowData).val();
+                var status = $('._status', rowData).text();
                 if ( status != 'future' ) $('select[name="_status"] option[value="future"]', editRow).remove();
                 if ( status == 'private' ) $('input[name="keep_private"]', editRow).attr("checked", "checked");
@@ -100 +158 @@
                 }
 
-                // categories expandable?
-                $('span.catshow', editRow).click(function() {
-                        $('ul.cat-checklist', editRow).addClass("cat-hover");
-                        $('span.cathide', editRow).show();
-                        $(this).hide();
-                });
-
-                $('span.cathide', editRow).click(function() {
-                        $('ul.cat-checklist', editRow).removeClass("cat-hover");
-                        $('span.catshow', editRow).show();
-                        $(this).hide();
-                });
-
                 $(editRow).attr('id', 'edit-'+id).addClass('inline-editor').show();
                 $('.ptitle', editRow).focus();
 
                 // enable autocomplete for tags
-                if ( type == 'post' )
+                if ( t.type == 'post' )
                         $('tr.inline-editor textarea[name="tags_input"]').suggest( 'admin-ajax.php?action=ajax-tag-search', { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
 
@@ -141 +186 @@
                 // make ajax request
                 $.post('admin-ajax.php', params,
-                        function(html) {
-                                var row = $('#'+inlineEdit.type+'-'+id);
-                                $('#edit-'+id).hide();
-                                html = $(html).html();
-                                row.html(html).show();
-                                row.animate( { backgroundColor: '#FFFBCC' }, 200)
-                                         .animate( { backgroundColor: row.css('background-color') }, 500);
+                        function(r) {
+                                var row = $(inlineEdit.what+id);
+                                $('#edit-'+id).remove();
+                                row.html($(r).html()).show()
+                                        .animate( { backgroundColor: '#CCEEBB' }, 500)
+                                        .animate( { backgroundColor: '#eefee7' }, 500);
                                 inlineEdit.addEvents(row);
                         }
@@ -154 +198 @@
         },
 
-        revert : function(id) {
-                if ( typeof(id) == 'object' )
-                        id = this.getId(id);
-
-                $('#edit-'+id).remove();
-                $('#'+this.type+'-'+id).show();
+        saveBulk : function() {
+                $('form#posts-filter').submit();
+        },
+
+        revert : function() {
+                var id;
+
+                if ( id = $('table.widefat tr.inline-editor').attr('id') ) {
+                        if ( 'bulk-edit' == id ) {
+                                $('table.widefat #bulk-edit').removeClass('inline-editor').hide();
+                                $('#bulk-titles').html('');
+                                $('#inlineedit').append( $('#bulk-edit') );
+                        } else  {
+                                $('#'+id).remove();
+                                id = id.substr( id.lastIndexOf('-') + 1 );
+                                $(this.what+id).show();
+                        }
+                }
 
                 return false;

trunk/wp-admin/link-manager.php

@@ -121 +121 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php
 $categories = get_terms('link_category', "hide_empty=1");

trunk/wp-admin/plugins.php

@@ -332 +332 @@
                         <option value="deactivate-selected"><?php _e('Deactivate'); ?></option>
                 </select>
-                <input type="submit" name="doaction" value="<?php _e('Apply'); ?>" class="button-secondary action" />
+                <input type="submit" name="doaction_active" value="<?php _e('Apply'); ?>" class="button-secondary action" />
         </div>
 </div>
@@ -357 +357 @@
 <?php endif; ?>
                 </select>
-                <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+                <input type="submit" value="<?php _e('Apply'); ?>" name="doaction_recent" class="button-secondary action" />
                 <input type="submit" name="clear-recent-list" value="<?php _e('Clear List') ?>" class="button-secondary" />
         </div>

trunk/wp-admin/upload.php

@@ -272 +272 @@
 <?php } ?>
 </select>
-<input type="submit" id="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+<input type="submit" id="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-media'); ?>
 <?php

trunk/wp-admin/users.php

@@ -333 +333 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <label class="hidden" for="new_role"><?php _e('Change role to&hellip;') ?></label><select name="new_role" id="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option><?php wp_dropdown_roles(); ?></select>
 <input type="submit" value="<?php _e('Change'); ?>" name="changeit" class="button-secondary" />

trunk/wp-admin/wp-admin.css

@@ -2204 +2204 @@
 
 .inline-editor div.title {
-        padding: 2px 5px;
+        height: 18px;
+        line-height: 16px;
+        padding: 1px 5px;
         cursor: default;
 }
@@ -2211 +2213 @@
 .inline-editor .page-title {
         width: 260px;
+}
+
+#bulk-edit .post-title,
+#bulk-edit .page-title {
+        width: 200px;
+        height: 179px;
 }
 
@@ -2259 +2267 @@
 
 .inline-editor .categories {
-        width: 180px;
+        width: 200px;
 }
 
@@ -2276 +2284 @@
 .inline-editor .categories ul.cat-hover {
         height: 200px;
-        overflow: auto;
+        overflow-x: auto;
 }
 
@@ -2302 +2310 @@
 
 .inline-editor .tags {
-        width: 220px;
+        width: 200px;
 }
 
@@ -2309 +2317 @@
         border-style: solid;
         height: 45px;
-        width: 200px;
+        width: 180px;
         font-size: 11px;
 }
@@ -2318 +2326 @@
 }
 
+#wpbody-content .inline-editor .comments select {
+        margin-bottom: 3px;
+        width: 150px;
+}
+
+.inline-editor .parent {
+        width: 180px;
+}
+
+#wpbody-content .inline-editor .parent select {
+        width: 170px;
+}
+
 .inline-editor .quick-edit-save {
         padding: 8px 10px;
+}
+
+#bulk-titles {
+        height: 150px;
+        overflow: auto;
+        cursor: default;
+}
+
+#bulk-titles div {
+        padding: 1px 2px;
 }