Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-10-30 07:20:01 +01:00
Code Issues Projects Releases Wiki Activity

Administration: A11y: Clarify settings in discussion options.

Browse Source 
Fix several settings groups in the discussion options that were written in a compound/sentence structure format. These formats are difficult to parse for screen reader users and have significant layout problems in mobile viewports.

Change settings to use independent labeling.

Props Cheffheid, anthakkar08, DrewAPicture, afercia, jwgoedert, sannevndrmeulen, sudipatel007, tirth03, joedolson.
See #31354.
Built from https://develop.svn.wordpress.org/trunk@59160


git-svn-id: http://core.svn.wordpress.org/trunk@58555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
joedolson 2024-10-03 21:28:18 +00:00
parent 92d9e70f84
commit 9fd5f24d73
6 changed files with 55 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/edit-rtl.css
View File

@ -1298,7 +1298,7 @@ div.tabs-panel-active:focus {
/* Only visible in Windows High Contrast mode */ /* Only visible in Windows High Contrast mode */
outline: 2px solid transparent; outline: 2px solid transparent;
} }
.options-discussion-php .indent-children ul,
#front-page-warning, #front-page-warning,
#front-static-pages ul, #front-static-pages ul,
ul.export-filters, ul.export-filters,

2
wp-admin/css/edit-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/edit.css
View File

@ -1297,7 +1297,7 @@ div.tabs-panel-active:focus {
/* Only visible in Windows High Contrast mode */ /* Only visible in Windows High Contrast mode */
outline: 2px solid transparent; outline: 2px solid transparent;
} }
.options-discussion-php .indent-children ul,
#front-page-warning, #front-page-warning,
#front-static-pages ul, #front-static-pages ul,
ul.export-filters, ul.export-filters,

2
wp-admin/css/edit.min.css vendored
View File

File diff suppressed because one or more lines are too long

113
wp-admin/options-discussion.php
View File

