Ticket #55651: 55651.diff
File 55651.diff, 8.1 KB (added by , 3 years ago) |
---|
-
src/wp-admin/edit-tag-form.php
145 145 <table class="form-table" role="presentation"> 146 146 <tr class="form-field form-required term-name-wrap"> 147 147 <th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th> 148 <td><input name="name" id="name" type="text" value="<?php echo $tag_name_value; ?>" size="40" aria-required="true" />149 <p class="description" ><?php echo $tax->labels->name_field_description; ?></p></td>148 <td><input name="name" id="name" type="text" value="<?php echo $tag_name_value; ?>" size="40" aria-required="true" aria-describedby="name-description" /> 149 <p class="description" id="name-description"><?php echo $tax->labels->name_field_description; ?></p></td> 150 150 </tr> 151 151 <?php if ( ! global_terms_enabled() ) { ?> 152 152 <tr class="form-field term-slug-wrap"> … … 167 167 */ 168 168 $slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug, $tag ) : ''; 169 169 ?> 170 <td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />171 <p class="description" ><?php echo $tax->labels->slug_field_description; ?></p></td>170 <td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" aria-describedby="slug-description" /> 171 <p class="description" id="slug-description"><?php echo $tax->labels->slug_field_description; ?></p></td> 172 172 </tr> 173 173 <?php } ?> 174 174 <?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?> … … 186 186 'exclude_tree' => $tag->term_id, 187 187 'hierarchical' => true, 188 188 'show_option_none' => __( 'None' ), 189 'aria_describedby' => 'parent-description', 189 190 ); 190 191 191 192 /** This filter is documented in wp-admin/edit-tags.php */ … … 193 194 wp_dropdown_categories( $dropdown_args ); 194 195 ?> 195 196 <?php if ( 'category' === $taxonomy ) : ?> 196 <p class="description" ><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>197 <p class="description" id="parent-description"><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p> 197 198 <?php else : ?> 198 <p class="description" ><?php echo $tax->labels->parent_field_description; ?></p>199 <p class="description" id="parent-description"><?php echo $tax->labels->parent_field_description; ?></p> 199 200 <?php endif; ?> 200 201 </td> 201 202 </tr> … … 202 203 <?php endif; // is_taxonomy_hierarchical() ?> 203 204 <tr class="form-field term-description-wrap"> 204 205 <th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th> 205 <td><textarea name="description" id="description" rows="5" cols="50" class="large-text" ><?php echo $tag->description; // textarea_escaped ?></textarea>206 <p class="description" ><?php echo $tax->labels->desc_field_description; ?></p></td>206 <td><textarea name="description" id="description" rows="5" cols="50" class="large-text" aria-describedby="description-description"><?php echo $tag->description; // textarea_escaped ?></textarea> 207 <p class="description" id="description-description"><?php echo $tax->labels->desc_field_description; ?></p></td> 207 208 </tr> 208 209 <?php 209 210 // Back compat hooks. -
src/wp-admin/edit-tags.php
453 453 454 454 <div class="form-field form-required term-name-wrap"> 455 455 <label for="tag-name"><?php _ex( 'Name', 'term name' ); ?></label> 456 <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />457 <p ><?php echo $tax->labels->name_field_description; ?></p>456 <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" aria-describedby="name-description" /> 457 <p id="name-description"><?php echo $tax->labels->name_field_description; ?></p> 458 458 </div> 459 459 <?php if ( ! global_terms_enabled() ) : ?> 460 460 <div class="form-field term-slug-wrap"> 461 461 <label for="tag-slug"><?php _e( 'Slug' ); ?></label> 462 <input name="slug" id="tag-slug" type="text" value="" size="40" />463 <p ><?php echo $tax->labels->slug_field_description; ?></p>462 <input name="slug" id="tag-slug" type="text" value="" size="40" aria-describedby="slug-description" /> 463 <p id="slug-description"><?php echo $tax->labels->slug_field_description; ?></p> 464 464 </div> 465 465 <?php endif; // global_terms_enabled() ?> 466 466 <?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?> … … 500 500 */ 501 501 $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' ); 502 502 503 $dropdown_args['aria_describedby'] = 'parent-description'; 504 503 505 wp_dropdown_categories( $dropdown_args ); 504 506 ?> 505 507 <?php if ( 'category' === $taxonomy ) : ?> 506 <p ><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>508 <p id="parent-description"><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p> 507 509 <?php else : ?> 508 <p ><?php echo $tax->labels->parent_field_description; ?></p>510 <p id="parent-description"><?php echo $tax->labels->parent_field_description; ?></p> 509 511 <?php endif; ?> 510 512 </div> 511 513 <?php endif; // is_taxonomy_hierarchical() ?> 512 514 <div class="form-field term-description-wrap"> 513 515 <label for="tag-description"><?php _e( 'Description' ); ?></label> 514 <textarea name="description" id="tag-description" rows="5" cols="40" ></textarea>515 <p ><?php echo $tax->labels->desc_field_description; ?></p>516 <textarea name="description" id="tag-description" rows="5" cols="40" aria-describedby="description-description"></textarea> 517 <p id="description-description"><?php echo $tax->labels->desc_field_description; ?></p> 516 518 </div> 517 519 518 520 <?php -
src/wp-includes/category-template.php
298 298 * @since 2.1.0 299 299 * @since 4.2.0 Introduced the `value_field` argument. 300 300 * @since 4.6.0 Introduced the `required` argument. 301 * @since 6.1.0 Introduced the `aria_describedby` argument. 301 302 * 302 303 * @param array|string $args { 303 304 * Optional. Array or string of arguments to generate a categories drop-down element. See WP_Term_Query::__construct() … … 333 334 * Default false. 334 335 * @type Walker $walker Walker object to use to build the output. Default empty which results in a 335 336 * Walker_CategoryDropdown instance being used. 337 * @type string $aria_describedby The 'id' of an element that contains descriptive text for the select. 338 * Default empty string. 336 339 * } 337 340 * @return string HTML dropdown list of categories. 338 341 */ … … 359 362 'option_none_value' => -1, 360 363 'value_field' => 'term_id', 361 364 'required' => false, 365 'aria_describedby' => '', 362 366 ); 363 367 364 368 $defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0; … … 404 408 $id = $parsed_args['id'] ? esc_attr( $parsed_args['id'] ) : $name; 405 409 $required = $parsed_args['required'] ? 'required' : ''; 406 410 411 $aria_describedby_attribute = $parsed_args['aria_describedby'] ? ' aria-describedby="' . esc_attr( $parsed_args['aria_describedby'] ) . '"' : ''; 412 407 413 if ( ! $parsed_args['hide_if_empty'] || ! empty( $categories ) ) { 408 $output = "<select $required name='$name' id='$id' class='$class' $tab_index_attribute>\n";414 $output = "<select $required name='$name' id='$id' class='$class'$tab_index_attribute$aria_describedby_attribute>\n"; 409 415 } else { 410 416 $output = ''; 411 417 }