From a3e9876c39eb4d37cd4541b01a39e80361d0824f Mon Sep 17 00:00:00 2001
From: Andrea Fercia <afercia@git.wordpress.org>
Date: Tue, 15 Nov 2016 16:00:41 +0000
Subject: [PATCH] Accessibility: Improve the Post Attributes meta box fields
 labels.

With [38951] the support for custom page templates has been extended to all post
types. By making the visible meta box titles real labels, accessibility improves
for all users and form fields have meaningful labels.

Fixes #38790.


git-svn-id: https://develop.svn.wordpress.org/trunk@39247 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/edit.css            |  9 +++++++++
 src/wp-admin/includes/meta-boxes.php | 17 +++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 5ee57f3051..d33f1077f9 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -628,6 +628,15 @@ span.wp-media-buttons-icon:before {
 	width: 250px;
 }
 
+.post-attributes-label-wrapper {
+	margin-bottom: 0.5em;
+}
+
+.post-attributes-label {
+	vertical-align: baseline;
+	font-weight: 600;
+}
+
 #post-visibility-select {
 	line-height: 1.5em;
 	margin-top: 3px;
diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index 13d463d2c9..945ffd51e4 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -813,8 +813,7 @@ function page_attributes_meta_box($post) {
 		$pages = wp_dropdown_pages( $dropdown_args );
 		if ( ! empty($pages) ) :
 ?>
-<p><strong><?php _e('Parent') ?></strong></p>
-<label class="screen-reader-text" for="parent_id"><?php _e('Parent') ?></label>
+<p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="parent_id"><?php _e( 'Parent' ); ?></label></p>
 <?php echo $pages; ?>
 <?php
 		endif; // end empty pages check
@@ -823,9 +822,9 @@ function page_attributes_meta_box($post) {
 	if ( count( get_page_templates( $post ) ) > 0 && get_option( 'page_for_posts' ) != $post->ID ) :
 		$template = ! empty( $post->page_template ) ? $post->page_template : false;
 		?>
-<p><strong><?php _e('Template') ?></strong><?php
+<p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="page_template"><?php _e( 'Template' ); ?></label><?php
 	/**
-	 * Fires immediately after the heading inside the 'Template' section
+	 * Fires immediately after the label inside the 'Template' section
 	 * of the 'Page Attributes' meta box.
 	 *
 	 * @since 4.4.0
@@ -835,12 +834,6 @@ function page_attributes_meta_box($post) {
 	 */
 	do_action( 'page_attributes_meta_box_template', $template, $post );
 ?></p>
-<label class="screen-reader-text" for="page_template">
-	<?php
-	$post_type_object = get_post_type_object( $post->post_type );
-	echo esc_html( $post_type_object->labels->attributes );
-	?>
-</label>
 <select name="page_template" id="page_template">
 <?php
 /**
@@ -859,8 +852,8 @@ $default_title = apply_filters( 'default_page_template_title',  __( 'Default Tem
 </select>
 <?php endif; ?>
 <?php if ( post_type_supports( $post->post_type, 'page-attributes' ) ) : ?>
-<p><strong><?php _e('Order') ?></strong></p>
-<p><label class="screen-reader-text" for="menu_order"><?php _e('Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo esc_attr($post->menu_order) ?>" /></p>
+<p class="post-attributes-label-wrapper"><label class="post-attributes-label" for="menu_order"><?php _e( 'Order' ); ?></label></p>
+<input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo esc_attr( $post->menu_order ); ?>" />
 <?php if ( 'page' == $post->post_type && get_current_screen()->get_help_tabs() ) : ?>
 <p><?php _e( 'Need help? Use the Help tab above the screen title.' ); ?></p>
 <?php endif;