Changeset 9098

Timestamp:

10/08/08 01:18:16 (2 months ago)

Author:

azaozz

Message:

Convert the comment reply popup to a temp table row for consistency, add Quick Edit for comments, see #7435

Files:

• trunk/wp-admin/admin-ajax.php (modified) (2 diffs)
• trunk/wp-admin/css/colors-classic.css (modified) (4 diffs)
• trunk/wp-admin/css/colors-fresh.css (modified) (4 diffs)
• trunk/wp-admin/includes/template.php (modified) (15 diffs)
• trunk/wp-admin/js/edit-comments.js (modified) (11 diffs)
• trunk/wp-admin/js/inline-edit-post.js (modified) (2 diffs)
• trunk/wp-admin/js/inline-edit-tax.js (modified) (2 diffs)
• trunk/wp-admin/wp-admin.css (modified) (5 diffs)
• trunk/wp-includes/js/jquery/jquery.table-hotkeys.js (modified) (2 diffs)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -445 +445 @@
-        $comment_author_email = $wpdb->escape($user->user_email);
-        $comment_author_url   = $wpdb->escape($user->user_url);
-mm
+nt
-        if ( current_user_can('unfiltered_html') ) {
-            if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
@@ -482 +482 @@
-    $x->add( array(
-        'what' => 'comment',
+        'id' => $comment->comment_ID,
+        'data' => $comment_list_item,
+        'position' => $position
+    ));
+
+    $x->send();
+    break;
+case 'edit-comment' :
+    check_ajax_referer( 'replyto-comment' );
+
+    $comment_post_ID = (int) $_POST['comment_post_ID'];
+    if ( ! current_user_can( 'edit_post', $comment_post_ID ) )
+        die('-1');
+
+    if ( '' == $_POST['content'] )
+        die( __('Error: please type a comment.') );
+
+    $comment_id = (int) $_POST['comment_ID'];
+    $_POST['comment_status'] = $_POST['status'];
+    edit_comment();
+
+    $mode = ( isset($_POST['mode']) && 'single' == $_POST['mode'] ) ? 'single' : 'detail';
+    $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
+    $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
+
+    if ( get_option('show_avatars') && 'single' != $mode )
+        add_filter( 'comment_author', 'floated_admin_avatar' );
+
+    $x = new WP_Ajax_Response();
+
+    ob_start();
+        _wp_comment_row( $comment_id, $mode, false, $checkbox );
+        $comment_list_item = ob_get_contents();
+    ob_end_clean();
+
+    $x->add( array(
+        'what' => 'edit_comment',
-        'id' => $comment->comment_ID,
-        'data' => $comment_list_item,

trunk/wp-admin/css/colors-classic.css

@@ -27 +27 @@
-div#current-widgets, #postcustomstuff table, #your-profile fieldset,
-a.page-numbers, #rightnow, div.dashboard-widget,
-
+
+
-    border-color: #ccc;
-}
@@ -64 +65 @@
-.form-table tr, #poststuff h3, #replyhandle,
-.login form, h3.info-box-title, #post-status-info, #edit-settings-wrap,
-
+, #edithead, #replyhead
-    background-color: #cfebf7;
-}
@@ -861 +862 @@
-/* inline editor */
-.inline-editor input,
-
+
+
-    border-color: #ddd;
-}
@@ -881 +883 @@
-    background-color: #CFEBF7;
-}
+
+#replyrow #ed_reply_toolbar input:hover {
+    border-color: #aaa;
+    background: #ddd;
+}

trunk/wp-admin/css/colors-fresh.css

@@ -27 +27 @@
-div#current-widgets, #postcustomstuff table, #your-profile fieldset,
-a.page-numbers, #rightnow, div.dashboard-widget,
-
+
+
-    border-color: #ccc;
-}
@@ -64 +65 @@
-.form-table tr, #poststuff h3, #replyhandle,
-.login form, h3.info-box-title, #post-status-info, #edit-settings-wrap,
-
+, #edithead, #replyhead 
-    background-color: #eaf3fa;
-}
@@ -840 +841 @@
-/* inline editor */
-.inline-editor input,
-
+
+
-    border-color: #ddd;
-}
@@ -860 +862 @@
-    background-color: #EAF3FA;
-}
+
+#replyrow #ed_reply_toolbar input:hover {
+    border-color: #aaa;
+    background: #ddd;
+}

trunk/wp-admin/includes/template.php

