Changeset 9083

Timestamp:

10/05/08 04:43:52 (2 months ago)

Author:

azaozz

Message:

Quick Edit for Tags, Categories and Link Categories, improvements to handling errors in quick and bulk edit.

Files:

• trunk/wp-admin/admin-ajax.php (modified) (3 diffs)
• trunk/wp-admin/categories.php (modified) (2 diffs)
• trunk/wp-admin/edit-link-categories.php (modified) (2 diffs)
• trunk/wp-admin/edit-pages.php (modified) (1 diff)
• trunk/wp-admin/edit-tags.php (modified) (3 diffs)
• trunk/wp-admin/edit.php (modified) (1 diff)
• trunk/wp-admin/includes/template.php (modified) (21 diffs)
• trunk/wp-admin/js/inline-edit-post.js (moved) (moved from trunk/wp-admin/js/inline-edit.js) (8 diffs)
• trunk/wp-admin/js/inline-edit-tax.js (added)
• trunk/wp-admin/wp-admin.css (modified) (4 diffs)
• trunk/wp-includes/classes.php (modified) (1 diff)
• trunk/wp-includes/post.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (3 diffs)

trunk/wp-admin/admin-ajax.php

@@ -731 +731 @@
-case 'inline-save':
-    check_ajax_referer( 'inlineeditnonce', '_inline_edit' );
-
-id
+
+post_ID
-        exit;
-
-
+
+
+
+
+
+
+
+
+
-        $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>'
+printf( $_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 ) )
-        exit;
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $post = array();
-    if ( 'page' == $_POST['post_type'] ) {
@@ -753 +783 @@
-        post_rows($post);
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    break;
-case 'meta-box-order':
@@ -804 +888 @@
-                break;
-        }
-
+
-        if ( '0000-00-00 00:00:00' == $post->post_date ) {
-            $time = '';

trunk/wp-admin/categories.php

@@ -112 +112 @@
-wp_enqueue_script( 'admin-categories' );
-wp_enqueue_script('admin-forms');
+if ( current_user_can('manage_categories') )
+    wp_enqueue_script('inline-edit-tax');
-
-require_once ('admin-header.php');
@@ -236 +238 @@
-<?php include('edit-category-form.php'); ?>
-
+<?php inline_edit_term_row('category'); ?>
-<?php endif; ?>
-

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

@@ -49 +49 @@
-wp_enqueue_script( 'admin-categories' );
-wp_enqueue_script('admin-forms');
+if ( current_user_can('manage_categories') )
+    wp_enqueue_script('inline-edit-tax');
-
-require_once ('admin-header.php');
@@ -184 +186 @@
-
-<?php include('edit-link-category-form.php'); ?>
+<?php inline_edit_term_row('link-category'); ?>
-
-<?php endif; ?>

trunk/wp-admin/edit-pages.php

@@ -70 +70 @@
-$parent_file = 'edit.php';
-wp_enqueue_script('admin-forms');
-
+-post
-wp_enqueue_script('pages');
-

trunk/wp-admin/edit-tags.php

@@ -116 +116 @@
-wp_enqueue_script( 'admin-tags' );
-wp_enqueue_script('admin-forms');
+if ( current_user_can('manage_categories') )
+    wp_enqueue_script('inline-edit-tax');
-
-require_once ('admin-header.php');
@@ -188 +190 @@
-<div class="clear"></div>
-
-
+ tag
-    <thead>
-    <tr>
@@ -237 +239 @@
-<br />
-<?php include('edit-tag-form.php'); ?>
+<?php inline_edit_term_row('tag'); ?>
-
-<?php endif; ?>

trunk/wp-admin/edit.php

@@ -71 +71 @@
-$parent_file = 'edit.php';
-wp_enqueue_script('admin-forms');
-
+-post
-wp_enqueue_script('posts');
-

trunk/wp-admin/includes/template.php

@@ -124 +124 @@
-        $actions = array();
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+        $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
-        if ( $default_cat_id != $category->term_id )
-            $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("categories.php?action=delete&amp;cat_ID=$category->term_id", 'delete-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
@@ -137 +138 @@
-    }
-
-" class='alternate'" == $class ? '' : " class='alternate'"
+'alternate' == $class ? '' : 'alternate'
-
-    $category->count = number_format_i18n( $category->count );
-    $posts_count = ( $category->count > 0 ) ? "<a href='edit.php?cat=$category->term_id'>$category->count</a>" : $category->count;
-$class
+ class='iedit $class'
-
-    $columns = get_column_headers('category');
@@ -165 +166 @@
-                break;
-            case 'name':
-
+
+
+
+
+
-                break;
-            case 'description':
@@ -181 +186 @@
-
-    return apply_filters('cat_row', $output);
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.7
+ * 
+ * Outputs the HTML for the hidden table rows used in Categories, Link Caregories and Tags quick edit.
+ *
+ * @param string $type "tag", "category" or "link-category"
+ * @return 
+ */
+function inline_edit_term_row($type) {
+
+    if ( ! current_user_can( 'manage_categories' ) )
+        return;
+
+    $is_tag = $type == 'tag';
+    $columns = $is_tag ? get_column_headers('tag') : get_column_headers('category');
+    $hidden = (array) get_user_option( "manage-$type-columns-hidden" ); ?>
+
+<form method="get" action=""><table style="display: none"><tbody id="inlineedit">
+    <tr title="<?php _e('Double-click to cancel'); ?>" id="inline-edit" style="display: none"><td colspan="8">
+    <?php
+
+    foreach ( $columns as $column_name => $column_display_name ) {
+        $class = "class=\"$column_name column-$column_name quick-edit-div\"";
+        $style = in_array($column_name, $hidden) ? ' style="display:none;"' : '';
+        $attributes = "$class$style";
+
+        switch ($column_name) {
+            case 'cb':
+                break;
+            case 'description':
+                break;
+            case 'name': ?>
+                <div class="tax-name quick-edit-div"<?php echo $style ?> title="<?php _e('Name'); ?>">
+                    <div class="title"><?php _e('Name'); ?></div>
+                    <div class="in">
+                    <input type="text" name="name" class="ptitle" value="" />
+                    </div>
+                </div>
+                <?php
+
+                $output .= "<td $attributes>$edit</td>";
+                break;
+            case 'slug': ?>
+                <div class="tax-slug quick-edit-div"<?php echo $style ?> title="<?php _e('Slug'); ?>">
+                    <div class="title"><?php _e('Slug'); ?></div>
+                    <div class="in">
+                    <input type="text" name="slug" class="ptitle" value="" />
+                    </div>
+                </div>
+                <?php
+
+                $output .= "<td $attributes>$category->slug</td>";
+                break;
+            case 'posts':
+                if ( 'category' == $type ) { ?>
+                <div class="tax-parent quick-edit-div"<?php echo $style ?> title="<?php _e('Parent Category'); ?>">
+                    <div class="title"><?php _e('Parent Category'); ?></div>
+                        <div class="in">
+                        <?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('None'))); ?>
+                        </div>
+                </div>
+                <?php }
+                break;
+        }
+    }
+    ?>
+    <div class="clear"></div>
+    <div class="quick-edit-save">
+        <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>
+        <span class="hidden error"></span>
+        <?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
+    </div>
+    </td></tr>
+    </tbody></table></form>
+<?php
-}
-
@@ -207 +292 @@
-        $actions = array();
-        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+        $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
-        if ( $default_cat_id != $category->term_id )
-            $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link-category.php?action=delete&amp;cat_ID=$category->term_id", 'delete-link-category_' . $category->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this category '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
@@ -220 +306 @@
-    }
-
-" class='alternate'" == $class ? '' : " class='alternate'"
+'alternate' == $class ? '' : 'alternate'
-
-    $category->count = number_format_i18n( $category->count );
-    $count = ( $category->count > 0 ) ? "<a href='link-manager.php?cat_id=$category->term_id'>$category->count</a>" : $category->count;
-$class
+ class='iedit $class'
-    $columns = get_column_headers('link-category');
-    $hidden = (array) get_user_option( 'manage-link-category-columns-hidden' );
@@ -247 +333 @@
-                break;
-            case 'name':
-
+
+
+
+
+
-                break;
-            case 'description':
@@ -518 +608 @@
-                    $actions = array();
-                    $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+                    $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __('Quick Edit') . '</a>';
-                    $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("edit-tags.php?action=delete&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this tag '%s'\n 'Cancel' to stop, 'OK' to delete."), $name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
-                    $action_count = count($actions);
@@ -526 +617 @@
-                        $out .= "<span class='$action'>$link$sep</span>";
-                    }
-
+
+
+
-                    break;
-                case 'slug':
@@ -574 +667 @@
-    $count = 0;
-    foreach( $tags as $tag )
-alternate"' : '
+iedit alternate"' : ' class="iedit"
-
-    // filter and send to screen
@@ -746 +839 @@
-            );
-            return apply_filters('manage_users_columns', $columns);
- 
+
-            return apply_filters('manage_' . $page . '_columns', $columns);
-    }
@@ -800 +893 @@
- * {@internal Missing Short Description}}
- *
-
-
-
+
+
+
+
+
- */
-function inline_edit_row( $type ) {
@@ -824 +919 @@
-    $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
@@ -969 +1064 @@
-                    <div class="title"><?php _e('Author'); ?></div>
-                    <div class="in">
- 
+
-                    $users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1);
-                    if ( $bulk ) $users_opt['show_option_none'] = __('- No Change -');
@@ -1046 +1141 @@
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $data
- */
-function inline_save_row( $data ) {
-    // get the original post content
-    $post = get_post( $data['post_ID'], ARRAY_A );
-    $data['content'] = $post['post_content'];
-
-    // statuses
-    if ( 'private' == $data['keep_private'] )
-        $data['post_status'] = 'private';
-    else
-        $data['post_status'] = $data['_status'];
-
-    if ( empty($data['comment_status']) )
-        $data['comment_status'] = 'closed';
-    if ( empty($data['ping_status']) )
-        $data['ping_status'] = 'closed';
-
-    // rename
-    $data['user_ID'] = $GLOBALS['user_ID'];
-    $data['excerpt'] = $data['post_excerpt'];
-    $data['trackback_url'] = $data['to_ping'];
-    $data['parent_id'] = $data['post_parent'];
-
-    // update the post
-    $_POST = $data;
-    edit_post();
-}
-
-// adds hidden fields with the data for use in the inline editor
-/**
@@ -1092 +1153 @@
-    if ( ! current_user_can('edit_' . $post->post_type, $post->ID) )
-        return;
-
+
-    $title = _draft_or_post_title($post->ID);
-
@@ -1115 +1176 @@
-    <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 '
@@ -1121 +1182 @@
-    <div class="post_category">' . implode( ',', wp_get_post_categories( $post->ID ) ) . '</div>
-    <div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
-
+
-    echo '</div>';
-}
@@ -1232 +1293 @@
-            else
-                echo '<abbr title="' . $t_time . '">' . apply_filters('post_date_column_time', $h_time, $post, $column_name, $mode) . '</abbr>';
-
+
-            echo '</td>';
-        break;
@@ -1477 +1538 @@
-            echo "<span class='$action'>$link$sep</span>";
-        }
-
+
-        get_inline_data($post);
-        echo '</td>';
@@ -2975 +3036 @@
-    $title = get_the_title($post_id);
-    if ( empty($title) )
- 
+
-    return $title;
-}

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

@@ -1 +1 @@
-
-(function($) {
-
+Post
-
-    init : function() {
@@ -13 +13 @@
-
-        // prepare the edit row
-
-
-
-
-
-
-
-
-
-
-
+Post
+Post
+
+Post
+Post
+
+Post
+Post
+
+Post
+Post
-
-        // add events
-
+Post
-        t.addEvents(t.rows);
-
@@ -66 +66 @@
-            }
-        });
-
+
-        $('#post-query-submit').click(function(e){
-            if ( $('form#posts-filter tr.inline-editor').length > 0 )
-                t.revert();
-        });
-
+
-    },
-
@@ -83 +83 @@
-        r.each(function() {
-            var row = $(this);
-
+Post
-            row.attr('title', inlineEditL10n.edit);
-        });
@@ -105 +105 @@
-        $('#bulk-titles').html(te);
-        $('#bulk-titles a').click(function() {
-
+Post
-
-            $('table.widefat input[value="'+id+'"]').attr('checked', '');
@@ -187 +187 @@
-            id = this.getId(id);
-
- .check-column').html('<img
+.quick-edit-save').append('<img style="padding:0 15px;"
-
-        var params = {
@@ -202 +202 @@
-        $.post('admin-ajax.php', params,
-            function(r) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            }
-        );
@@ -242 +247 @@
-};
-
-
+Post
-})(jQuery);

trunk/wp-admin/wp-admin.css

@@ -2152 +2152 @@
-
-.inline-editor .post-title,
-
+
+
+
-    width: 260px;
-}
@@ -2163 +2165 @@
-
-.inline-editor .post-title .ptitle,
-
+
+
+
-    width: 245px;
-    margin-bottom: 5px;
@@ -2207 +2211 @@
-}
-
-
+
+
-    width: 200px;
-}
@@ -2272 +2277 @@
-}
-
-
+
+
-    width: 180px;
-}
-
-
+
+
-    width: 170px;
-}

trunk/wp-includes/classes.php

@@ -1403 +1403 @@
-
-        $cat_name = apply_filters('list_cats', $category->name, $category);
-
+class=\"level-$depth\" 
-        if ( $category->term_id == $args['selected'] )
-            $output .= ' selected="selected"';

trunk/wp-includes/post.php

@@ -1545 +1545 @@
-    $postarr['post_category'] = $post_cats;
-    if ( $clear_date ) {
-;
+
-        $postarr['post_date_gmt'] = '';
-    }

trunk/wp-includes/script-loader.php

@@ -37 +37 @@
-function wp_default_scripts( &$scripts ) {
-    global $current_user;
-
+
-    if (!$guessurl = site_url())
-        $guessurl = wp_guess_url();
-
+
-    $userid = isset($current_user) ? $current_user->ID : 0;
-    $scripts->base_url = $guessurl;
@@ -242 +242 @@
-
-        $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
-
-', '/wp-admin/js/inline-edi
-
+
+-post', '/wp-admin/js/inline-edit-pos
+-post
-            'edit' => __('Double-click to edit')
+        ) );
+
+        $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081003' );
+        $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
+            'edit' => __('Double-click to edit'),
+            'error' => __('Error while saving the changes.')
-        ) );
-
@@ -254 +260 @@
-
-        $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
-
+
-        $scripts->add( 'user-settings', '/wp-admin/js/user-settings.js', array(), '20080829' );
-        $scripts->localize( 'user-settings', 'userSettings', array(