Changeset 45509 for branches/5.2/src/wp-admin/includes/class-wp-screen.php

Timestamp:

06/10/2019 01:32:01 PM (7 years ago)

Author:

afercia

Message:

Accessibility: Improve the Screen Options and Help buttons order.

• makes the buttons visual order match the DOM order
• also, restores the focus style on the "hero" primary button after [34948]

Props vrimill, mukesh27 for reporting and testing.
Merges [45503] to the 5.2 branch.
Fixes #45094 for 5.2.2.

Location:

branches/5.2

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-screen.php (modified) (1 diff)

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

@@ -928 +928 @@
                 ?>
                 <div id="screen-meta-links">
-                <?php if ( $this->get_help_tabs() ) : ?>
-                        <div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
-                        <button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
+                <?php if ( $this->show_screen_options() ) : ?>
+                        <div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
+                        <button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
                         </div>
                         <?php
                 endif;
-                if ( $this->show_screen_options() ) :
+                if ( $this->get_help_tabs() ) :
                         ?>
-                        <div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
-                        <button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
+                        <div id="contextual-help-link-wrap" class="hide-if-no-js screen-meta-toggle">
+                        <button type="button" id="contextual-help-link" class="button show-settings" aria-controls="contextual-help-wrap" aria-expanded="false"><?php _e( 'Help' ); ?></button>
                         </div>
                 <?php endif; ?>