Ticket #33757: 33757.3.patch

src/wp-admin/css/edit.css

@@ -24 +24 @@
 }
 
 #save-action .spinner,
-#show-comments a,
-#show-comments .spinner {
+#show-comments a {
         float: left;
 }
 
+#show-comments .spinner {
+        float: none;
+        margin-top: 0;
+}
+
 #lost-connection-notice .spinner {
         visibility: visible;
         float: left;
@@ -246 +250 @@
 #normal-sortables .postbox #replyrow .submit {
         float: none;
         margin: 0;
-        padding: 0 7px 5px;
+        padding: 5px 7px 10px;
+        overflow: hidden;
 }
 
 #side-sortables .submitbox .submit input,

src/wp-admin/css/list-tables.css

@@ -152 +152 @@
 
 #replysubmit {
         margin: 0;
-        padding: 0 5px 3px;
+        padding: 5px 7px 10px;
+        overflow: hidden;
         text-align: center;
 }
 
@@ -166 +167 @@
         text-align: center;
 }
 
-#replyrow h5 {
-        margin: .2em 0 0;
-        padding: 0 5px;
-        line-height: 1.4em;
-        font-size: 1em;
+#replyrow.inline-edit-row fieldset.comment-reply {
+        font-size: inherit;
+        line-height: inherit;
 }
 
+#replyrow legend {
+        margin: 0;
+        padding: .2em 5px 0;
+        font-size: 13px;
+        line-height: 1.4;
+        font-weight: 600;
+}
+
+#replyrow.inline-edit-row label {
+        display: inline;
+        vertical-align: baseline;
+        line-height: inherit;
+}
+
 #edithead .inside,
 #commentsdiv #edithead .inside {
         float: left;
@@ -433 +446 @@
 }
 
 #commentsdiv #edithead .inside input {
-        vertical-align: middle;
         width: 160px;
 }
 

src/wp-admin/includes/template-functions.php

@@ -380 +380 @@
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
 <?php endif; ?>
-        <div id="replyhead" style="display:none;"><h5><?php _e( 'Reply to Comment' ); ?></h5></div>
-        <div id="addhead" style="display:none;"><h5><?php _e('Add new Comment'); ?></h5></div>
+        <fieldset class="comment-reply">
+        <legend>
+                <span class="hidden" id="editlegend"><?php _e( 'Edit Comment' ); ?></span>
+                <span class="hidden" id="replyhead"><?php _e( 'Reply to Comment' ); ?></span>
+                <span class="hidden" id="addhead"><?php _e( 'Add new Comment' ); ?></span>
+        </legend>
+
+        <div id="replycontainer">
+        <label for="replycontent" class="screen-reader-text"><?php _e( 'Comment' ); ?></label>
+        <?php
+        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
+        wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+        ?>
+        </div>
+
         <div id="edithead" style="display:none;">
                 <div class="inside">
                 <label for="author-name"><?php _e( 'Name' ) ?></label>
@@ -397 +410 @@
                 <label for="author-url"><?php _e('URL') ?></label>
                 <input type="text" id="author-url" name="newcomment_author_url" class="code" size="103" value="" />
                 </div>
-                <div style="clear:both;"></div>
         </div>
 
-        <div id="replycontainer">
-        <?php
-        $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-        wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
-        ?>
-        </div>
-
         <p id="replysubmit" class="submit">
         <a href="#comments-form" class="save button-primary alignright">
         <span id="addbtn" style="display:none;"><?php _e('Add Comment'); ?></span>
@@ -415 +420 @@
         <a href="#comments-form" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
         <span class="waiting spinner"></span>
         <span class="error" style="display:none;"></span>
-        <br class="clear" />
         </p>
 
         <input type="hidden" name="action" id="action" value="" />
@@ -430 +434 @@
                 if ( current_user_can( 'unfiltered_html' ) )
                         wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
         ?>
+        </fieldset>
 <?php if ( $table_row ) : ?>
 </td></tr></tbody></table>
 <?php else : ?>

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

@@ -676 +676 @@
                         $('#author-url', editRow).val( $('div.author-url', rowData).text() );
                         $('#status', editRow).val( $('div.comment_status', rowData).text() );
                         $('#replycontent', editRow).val( $('textarea.comment', rowData).val() );
-                        $('#edithead, #savebtn', editRow).show();
+                        $( '#edithead, #editlegend, #savebtn', editRow ).show();
                         $('#replyhead, #replybtn, #addhead, #addbtn', editRow).hide();
 
                         if ( h > 120 ) {
@@ -691 +691 @@
                         });
                 } else if ( action == 'add' ) {
                         $('#addhead, #addbtn', editRow).show();
-                        $('#replyhead, #replybtn, #edithead, #savebtn', editRow).hide();
+                        $( '#replyhead, #replybtn, #edithead, #editlegend, #savebtn', editRow ) .hide();
                         $('#the-comment-list').prepend(editRow);
                         $('#replyrow').fadeIn(300);
                 } else {
                         replyButton = $('#replybtn', editRow);
-                        $('#edithead, #savebtn, #addhead, #addbtn', editRow).hide();
+                        $( '#edithead, #editlegend, #savebtn, #addhead, #addbtn', editRow ).hide();
                         $('#replyhead, #replybtn', editRow).show();
                         c.after(editRow);