Ticket #42778: 42778.3.diff

src/wp-admin/css/widgets.css

@@ -495 +495 @@
 }
 
 /* Accessibility Mode */
+.widget-access-link {
+        float: right;
+        margin: -5px 0 10px 10px;
+}
+
 .widgets_access #widgets-left .widget .widget-top {
         cursor: auto;
 }
@@ -793 +798 @@
                 margin: 0 auto !important;
                 max-width: 480px;
         }
+
+        .widget-access-link {
+                float: none;
+                margin: 15px 0 0 0;
+        }
 }
 
 @media screen and (max-width: 320px) {

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

@@ -918 +918 @@
 
                 $show_screen = ! empty( $wp_meta_boxes[ $this->id ] ) || $columns || $this->get_option( 'per_page' );
 
-                switch ( $this->base ) {
-                        case 'widgets':
-                                $nonce                  = wp_create_nonce( 'widgets-access' );
-                                $this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on&_wpnonce=' . urlencode( $nonce ) . '">' . __( 'Enable accessibility mode' ) . '</a><a id="access-off" href="widgets.php?widgets-access=off&_wpnonce=' . urlencode( $nonce ) . '">' . __( 'Disable accessibility mode' ) . "</a></p>\n";
-                                break;
-                        case 'post':
-                                $expand                 = '<fieldset class="editor-expand hidden"><legend>' . __( 'Additional settings' ) . '</legend><label for="editor-expand-toggle">';
-                                $expand                .= '<input type="checkbox" id="editor-expand-toggle"' . checked( get_user_setting( 'editor_expand', 'on' ), 'on', false ) . ' />';
-                                $expand                .= __( 'Enable full-height editor and distraction-free functionality.' ) . '</label></fieldset>';
-                                $this->_screen_settings = $expand;
-                                break;
-                        default:
-                                $this->_screen_settings = '';
-                                break;
-                }
+                $this->_screen_settings = '';
 
-                /**
-                 * Filters the screen settings text displayed in the Screen Options tab.
-                 *
-                 * This filter is currently only used on the Widgets screen to enable
-                 * accessibility mode.
-                 *
-                 * @since 3.0.0
-                 *
-                 * @param string    $screen_settings Screen settings.
-                 * @param WP_Screen $this            WP_Screen object.
-                 */
-                $this->_screen_settings = apply_filters( 'screen_settings', $this->_screen_settings, $this );
-
-                if ( $this->_screen_settings || $this->_options ) {
-                        $show_screen = true;
+                if ( 'post' === $this->base ) {
+                        $expand                 = '<fieldset class="editor-expand hidden"><legend>' . __( 'Additional settings' ) . '</legend><label for="editor-expand-toggle">';
+                        $expand                .= '<input type="checkbox" id="editor-expand-toggle"' . checked( get_user_setting( 'editor_expand', 'on' ), 'on', false ) . ' />';
+                        $expand                .= __( 'Enable full-height editor and distraction-free functionality.' ) . '</label></fieldset>';
+                        $this->_screen_settings = $expand;
                 }
 
                 /**

src/wp-admin/widgets.php

@@ -399 +399 @@
                 __( 'Manage with Live Preview' )
         );
 }
+
+$nonce = wp_create_nonce( 'widgets-access' );
 ?>
+<div class="widget-access-link">
+        <a id="access-on" href="widgets.php?widgets-access=on&_wpnonce=<?php echo urlencode( $nonce ); ?>"><?php _e( 'Enable accessibility mode' ); ?></a><a id="access-off" href="widgets.php?widgets-access=off&_wpnonce=<?php echo urlencode( $nonce ); ?>"><?php _e( 'Disable accessibility mode' ); ?></a>
+</div>
 
 <hr class="wp-header-end">