Changeset 34093

Timestamp:

09/13/2015 06:15:42 AM (11 years ago)

Author:

westonruter

Message:

Customize: Remove redundant aria-label attributes.

Adds an $options array argument to WP_Screen::render_screen_options() to allow the div#screen-options-wrap element to be omitted when wrap value is false.

Props afercia, westonruter.
Fixes #33182.

Location:

trunk/src

Files:

• wp-admin/customize.php (modified) (1 diff)
• wp-admin/includes/screen.php (modified) (3 diffs)
• wp-includes/class-wp-customize-panel.php (modified) (2 diffs)

trunk/src/wp-admin/customize.php

@@ -146 +146 @@
                 <div class="wp-full-overlay-sidebar-content" tabindex="-1">
                         <div id="customize-info" class="accordion-section customize-info">
-                                <div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Customizer Options' ); ?>">
+                                <div class="accordion-section-title">
                                         <span class="preview-notice"><?php
                                                 echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name' ) . '</strong>' );

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

@@ -1100 +1100 @@
          * @since 3.3.0
          *
+         * @param array $options {
+         *     @type bool $wrap  Whether the screen-options-wrap div will be included. Defaults to true.
+         * }
          * @global array $wp_meta_boxes
          */
-        public function render_screen_options() {
+        public function render_screen_options( $options = array() ) {
                 global $wp_meta_boxes;
+                $options = wp_parse_args( $options, array(
+                        'wrap' => true,
+                ) );
 
                 $columns = get_column_headers( $this );
@@ -1109 +1115 @@
 
                 ?>
-                <div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="<?php esc_attr_e('Screen Options Tab'); ?>">
+                <?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'] ) ) ) : ?>
@@ -1172 +1180 @@
                 <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
                 </form>
-                </div>
-                <?php
+                <?php if ( $options['wrap'] ) : ?>
+                        </div>
+                <?php endif;
         }
 

trunk/src/wp-includes/class-wp-customize-panel.php

@@ -417 +417 @@
                 // Display screen options.
                 $screen = WP_Screen::get( 'nav-menus.php' );
-                $screen->render_screen_options();
+                $screen->render_screen_options( array( 'wrap' => false ) );
         }
 
@@ -476 +476 @@
                         <div class="description customize-panel-description">{{{ data.description }}}</div>
                         <# } #>
-                        <?php $this->render_screen_options(); ?>
+                        <div id="screen-options-wrap">
+                                <?php $this->render_screen_options(); ?>
+                        </div>
                 </li>
         <?php