Changeset 19130 for trunk/wp-admin/includes/screen.php

Timestamp:

11/03/2011 05:08:12 PM (15 years ago)

Author:

azaozz

Message:

Revert placement of Help and Screen Options to under the admin bar on the right, see #18197, see #18785

File:

• trunk/wp-admin/includes/screen.php (modified) (4 diffs)

trunk/wp-admin/includes/screen.php

@@ -690 +690 @@
                 }
 
-                // Add screen options tab
-                if ( $this->show_screen_options() ) {
-                        $this->add_help_tab( array(
-                                'id'       => 'screen-options',
-                                'title'    => __('Screen Options'),
-                                'callback' => array( $this, 'render_screen_options' ),
-                        ) );
-                        $_options_tab = array_pop( $this->_help_tabs );
-                        array_unshift( $this->_help_tabs, $_options_tab );
-                }
-
                 // Time to render!
                 ?>
-                <div id="screen-meta" class='metabox-prefs'>
+                <div id="screen-meta" class="metabox-prefs">
                         <div id="contextual-help-back"></div>
                         <div id="contextual-help-wrap" class="hidden">
@@ -749 +738 @@
                                 </div>
                         </div>
+                <?php
+                // Add screen options
+                if ( $this->show_screen_options() )
+                        $this->render_screen_options();
+                ?>
+                </div>
+                <div class="screen-meta-toggle">
+                <?php
+
+                if ( $this->show_screen_options() )
+                        echo '<a href="#screen-options-wrap">' . __('Screen Options') . '</a> |';
+                ?>
+                <a href="#contextual-help-wrap"><?php _e('Help'); ?></a>
                 </div>
                 <?php
@@ -790 +792 @@
 
                 ?>
+                <div id="screen-options-wrap" class="hidden">
                 <form id="adv-settings" action="" method="post">
                 <?php
@@ -841 +844 @@
                 <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
                 </form>
+                </div>
                 <?php
         }