Ticket #43587: 43587.diff

wp-admin/css/common.css

@@ -2111 +2111 @@
 #pass-strength-result.short,
 #ed_reply_toolbar #ed_reply_strong,
 .item-controls .item-order a,
-.feature-filter .feature-name {
+.feature-filter .feature-name, #comment-status-display {
         font-weight: 600;
 }
 

wp-admin/css/edit.css

@@ -448 +448 @@
 #post-body #visibility:before,
 .curtime #timestamp:before,
 #post-body .misc-pub-revisions:before,
-span.wp-media-buttons-icon:before {
+span.wp-media-buttons-icon:before, 
+#post-body .misc-pub-response-to:before, 
+#post-body .misc-pub-comment-status:before {
         color: #82878c;
 }
 
 #post-body .misc-pub-post-status:before,
 #post-body #visibility:before,
 .curtime #timestamp:before,
-#post-body .misc-pub-revisions:before {
+#post-body .misc-pub-revisions:before, 
+#post-body .misc-pub-response-to:before, 
+#post-body .misc-pub-comment-status:before {
         font: normal 20px/1 dashicons;
         speak: none;
         display: inline-block;
@@ -466 +470 @@
         -moz-osx-font-smoothing: grayscale;
 }
 
-#post-body .misc-pub-post-status:before {
+#post-body .misc-pub-post-status:before, 
+#post-body .misc-pub-comment-status:before {
         content: "\f173";
 }
 
@@ -484 +489 @@
         content: "\f321";
 }
 
+#post-body .misc-pub-response-to:before {
+        content: "\f101";
+}
+
 #timestampdiv {
         padding-top: 5px;
         line-height: 23px;
@@ -607 +616 @@
         line-height: 1.4;
 }
 
+#poststuff .stuffbox > h2 {
+    border-bottom: 1px solid #eee;
+}
+
 #poststuff .inside {
         margin: 6px 0 0 0;
 }
@@ -630 +643 @@
         font-weight: 600;
 }
 
-#post-visibility-select {
+#post-visibility-select, 
+#comment-status-select {
         line-height: 1.5em;
         margin-top: 3px;
 }

wp-admin/edit-form-comment.php

@@ -81 +81 @@
 
 <div id="postbox-container-1" class="postbox-container">
 <div id="submitdiv" class="stuffbox" >
-<h2><?php _e( 'Status' ); ?></h2>
+<h2><?php _e( 'Save' ); ?></h2>
 <div class="inside">
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">
 
 <div id="misc-publishing-actions">
 
-<fieldset class="misc-pub-section misc-pub-comment-status" id="comment-status-radio">
-<legend class="screen-reader-text"><?php _e( 'Comment status' ); ?></legend>
-<label><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _ex( 'Approved', 'comment status' ); ?></label><br />
-<label><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _ex( 'Pending', 'comment status' ); ?></label><br />
-<label><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php _ex( 'Spam', 'comment status' ); ?></label>
-</fieldset>
+<div class="misc-pub-section misc-pub-comment-status" id="comment-status">
+<?php _e( 'Status:' ); ?> <span id="comment-status-display">
+                        <?php
+
+                        switch ( $comment->comment_approved ) {
+                                case '1':
+                                        _e( 'Approved' );
+                                        break;
+                                case '0':
+                                        _e( 'Pending' );
+                                        break;
+                                case 'spam':
+                                        _e( 'Spam' );
+                                        break;
+                        }
+?>
+</span>
+<a href="#comment-status" class="edit-comment-status hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit Comment Status' ); ?></span></a>
+
+<div id="comment-status-select" class="hide-if-js">
+        <fieldset>
+                <legend class="screen-reader-text"><?php _e( 'Comment status' ); ?></legend>
+                <label><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _ex( 'Approved', 'comment status' ); ?></label><br />
+                <label><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _ex( 'Pending', 'comment status' ); ?></label><br />
+                <label><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php _ex( 'Spam', 'comment status' ); ?></label>
+        </fieldset>
+<p>
+        <a href="#comment-status" class="save-comment-status hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+        <a href="#comment-status" class="cancel-comment-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
+</p>
+</div>
+
+</div><!-- .misc-pub-section -->
 
 <div class="misc-pub-section curtime misc-pub-curtime">
 <?php

wp-admin/js/comment.js

@@ -11 +11 @@
 
         postboxes.add_postbox_toggles('comment');
 
+        // Comment Status
+
+        var $commentStatusSelect = $('#comment-status-select');
+
+        if ( $('#submitdiv').length ) {
+                commentStatus = $('#comment-status-display').html();
+                        
+
+                // Show the comment status options and hide the toggle button when opened.
+                $( '#comment-status .edit-comment-status').click( function( e ) {
+                        e.preventDefault();
+                        if ( $commentStatusSelect.is(':hidden') ) {
+                                $commentStatusSelect.slideDown( 'fast', function() {
+                                        $commentStatusSelect.find( 'input[type="radio"]' ).first().focus();
+                                } );
+                                $(this).hide();
+                        }
+                });
+
+                // Cancel comment status selection area and hide it from view.
+                $commentStatusSelect.find('.cancel-comment-status').click( function( event ) {
+                        $commentStatusSelect.slideUp('fast');
+                        $('#comment-status-display').html(commentStatus);
+                        $('#comment-status .edit-comment-status').show().focus();
+                        event.preventDefault();
+                });
+
+                // Set the selected comment status as current.
+                $commentStatusSelect.find('.save-comment-status').click( function( event ) {
+                        $commentStatusSelect.slideUp('fast');
+                        $('#comment-status .edit-comment-status').show().focus();
+
+                        $('#comment-status-display').html( $commentStatusSelect.find('input:radio:checked').parent().text() );
+
+                        event.preventDefault();
+                });
+
+        };
+
         var $timestampdiv = $('#timestampdiv'),
                 $timestamp = $( '#timestamp' ),
                 stamp = $timestamp.html(),
@@ -94 +133 @@
                 $edittimestamp.show().focus();
                 $timestampdiv.slideUp( 'fast' );
         });
+
 });