Ticket #33646: 33646.4.patch

src/wp-admin/css/common.css

@@ -1565 +1565 @@
         background-position: bottom left;
 }
 
-#screen-options-wrap h5,
+#screen-options-wrap legend,
 #contextual-help-wrap h5 {
-        margin: 8px 0;
+        margin: 0;
+        padding: 8px 0;
         font-size: 13px;
+        font-weight: 600;
 }
 
 .metabox-prefs label {
@@ -1577 +1579 @@
         line-height: 30px;
 }
 
+#number-of-columns {
+        display: inline-block;
+        vertical-align: middle;
+        line-height: 30px;
+}
+
 .metabox-prefs label input[type=checkbox] {
         margin-top: -4px;
         margin-right: 6px;

src/wp-admin/css/customize-nav-menus.css

@@ -349 +349 @@
         display: none;
         background: #fff;
         border-top: 1px solid #ddd;
-        padding: 4px 15px 0;
+        padding: 4px 15px 15px;
 }
 
 .wp-customizer .metabox-prefs label {

src/wp-admin/includes/class-wp-screen.php

@@ -903 +903 @@
                 $columns = get_column_headers( $this );
                 $hidden  = get_hidden_columns( $this );
 
+                $do_outer_fieldset = (
+                        isset( $wp_meta_boxes[ $this->id ] )
+                        ||
+                        $this->get_option( 'per_page' )
+                        ||
+                        ( $columns && empty( $columns['_title'] ) )
+                );
+
+                $do_inner_fieldset = ( ! empty( $columns['_title'] ) );
+
                 ?>
                 <?php if ( $options['wrap'] ) : ?>
                         <div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="<?php esc_attr_e('Screen Options Tab'); ?>">
                 <?php endif; ?>
                 <form id="adv-settings" method="post">
-                <?php if ( isset( $wp_meta_boxes[ $this->id ] ) || $this->get_option( 'per_page' ) || ( $columns && empty( $columns['_title'] ) ) ) : ?>
-                        <h5><?php _e( 'Show on screen' ); ?></h5>
+                <?php if ( $do_outer_fieldset ) : ?>
+                        <fieldset>
+                                <legend><?php _e( 'Show on screen' ); ?></legend>
                 <?php
                 endif;
 
@@ -932 +943 @@
                                                 echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
                                         }
                                 ?>
-                                <br class="clear" />
                         </div>
                         <?php endif;
                         if ( $columns ) :
-                                if ( ! empty( $columns['_title'] ) ) : ?>
-                        <h5><?php echo $columns['_title']; ?></h5>
+                                if ( $do_inner_fieldset ) : ?>
+                        <fieldset>
+                                <legend><?php echo $columns['_title']; ?></legend>
                         <?php endif; ?>
                         <div class="metabox-prefs">
                                 <?php
@@ -958 +969 @@
                                         echo "$title</label>\n";
                                 }
                                 ?>
-                                <br class="clear" />
                         </div>
+                        <?php if ( $do_inner_fieldset ) : ?>
+                        </fieldset>
+                        <?php endif; ?>
                 <?php endif;
 
+                if ( $do_outer_fieldset ) : ?>
+                        </fieldset>
+                <?php endif;
                 $this->render_screen_layout();
                 $this->render_per_page_options();
                 echo $this->_screen_settings;
@@ -987 +1003 @@
                 $num = $this->get_option( 'layout_columns', 'max' );
 
                 ?>
-                <h5 class="screen-layout"><?php _e('Screen Layout'); ?></h5>
-                <div class='columns-prefs'><?php
-                        _e('Number of Columns:');
-                        for ( $i = 1; $i <= $num; ++$i ):
-                                ?>
+                <fieldset>
+                <legend class="screen-layout"><?php _e( 'Screen Layout' ); ?></legend>
+                <div class='columns-prefs'>
+                        <span id='number-of-columns'><?php _e( 'Number of Columns:' ); ?></span>
+                        <?php for ( $i = 1; $i <= $num; ++$i ): ?>
                                 <label class="columns-prefs-<?php echo $i; ?>">
-                                        <input type='radio' name='screen_columns' value='<?php echo esc_attr( $i ); ?>'
-                                                <?php checked( $screen_layout_columns, $i ); ?> />
+                                        <input type="radio" name="screen_columns" aria-describedby="number-of-columns" value="<?php echo esc_attr( $i ); ?>" <?php checked( $screen_layout_columns, $i ); ?> />
                                         <?php echo esc_html( $i ); ?>
                                 </label>
-                                <?php
-                        endfor; ?>
+                        <?php endfor; ?>
                 </div>
+                </fieldset>
                 <?php
         }