Changeset 8857

Timestamp:

09/10/08 22:47:03 (3 months ago)

Author:

ryan

Message:

Inline editing. First cut. Props Aaron Harp. see #6815

Files:

• trunk/wp-admin/admin-ajax.php (modified) (2 diffs)
• trunk/wp-admin/edit-pages.php (modified) (3 diffs)
• trunk/wp-admin/edit-post-rows.php (modified) (1 diff)
• trunk/wp-admin/edit.php (modified) (2 diffs)
• trunk/wp-admin/includes/post.php (modified) (8 diffs)
• trunk/wp-admin/includes/template.php (modified) (21 diffs)
• trunk/wp-admin/js/forms.js (modified) (2 diffs)
• trunk/wp-admin/js/inline-edit.js (added)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -13 +13 @@
- */
-define('DOING_AJAX', true);
+define('WP_ADMIN', true);
-
-require_once('../wp-load.php');
@@ -716 +717 @@
-    die(get_sample_permalink_html($post_id, $title, $slug));
-break;
+case 'inline-data':
+    get_inline_data( explode(',', $_POST['posts']) );
+    die();
+break;
+case 'inline-save':
+    inline_save_row( $_POST );
+    if ( 'page' == $_POST['post_type'] ) {
+        $post = array();
+        $post[] = get_post($_POST['post_ID']);
+        page_rows( $post );
+    } elseif ( 'post' == $_POST['post_type'] ) {
+        $mode = $_POST['post_view'];
+        $post = array();
+        $post[] = get_post($_POST['post_ID']);
+        post_rows($post);
+    }
+    die();
+break;
-case 'meta-box-order':
-    check_ajax_referer( 'meta-box-order' );

trunk/wp-admin/edit-pages.php

