From 22ca3c51a616722760f5af323983e80a6cbfe8d6 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 11 Feb 2020 00:05:01 +0000
Subject: [PATCH] Comments: Improve the appearance of the Status box on Edit
 Comment screen.

This makes the box more consistent with the Publish meta box in classic editor.

Props birgire, nfmohit, melchoyce, afercia.
Fixes #43587.

git-svn-id: https://develop.svn.wordpress.org/trunk@47252 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/common.css        |  3 ++-
 src/wp-admin/css/edit.css          | 22 ++++++++++++++++++----
 src/wp-admin/edit-form-comment.php | 24 +++++++++++++++++++++---
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index a8b8112b00..5c97f14453 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2151,7 +2151,8 @@ html.wp-toolbar {
 #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;
 }
 
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 9ce2f72a5f..1a40be673f 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -447,14 +447,18 @@ form#tags-filter {
 #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 {
 	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;
@@ -465,7 +469,8 @@ form#tags-filter {
 	-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";
 }
 
@@ -483,6 +488,10 @@ form#tags-filter {
 	content: "\f321";
 }
 
+#post-body .misc-pub-response-to:before {
+	content: "\f101";
+}
+
 #timestampdiv {
 	padding-top: 5px;
 	line-height: 1.76923076;
@@ -609,6 +618,10 @@ form#tags-filter {
 	padding: 8px 10px;
 }
 
+.poststuff .stuffbox > h2 {
+	border-bottom: 1px solid #eee;
+}
+
 .poststuff .inside {
 	margin: 6px 0 0 0;
 }
@@ -636,7 +649,8 @@ form#tags-filter {
 	font-weight: 600;
 }
 
-#post-visibility-select {
+#post-visibility-select,
+#comment-status-radio {
 	line-height: 1.5;
 	margin-top: 3px;
 }
diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php
index c6b379b7d1..c52ec6d6f7 100644
--- a/src/wp-admin/edit-form-comment.php
+++ b/src/wp-admin/edit-form-comment.php
@@ -87,20 +87,38 @@ if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_
 
 <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">
+<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>
+
+<fieldset 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><!-- .misc-pub-section -->
+	
 <div class="misc-pub-section curtime misc-pub-curtime">
 <?php
 $submitted = sprintf(