Ticket #42778: 42778.2.diff

src/wp-admin/css/widgets.css

@@ -36 +36 @@
         user-select: none;
 }
 
+.widget-access-link {
+        float: right;
+        margin: -5px 0 10px 10px;
+}
+
 .widgets-holder-wrap .widget-inside {
         border-top: none;
         padding: 1px 15px 15px 15px;
@@ -772 +777 @@
                 padding-right: 0;
         }
 
+        .widget-access-link {
+                float: none;
+                margin: 15px 0 0 0;
+        }
+
         #widgets-left .sidebar-name {
                 margin-right: 0;
         }

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

@@ -927 +927 @@
                 $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 ) . ' />';
@@ -943 +939 @@
                 }
 
                 /**
-                 * 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;
-                }
-
-                /**
                  * Filters whether to show the Screen Options tab.
                  *
                  * @since 3.2.0

src/wp-admin/widgets.php

@@ -382 +382 @@
 echo esc_html( $title );
 ?>
 </h1>
-
 <?php
 if ( current_user_can( 'customize' ) ) {
         printf(
@@ -400 +399 @@
         );
 }
 ?>
-
+<?php $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">
 
 <?php if ( isset( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) { ?>