@@ -45 +45 @@
-$parent_file = 'edit.php';
-wp_enqueue_script('admin-forms');
+wp_enqueue_script('inline-edit');
-
-$post_stati  = array(   //  array( adj, noun )
@@ -154 +155 @@
-<select name="action">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="edit"><?php _e('Edit'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-</select>
@@ -188 +190 @@
-  </thead>
-  <tbody>
+  <?php inline_edit_row( 'page' ) ?>
-  <?php page_rows($posts, $pagenum, $per_page); ?>
-  </tbody>

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

@@ -28 +28 @@
-    </thead>
-    <tbody>
+      
+<?php inline_edit_row( 'post' ) ?>    
+
-<?php
-if ( have_posts() ) {

trunk/wp-admin/edit.php

@@ -51 +51 @@
-$parent_file = 'edit.php';
-wp_enqueue_script('admin-forms');
+wp_enqueue_script('inline-edit');
+
-
-list($post_stati, $avail_post_stati) = wp_edit_posts_query();
@@ -170 +172 @@
-<select name="action">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="edit"><?php _e('Edit'); ?></option>
-<option value="delete"><?php _e('Delete'); ?></option>
-<option value="edit"><?php _e('Edit'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />

trunk/wp-admin/includes/post.php

@@ -10 +10 @@
- *
- * @param bool $update Are we updating a pre-existing post?
+ * @param post_data array Array of post data. Defaults to the contents of $_POST
- * @return object|bool WP_Error on failure, true on success.
- */
-
+
+
+
+
+
-    if ( $update )
-_POST['ID'] = (int) $_POST
-_POST['post_content'] = $_POST
-_POST['post_excerpt'] = $_POST
-_POST['post_parent'] = isset($_POST['parent_id'])? $_POST
-_POST
-_POST['to_ping'] = $_POST
-
-_POST
-_POST['post_author'] = (int) $_POST
+post_data['ID'] = (int) $post_data
+post_data['post_content'] = $post_data
+post_data['post_excerpt'] = $post_data
+post_data['post_parent'] = isset($post_data['parent_id'])? $post_data
+post_data
+post_data['to_ping'] = $post_data
+
+post_data
+post_data['post_author'] = (int) $post_data
-    } else {
-_POST
-_POST['post_author'] = (int) $_POST
+post_data
+post_data['post_author'] = (int) $post_data
-        } else {
-_POST['post_author'] = (int) $_POST
+post_data['post_author'] = (int) $post_data
-        }
-    }
-
-_POST['user_ID']) && ($_POST['post_author'] != $_POST
-_POST
+post_data['user_ID']) && ($post_data['post_author'] != $post_data
+post_data
-            if ( !current_user_can( 'edit_others_pages' ) ) {
-                return new WP_Error( 'edit_others_pages', $update ?
@@ -50 +55 @@
-
-    // What to do based on which button they pressed
-_POST['saveasdraft']) && '' != $_POST
-_POST
-_POST['saveasprivate']) && '' != $_POST
-_POST
-_POST['publish']) && ( '' != $_POST['publish'] ) && ( $_POST
-_POST
-_POST['advanced']) && '' != $_POST
-_POST
-
-_POST
+post_data['saveasdraft']) && '' != $post_data
+post_data
+post_data['saveasprivate']) && '' != $post_data
+post_data
+post_data['publish']) && ( '' != $post_data['publish'] ) && ( $post_data
+post_data
+post_data['advanced']) && '' != $post_data
+post_data
+
+post_data
-
-    // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
-    // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-_POST
-_POST
+post_data
+post_data
-            if ( $previous_status != 'publish' OR !current_user_can( 'edit_published_pages') )
-_POST
+post_data
-    } else {
-_POST['post_status']) && ('publish' == $_POST
+post_data['post_status']) && ('publish' == $post_data
-            // Stop attempts to publish new posts, but allow already published posts to be saved if appropriate.
-            if ( $previous_status != 'publish' OR !current_user_can( 'edit_published_posts') )
-_POST
+post_data
-        endif;
-    }
-
-_POST
-_POST
-
-_POST
-_POST
+post_data
+post_data
+
+post_data
+post_data
-
-    foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST
-_POST
+post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data
+post_data
-            break;
-        }
-    }
-
-_POST
-_POST
-_POST
-_POST
-_POST
-_POST
-_POST
+post_data
+post_data
+post_data
+post_data
+post_data
+post_data
+post_data
-        $aa = ($aa <= 0 ) ? date('Y') : $aa;
-        $mm = ($mm <= 0 ) ? date('n') : $mm;
@@ -102 +107 @@
-        $mn = ($mn > 59 ) ? $mn -60 : $mn;
-        $ss = ($ss > 59 ) ? $ss -60 : $ss;
-_POST
-_POST['post_date_gmt'] = get_gmt_from_date( $_POST
+post_data
+post_data['post_date_gmt'] = get_gmt_from_date( $post_data
-    }
-
@@ -111 +116 @@
-
-// Update an existing post with values provided in $_POST.
-
-
-
-
-
+
+
+
+
+
+
+
+
-        if ( !current_user_can( 'edit_page', $post_ID ) )
-            wp_die( __('You are not allowed to edit this page.' ));
@@ -124 +132 @@
-
-    // Autosave shouldn't save too soon after a real save
-_POST
+post_data
-        $post =& get_post( $post_ID );
-        $now = time();
@@ -133 +141 @@
-    }
-
-
+, $post_data
-    if ( is_wp_error($translated) )
-        wp_die( $translated->get_error_message() );
-
-    // Meta Stuff
-_POST['meta']) && $_POST
-_POST
+post_data['meta']) && $post_data
+post_data
-            update_meta( $key, $value['key'], $value['value'] );
-    }
-
-_POST['deletemeta']) && $_POST
-_POST
+post_data['deletemeta']) && $post_data
+post_data
-            delete_meta( $key );
-    }
@@ -150 +158 @@
-    add_meta( $post_ID );
-
-_POST
+post_data
-
-    // Reunite any orphaned attachments with their parent
@@ -164 +172 @@
-
-    if ( current_user_can( 'edit_others_posts' ) ) {
-_POST
+post_data
-            stick_post($post_ID);
-        else

trunk/wp-admin/includes/template.php

@@ -351 +351 @@
-    else
-        $posts_columns['date'] = __('Date');
-//
+
-    $posts_columns['categories'] = __('Categories');
-    $posts_columns['tags'] = __('Tags');
@@ -407 +407 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    global $wp_query, $post, $mode;
-
@@ -414 +637 @@
-    // Create array of post IDs.
-    $post_ids = array();
-
+
+
+
+
+
-        $post_ids[] = $a_post->ID;
-
-    $comment_pending_count = get_pending_comments_num($post_ids);
-[$post->ID]
+
-        $comment_pending_count = array();
-
-
-
-
+
-        if ( empty($comment_pending_count[$post->ID]) )
-            $comment_pending_count[$post->ID] = 0;
@@ -437 +662 @@
-    $global_post = $post;
-    $post = $a_post;
+    setup_postdata($post);
-
-    $class = 'alternate' == $class ? '' : 'alternate';
@@ -484 +710 @@
-
-            if ( 'excerpt' == $mode ) { ?>
-
+ class="date"
-        <?php } else { ?>
-
+ class="date"
-        <?php }
-        break;
@@ -501 +727 @@
-            $actions = array();
-            $actions['edit'] = '<a href="post.php?action=edit&amp;post=' . $post->ID . '">' . __('Edit') . '</a>';
+            $actions['inline'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
-            $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
-            $action_count = count($actions);
@@ -516 +743 @@
-        case 'categories':
-        ?>
-
+ class="categories"
-            $categories = get_the_category();
-            if ( !empty( $categories ) ) {
@@ -532 +759 @@
-        case 'tags':
-        ?>
-
+ class="tags"
-            $tags = get_the_tags();
-            if ( !empty( $tags ) ) {
@@ -548 +775 @@
-        case 'comments':
-        ?>
-
+comments 
-        <?php
-            $pending_phrase = sprintf( __('%s pending'), number_format( $pending_comments ) );
@@ -563 +790 @@
-        case 'author':
-        ?>
-
+ class="author"
-        <?php
-        break;
@@ -569 +796 @@
-        case 'status':
-        ?>
-
+ class="status"
-        <a href="<?php the_permalink(); ?>" title="<?php echo attribute_escape(sprintf(__('View "%s"'), $title)); ?>" rel="permalink">
-        <?php
@@ -655 +882 @@
-    case 'cb':
-        ?>
-delete
+post
-        <?php
-        break;
@@ -682 +909 @@
-        }
-        ?>
-
+ class="date"
-        <?php
-        break;
@@ -697 +924 @@
-        $actions = array();
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+        $actions['inline'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
-        $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&amp;post=$page->ID", 'delete-page_' . $page->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n  'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
-        $action_count = count($actions);
@@ -712 +940 @@
-    case 'comments':
-        ?>
-
+comments 
-        <?php
-        $left = get_pending_comments_num( $page->ID );
@@ -728 +956 @@
-    case 'author':
-        ?>
-
+ class="author"
-        <?php
-        break;
@@ -734 +962 @@
-    case 'status':
-        ?>
-
+ class="status"
-        <a href="<?php the_permalink(); ?>" title="<?php echo attribute_escape(sprintf(__('View "%s"'), $title)); ?>" rel="permalink">
-        <?php
@@ -1241 +1469 @@
-}
-
-
+, $multi = 0
-    global $wp_locale, $post, $comment;
-
@@ -1262 +1490 @@
-    $ss = ($edit) ? mysql2date( 's', $post_date ) : gmdate( 's', $time_adj );
-
-id=\"mm\" 
+" . ( $multi ? '' : 'id="mm" ' ) . "
-    for ( $i = 1; $i < 13; $i = $i +1 ) {
-        $month .= "\t\t\t" . '<option value="' . zeroise($i, 2) . '"';
@@ -1271 +1499 @@
-    $month .= '</select>';
-
-id="jj" 
-id="aa" 
-id="hh" 
-id="mn" 
+' . ( $multi ? '' : 'id="jj" ' ) . '
+' . ( $multi ? '' : 'id="aa" ' ) . '
+' . ( $multi ? '' : 'id="hh" ' ) . '
+' . ( $multi ? '' : 'id="mn" ' ) . '
-    printf(_c('%1$s%2$s, %3$s @ %4$s : %5$s|1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input'), $month, $day, $year, $hour, $minute);
+
+    if ( $multi ) return;
+    
-    echo "\n\n";
-    foreach ( array('mm', 'jj', 'aa', 'hh', 'mn') as $timeunit )
@@ -1318 +1549 @@
-                $current = '';
-
-
+class='level-$level' 
-            parent_dropdown( $default, $item->ID, $level +1 );
-        }

trunk/wp-admin/js/forms.js

@@ -1 +1 @@
-function checkAll(jQ) { // use attr( checked, fn )
-
+.check-column 
-        return jQuery(this).attr( 'checked' ) ? '' : 'checked';
-    } );
@@ -7 +7 @@
-jQuery( function($) {
-    var lastClicked = false;
-
+.check-column 
-        if ( 'undefined' == e.shiftKey ) { return true; }
-        if ( e.shiftKey ) {

trunk/wp-admin/wp-admin.css

@@ -2140 +2140 @@
-    margin: 0 5px 0 2px;
-}
+
+
+/* Inline Editor */
+
+.inline {
+    font-size: 10px;
+}
+
+.inline td {
+    padding-right: 4px;
+    padding-left: 7px;
+}
+
+.inline input, .inline select, .inline textarea {
+    font-size: 10px !important;
+    padding: 2px;
+    border: 1px solid #ddd;
+}
+
+.inline td.date {
+    width: 87px;
+}
+
+.inline td.page-title {
+    width: 495px;
+}
+
+.inline td.post-title input.title {
+    width: 250px;
+}
+
+.inline td.post-title input.slug {
+    width: 222px;
+    float: right;
+}
+
+.inline div.title {
+    float: left;
+}
+
+.inline div.title input.title {
+    font-size: 12px !important;
+}
+
+.inline div.title label {
+    float: left;
+    margin-top: 4px;
+}
+
+.inline td.page-title input.slug {
+    width: 123px;
+    float: right;
+}
+
+.inline div.other, .inline div.more {
+    width: 190px;
+    float: left;
+    padding-left: 5px;
+}
+
+.inline div.other label, .inline div.more label {
+    display: block; float: left;
+    width: 54px;
+    margin-top: 4px;
+}
+
+.inline div.other select {
+    width: 133px;
+}
+
+.inline div.more {
+    width: 125px;
+}
+
+.inline div.more input {
+    width: 60px;
+}
+
+.inline td.author select {
+    width: 110px;
+}
+
+.inline ul.categories {
+    list-style: none;
+    padding: 0; margin: 0; 
+    height: 65px;
+    overflow: auto;
+    font-size: 10px;
+}
+
+.inline ul.categories ul.children {
+    list-style: none;
+    padding-left: 15px;
+}
+
+.inline ul.categories li {
+    margin-bottom: 2px;
+}
+
+.inline ul.categories input {
+    vertical-align: middle;
+    padding: 0; border: 0;
+}
+
+.inline td.tags textarea {
+    height: 58px; width: 100%;
+}
+
+.inline td.comments {
+    padding-left: 0;
+}
+
+.inline td.status select {
+    width: 98px;
+}
+
+.inline td.status input {
+    vertical-align: middle;
+}

trunk/wp-includes/script-loader.php

@@ -242 +242 @@
-
-        $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
+        
+        $scripts->add( 'inline-edit', '/wp-admin/js/inline-edit.js', array( 'jquery', 'jquery-form', 'suggest' ), '20080812' );
-
-        $scripts->add( 'plugin-install', '/wp-admin/js/plugin-install.js', array( 'thickbox', 'jquery' ), '20080803' );