@@ -192 +192 @@
- *
- * @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"
- 
+
- */
-function inline_edit_term_row($type) {
@@ -260 +260 @@
-        <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( 'taxinlineeditnonce', '_inline_edit', false ); ?>
-    </div>
@@ -893 +894 @@
- * {@internal Missing Short Description}}
- *
-
-  
+ for posts and pages
+
- * @since 2.7
- *
@@ -1130 +1131 @@
-        <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>
-
+
+
+
+
-        <input type="hidden" name="post_view" value="<?php echo $m; ?>" />
-    </div>
@@ -1141 +1145 @@
-}
-
-
+ for posts and pages
-/**
- * {@internal Missing Short Description}}
@@ -1970 +1974 @@
-            case 'comment':
-                echo "<td $attributes>";
-
-
+
+
+
+
+
+
+
+
+
-                $actions = array();
-
@@ -1990 +2001 @@
-                    $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
-                    $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
+                    $actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick Edit') . '</a>';
-                    if ( 'spam' != $the_comment_status )
-,this
+
-
-                    $actions = apply_filters( 'comment_row_actions', $actions, $comment );
-
-                    $action_count = count($actions);
-                    $i = 0;
-                    foreach ( $actions as $action => $link ) {
-                        ++$i;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                    }
-                }
@@ -2054 +2063 @@
-
-    // allow plugin to replace the popup content
-=>$position, 'checkbox'=>$checkbox, 'mode'=>
+ => $position, 'checkbox' => $checkbox, 'mode' => 
-
-    if ( ! empty($content) ) {
@@ -2061 +2070 @@
-    }
-?>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    </div>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    <input type="hidden" name="user_ID" id="user_ID" value="<?php echo $current_user->ID; ?>" />
-value="replyto-comment
+id="action" value="
-    <input type="hidden" name="comment_ID" id="comment_ID" value="" />
-    <input type="hidden" name="comment_post_ID" id="comment_post_ID" value="" />
+    <input type="hidden" name="status" id="status" value="" />
-    <input type="hidden" name="position" id="position" value="<?php echo $position; ?>" />
-    <input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" />
@@ -2081 +2115 @@
-    <?php wp_nonce_field( 'replyto-comment', '_ajax_nonce', false ); ?>
-    <?php wp_comment_form_unfiltered_html_nonce(); ?>
-
-
-
-
-
-
-
-
-
+
+
-<?php
-}
@@ -2987 +3014 @@
-/**
- * Display the post password.
- 
+
- * The password is passed through {@link attribute_escape()} to ensure that it
- * is safe for placing in an html attribute.
@@ -3024 +3051 @@
-/**
- * Get the post title.
- 
+
- * The post title is fetched and if it is blank then a default string is
- * returned.
@@ -3030 +3057 @@
- * @since 2.7.0
- * @param int $id The post id. If not supplied the global $post is used.
- 
+
- */
-function _draft_or_post_title($post_id = 0)
@@ -3042 +3069 @@
-/**
- * Display the search query.
- 
+
- * A simple wrapper to display the "s" parameter in a GET URI. This function
- * should only be used when {@link the_search_query()} cannot.
@@ -3048 +3075 @@
- * @uses attribute_escape
- * @since 2.7.0
- 
+
- */
-function _admin_search_query() {

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

@@ -30 +30 @@
-        });
-    };
-
+
-    var delAfter = function( r, settings ) {
-        $('li span.comment-count').each( function() {
@@ -68 +68 @@
-            a.html( n.toString() );
-        });
-
+
-        if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) {
-            return;
-        }
-
+
-        theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
-        $('#get-extra-comments').submit();
@@ -79 +79 @@
-    theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
-    theList = $('#the-comment-list').wpList( { alt: '', dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } );
+
-};
-
@@ -87 +88 @@
-commentReply = {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if ( $.browser.msie )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return false;
-    },
@@ -153 +215 @@
-        var post = {};
-
-
+
+
+
-            post[ $(this).attr('name') ] = $(this).val();
-        });
-
-mm
+nt
-        post.id = post.comment_post_ID;
-
@@ -167 +231 @@
-            error : function(r) { commentReply.error(r); }
-        });
+
+        return false;
-    },
-
@@ -173 +239 @@
-        if ( typeof(xml) == 'string' ) {
-            this.error({'responseText': xml});
-
+ false
-        }
-
-        var r = wpAjax.parseAjaxResponse(xml);
-
+ {
-            this.error({'responseText': wpAjax.broken});
+            return false;
+        }
+
+        if ( 'edit-comment' == this.act )
+            $(this.o).remove();
-
-        r = r.responses[0];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            .animate( { backgroundColor:"#CCEEBB" }, 600 )
-            .animate( { backgroundColor:"transparent" }, 600 );
-
+
+
+
-        setCommentsList();
+
-    },
-
@@ -204 +274 @@
-        var er = r.statusText;
-
+        $('#replysubmit .waiting').hide();
+
-        if ( r.responseText )
-            er = r.responseText.replace( /<.[^<>]*?>/g, '' );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-};
@@ -233 +287 @@
-$(document).ready(function(){
-    columns.init('comment');
+    commentReply.init();
-
-    if ( typeof QTags != 'undefined' )
@@ -240 +295 @@
-        var make_hotkeys_redirect = function(which) {
-            return function() {
- 
+
-                var l=$('.'+which+'.page-numbers');
-                if (l.length)
@@ -260 +315 @@
-            }
-        };
-
+'q', 
-                ['shift+a', make_bulk('approve')], ['shift+s', make_bulk('markspam')],
-                ['shift+d', make_bulk('delete')], ['shift+x', toggle_all]],

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

@@ -187 +187 @@
-            id = this.getId(id);
-
-#edit-'+id+'.quick-edit-save').append('<img style="padding:0 15px;" src="images/loading.gif" alt="" />'
+table.widefat .quick-edit-save .waiting').show(
-
-        var params = {
@@ -226 +226 @@
-
-        if ( id = $('table.widefat tr.inline-editor').attr('id') ) {
+            $('table.widefat .quick-edit-save .waiting').hide();
+
-            if ( 'bulk-edit' == id ) {
-                $('table.widefat #bulk-edit').removeClass('inline-editor').hide();

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

@@ -91 +91 @@
-            id = this.getId(id);
-
-#edit-'+id+'.quick-edit-save').append('<img style="padding:0 15px;" src="images/loading.gif" alt="" />'
+table.widefat .quick-edit-save .waiting').show(
-
-        var params = {
@@ -127 +127 @@
-
-        if ( id ) {
+            $('table.widefat .quick-edit-save .waiting').hide();
-            $('#'+id).remove();
-            id = id.substr( id.lastIndexOf('-') + 1 );

trunk/wp-admin/wp-admin.css

@@ -330 +330 @@
-}
-
-
-
+
-    margin: 3px 2px 2px;
-    padding: 2px 4px;
@@ -513 +512 @@
-.column-comment p {
-    margin-top: 0;
-}
-
-.column-comment {
-    width: 50%;
-}
-
-.column-author,
-.column-response {
-    width: 20%;
-}
-
@@ -1961 +1951 @@
-
-/* reply to comments */
-
-
+
+
+
+
+
-    border-width: 1px;
-    border-style: solid;
+}
+
+#replyrow td {
-    padding: 2px;
-
-
-
-
-
-
+
+
+
-    border: 0 none;
-}
@@ -1977 +1970 @@
-#replysubmit {
-    margin: 0;
-3px 
+
-    border-top-width: 1px;
-    border-top-style: solid;
-}
-
-
-
+
+
+
+
+
+
+
-    margin-right: 5px;
-}
-
-div
+row
-    display: none;
-}
-
-
-
-
-
+
+
-    font-weight: bold;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-#replycontainer {
-6
+5
-    border: 0 none;
-00%
+20px
-    overflow: hidden;
+    position: relative;
-}
-
@@ -2015 +2040 @@
-    border: 0 none;
-    outline: none;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/wp-includes/js/jquery/jquery.table-hotkeys.js

@@ -66 +66 @@
-        };
-        var first_row = get_first_row();
-     
+
-        if (opts.highlight_first)
-            set_current_row(first_row);
@@ -84 +84 @@
-            }
-        });
-
+
-    };
-    $.table_hotkeys.current_row = null;

trunk/wp-includes/script-loader.php

@@ -159 +159 @@
-            'strong' => __('Strong')
-        ) );
-draggable', 'jquery-ui-resizable', 'quicktags', 'columns', 'settings-box'), '20080925
+resizable', 'quicktags', 'columns', 'settings-box'), '20081007
-        $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
-            'pending' => __('%i% pending'), // must look like: "# blah blah"
@@ -243 +243 @@
-        $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
-
-0930
+1007
-        $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
-
-
-
-
+
+
+
+
+
-        $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
-            'edit' => __('Double-click to edit'),