In `wp_comment_reply()` change the H5 headings in fieldset legends for better accessibility.

Also, add a "Edit Comment" legend before the Quick Edit form to pair it with "Reply to Comment" and "Add new Comment" and move the Name, Email, and URL fields after the Comment textarea.

Props joedolson, afercia.

Fixes #33757.
Built from https://develop.svn.wordpress.org/trunk@34743


git-svn-id: http://core.svn.wordpress.org/trunk@34708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrea Fercia 2015-10-01 14:52:25 +00:00
parent 5a2627d38a
commit 0acededa82
10 changed files with 77 additions and 38 deletions

View File

@ -24,11 +24,15 @@
} }
#save-action .spinner, #save-action .spinner,
#show-comments a, #show-comments a {
#show-comments .spinner {
float: right; float: right;
} }
#show-comments .spinner {
float: none;
margin-top: 0;
}
#lost-connection-notice .spinner { #lost-connection-notice .spinner {
visibility: visible; visibility: visible;
float: right; float: right;
@ -247,7 +251,8 @@ ul.category-tabs li,
#normal-sortables .postbox #replyrow .submit { #normal-sortables .postbox #replyrow .submit {
float: none; float: none;
margin: 0; margin: 0;
padding: 0 7px 5px; padding: 5px 7px 10px;
overflow: hidden;
} }
#side-sortables .submitbox .submit input, #side-sortables .submitbox .submit input,

View File

@ -24,11 +24,15 @@
} }
#save-action .spinner, #save-action .spinner,
#show-comments a, #show-comments a {
#show-comments .spinner {
float: left; float: left;
} }
#show-comments .spinner {
float: none;
margin-top: 0;
}
#lost-connection-notice .spinner { #lost-connection-notice .spinner {
visibility: visible; visibility: visible;
float: left; float: left;
@ -247,7 +251,8 @@ ul.category-tabs li,
#normal-sortables .postbox #replyrow .submit { #normal-sortables .postbox #replyrow .submit {
float: none; float: none;
margin: 0; margin: 0;
padding: 0 7px 5px; padding: 5px 7px 10px;
overflow: hidden;
} }
#side-sortables .submitbox .submit input, #side-sortables .submitbox .submit input,

View File

@ -152,7 +152,8 @@
#replysubmit { #replysubmit {
margin: 0; margin: 0;
padding: 0 5px 3px; padding: 5px 7px 10px;
overflow: hidden;
text-align: center; text-align: center;
} }
@ -166,11 +167,23 @@
text-align: center; text-align: center;
} }
#replyrow h5 { #replyrow.inline-edit-row fieldset.comment-reply {
margin: .2em 0 0; font-size: inherit;
padding: 0 5px; line-height: inherit;
line-height: 1.4em; }
font-size: 1em;
#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, #edithead .inside,
@ -433,7 +446,6 @@ table.media .column-title .filename {
} }
#commentsdiv #edithead .inside input { #commentsdiv #edithead .inside input {
vertical-align: middle;
width: 160px; width: 160px;
} }

View File

@ -152,7 +152,8 @@
#replysubmit { #replysubmit {
margin: 0; margin: 0;
padding: 0 5px 3px; padding: 5px 7px 10px;
overflow: hidden;
text-align: center; text-align: center;
} }
@ -166,11 +167,23 @@
text-align: center; text-align: center;
} }
#replyrow h5 { #replyrow.inline-edit-row fieldset.comment-reply {
margin: .2em 0 0; font-size: inherit;
padding: 0 5px; line-height: inherit;
line-height: 1.4em; }
font-size: 1em;
#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, #edithead .inside,
@ -433,7 +446,6 @@ table.media .column-title .filename {
} }
#commentsdiv #edithead .inside input { #commentsdiv #edithead .inside input {
vertical-align: middle;
width: 160px; width: 160px;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -380,8 +380,21 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
<?php else : ?> <?php else : ?>
<div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;"> <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
<?php endif; ?> <?php endif; ?>
<div id="replyhead" style="display:none;"><h5><?php _e( 'Reply to Comment' ); ?></h5></div> <fieldset class="comment-reply">
<div id="addhead" style="display:none;"><h5><?php _e('Add new Comment'); ?></h5></div> <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 id="edithead" style="display:none;">
<div class="inside"> <div class="inside">
<label for="author-name"><?php _e( 'Name' ) ?></label> <label for="author-name"><?php _e( 'Name' ) ?></label>
@ -397,14 +410,6 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
<label for="author-url"><?php _e('URL') ?></label> <label for="author-url"><?php _e('URL') ?></label>
<input type="text" id="author-url" name="newcomment_author_url" class="code" size="103" value="" /> <input type="text" id="author-url" name="newcomment_author_url" class="code" size="103" value="" />
</div> </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> </div>
<p id="replysubmit" class="submit"> <p id="replysubmit" class="submit">
@ -415,7 +420,6 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
<a href="#comments-form" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a> <a href="#comments-form" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
<span class="waiting spinner"></span> <span class="waiting spinner"></span>
<span class="error" style="display:none;"></span> <span class="error" style="display:none;"></span>
<br class="clear" />
</p> </p>
<input type="hidden" name="action" id="action" value="" /> <input type="hidden" name="action" id="action" value="" />
@ -430,6 +434,7 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
if ( current_user_can( 'unfiltered_html' ) ) if ( current_user_can( 'unfiltered_html' ) )
wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false ); wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
?> ?>
</fieldset>
<?php if ( $table_row ) : ?> <?php if ( $table_row ) : ?>
</td></tr></tbody></table> </td></tr></tbody></table>
<?php else : ?> <?php else : ?>

View File

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

File diff suppressed because one or more lines are too long

View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34742'; $wp_version = '4.4-alpha-34743';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.