@ -42,7 +42,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
<form method="post" action="options.php"> <form method="post" action="options.php">
<?php settings_fields( 'discussion' ); ?> <?php settings_fields( 'discussion' ); ?>
<table class="form-table" role="presentation"> <table class="form-table indent-children" role="presentation">
<tr> <tr>
<th scope="row"><?php _e( 'Default post settings' ); ?></th> <th scope="row"><?php _e( 'Default post settings' ); ?></th>
<td><fieldset><legend class="screen-reader-text"><span> <td><fieldset><legend class="screen-reader-text"><span>
@ -86,27 +86,20 @@ if ( ! get_option( 'users_can_register' ) && is_multisite() ) {
?> ?>
</label> </label>
<br /> <br />
<input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked( '1', get_option( 'close_comments_for_old_posts' ) ); ?> /> <label for="close_comments_for_old_posts"><?php _e( 'Automatically close comments on old posts' ); ?></label>
<ul>
<li>
<label for="close_comments_days_old"><?php _e( 'Close comments when post is how many days old' ); ?></label>
<input name="close_comments_days_old" type="number" step="1" min="0" id="close_comments_days_old" value="<?php echo esc_attr( get_option( 'close_comments_days_old' ) ); ?>" class="small-text"/>
</li>
</ul>
<label for="close_comments_for_old_posts">
<input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked( '1', get_option( 'close_comments_for_old_posts' ) ); ?> />
<?php
printf(
/* translators: %s: Number of days. */
__( 'Automatically close comments on posts older than %s days' ),
'</label> <label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="' . esc_attr( get_option( 'close_comments_days_old' ) ) . '" class="small-text" />'
);
?>
</label>
<br />
<label for="show_comments_cookies_opt_in">
<input name="show_comments_cookies_opt_in" type="checkbox" id="show_comments_cookies_opt_in" value="1" <?php checked( '1', get_option( 'show_comments_cookies_opt_in' ) ); ?> /> <input name="show_comments_cookies_opt_in" type="checkbox" id="show_comments_cookies_opt_in" value="1" <?php checked( '1', get_option( 'show_comments_cookies_opt_in' ) ); ?> />
<?php _e( 'Show comments cookies opt-in checkbox, allowing comment author cookies to be set' ); ?> <label for="show_comments_cookies_opt_in"><?php _e( 'Show comments cookies opt-in checkbox, allowing comment author cookies to be set' ); ?></label>
</label>
<br /> <br />
<label for="thread_comments">
<input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked( '1', get_option( 'thread_comments' ) ); ?> /> <input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked( '1', get_option( 'thread_comments' ) ); ?> />
<label for="thread_comments"><?php _e( 'Enable threaded (nested) comments' ); ?></label>
<?php <?php
/** /**
* Filters the maximum depth of threaded/nested comments. * Filters the maximum depth of threaded/nested comments.
@ -117,7 +110,7 @@ printf(
*/ */
$maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 ); $maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
$thread_comments_depth = '</label> <label for="thread_comments_depth"><select name="thread_comments_depth" id="thread_comments_depth">'; $thread_comments_depth = '<select name="thread_comments_depth" id="thread_comments_depth">';
for ( $i = 2; $i <= $maxdeep; $i++ ) { for ( $i = 2; $i <= $maxdeep; $i++ ) {
$thread_comments_depth .= "<option value='" . esc_attr( $i ) . "'"; $thread_comments_depth .= "<option value='" . esc_attr( $i ) . "'";
if ( (int) get_option( 'thread_comments_depth' ) === $i ) { if ( (int) get_option( 'thread_comments_depth' ) === $i ) {
@ -126,52 +119,46 @@ for ( $i = 2; $i <= $maxdeep; $i++ ) {
$thread_comments_depth .= ">$i</option>"; $thread_comments_depth .= ">$i</option>";
} }
$thread_comments_depth .= '</select>'; $thread_comments_depth .= '</select>';
/* translators: %s: Number of levels. */
printf( __( 'Enable threaded (nested) comments %s levels deep' ), $thread_comments_depth );
?> ?>
</label> <ul>
<br /> <li>
<label for="page_comments"> <label for="thread_comments_depth"><?php _e( 'Number of levels for threaded (nested) comments' ); ?></label>
<?php echo $thread_comments_depth; ?>
</li>
</ul>
</fieldset></td>
</tr>
<tr>
<th scope="row"><?php _e( 'Comment Pagination' ); ?></th>
<td><fieldset><legend class="screen-reader-text"><span>
<?php
/* translators: Hidden accessibility text. */
_e( 'Comment Pagination' );
?>
</span></legend>
<input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked( '1', get_option( 'page_comments' ) ); ?> /> <input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked( '1', get_option( 'page_comments' ) ); ?> />
<?php <label for="page_comments"><?php _e( 'Break comments into pages' ); ?></label>
$default_comments_page = '</label> <label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"'; <ul>
if ( 'newest' === get_option( 'default_comments_page' ) ) { <li>
$default_comments_page .= ' selected="selected"'; <label for="comments_per_page"><?php _e( 'Top level comments per page' ); ?></label>
} <input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="<?php echo esc_attr( get_option( 'comments_per_page' ) ); ?>" class="small-text" />
$default_comments_page .= '>' . __( 'last' ) . '</option><option value="oldest"'; </li>
if ( 'oldest' === get_option( 'default_comments_page' ) ) { <li>
$default_comments_page .= ' selected="selected"'; <label for="default_comments_page"><?php _e( 'Comments page to display by default' ); ?></label>
} <select name="default_comments_page" id="default_comments_page">
$default_comments_page .= '>' . __( 'first' ) . '</option></select>'; <option value="newest" <?php selected( 'newest', get_option( 'default_comments_page' ) ); ?>><?php _e( 'last page' ); ?></option>
printf( <option value="oldest" <?php selected( 'oldest', get_option( 'default_comments_page' ) ); ?>><?php _e( 'first page' ); ?></option>
/* translators: 1: Form field control for number of top level comments per page, 2: Form field control for the 'first' or 'last' page. */ </select>
__( 'Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default' ), </li>
'</label> <label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="' . esc_attr( get_option( 'comments_per_page' ) ) . '" class="small-text" />', <li>
$default_comments_page <label for="comment_order"><?php _e( 'Comments to display at the top of each page' ); ?></label>
); <select name="comment_order" id="comment_order">
?> <option value="asc" <?php selected( 'asc', get_option( 'comment_order' ) ); ?>><?php _e( 'older' ); ?></option>
</label> <option value="desc" <?php selected( 'desc', get_option( 'comment_order' ) ); ?>><?php _e( 'newer' ); ?></option>
<br /> </select>
<label for="comment_order"> </li>
<?php </ul>
$comment_order = '<select name="comment_order" id="comment_order"><option value="asc"';
if ( 'asc' === get_option( 'comment_order' ) ) {
$comment_order .= ' selected="selected"';
}
$comment_order .= '>' . __( 'older' ) . '</option><option value="desc"';
if ( 'desc' === get_option( 'comment_order' ) ) {
$comment_order .= ' selected="selected"';
}
$comment_order .= '>' . __( 'newer' ) . '</option></select>';
/* translators: %s: Form field control for 'older' or 'newer' comments. */
printf( __( 'Comments should be displayed with the %s comments at the top of each page' ), $comment_order );
?>
</label>
</fieldset></td> </fieldset></td>
</tr> </tr>
<tr> <tr>

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.7-beta1-59159'; $wp_version = '6.7-beta1-59160';
/** /**
* 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.