Index: wp-admin/admin-header.php =================================================================== --- wp-admin/admin-header.php (revision 19125) +++ wp-admin/admin-header.php (working copy) @@ -119,5 +119,7 @@ do_action('all_admin_notices'); +$current_screen->print_toggles(); + if ( $parent_file == 'options-general.php' ) require(ABSPATH . 'wp-admin/options-head.php'); Index: wp-admin/css/colors-classic.dev.css =================================================================== --- wp-admin/css/colors-classic.dev.css (revision 19125) +++ wp-admin/css/colors-classic.dev.css (working copy) @@ -1618,9 +1618,8 @@ #contextual-help-back { background-color: #EFF8FF; border-color: #D1E5EE; - -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); - -moz-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); - box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); + -webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); } .contextual-help-tabs a:hover { Index: wp-admin/css/colors-fresh.dev.css =================================================================== --- wp-admin/css/colors-fresh.dev.css (revision 19125) +++ wp-admin/css/colors-fresh.dev.css (working copy) @@ -784,13 +784,12 @@ #screen-meta { background-color: #fff; } + #contextual-help-back { background-color: #f1f1f1; border-color: #ccc; - - -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); - -moz-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); - box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); + -webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); } .contextual-help-tabs a:hover { Index: wp-admin/css/wp-admin.dev.css =================================================================== --- wp-admin/css/wp-admin.dev.css (revision 19125) +++ wp-admin/css/wp-admin.dev.css (working copy) @@ -39,7 +39,6 @@ 20.0 - Settings 21.0 - Admin Footer 22.0 - Misc -23.0 - Dead ------------------------------------------------------------------------*/ @@ -606,7 +605,7 @@ .wrap h2 { font-size: 23px; - padding: 9px 15px 4px 0; + padding: 9px 0 4px; line-height: 29px; } @@ -1367,6 +1366,7 @@ padding: 8px 20px 12px; max-height: 300px; overflow: auto; + position: relative; } #screen-meta .screen-reader-text { @@ -1428,7 +1428,6 @@ } #contextual-help-wrap { - position: relative; padding: 0 0 0 4px; overflow: auto; } @@ -4624,7 +4623,8 @@ 22.0 - Misc ------------------------------------------------------------------------------*/ -#excerpt, .attachmentlinks { +#excerpt, +.attachmentlinks { margin: 0; height: 4em; width: 98%; @@ -4740,16 +4740,19 @@ padding: 0; } -#titlediv, #poststuff .postarea { +#titlediv, +#poststuff .postarea { margin-bottom: 20px; } -td.post-title strong, td.plugin-title strong { +td.post-title strong, +td.plugin-title strong { display: block; margin-bottom: .2em; } -td.post-title p, td.plugin-title p { +td.post-title p, +td.plugin-title p { margin: 6px 0; } @@ -4810,7 +4813,8 @@ display: none; } -.plugin-install #description, .plugin-install-network #description { +.plugin-install #description, +.plugin-install-network #description { width: 60%; } @@ -4830,7 +4834,17 @@ height: 98%; } +.screen-meta-toggle { + font-size: 12px; + position: absolute; + right: 15px; + top: 20px; +} +.screen-meta-toggle a { + text-decoration: none; +} + /* - Only used once or twice in all of WP - deprecate for global style ------------------------------------------------------------------------------*/ td.media-icon { Index: wp-admin/includes/screen.php =================================================================== --- wp-admin/includes/screen.php (revision 19125) +++ wp-admin/includes/screen.php (working copy) @@ -689,20 +689,9 @@ ) ); } - // 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! ?> -
+
+ show_screen_options() ) + $this->render_screen_options(); + ?>
+ '; + + if ( $this->show_screen_options() ) + echo '' . __('Screen Options') . ' |'; + + echo ' ' . __('Help') . '
'; + } +} Index: wp-admin/js/common.dev.js =================================================================== --- wp-admin/js/common.dev.js (revision 19125) +++ wp-admin/js/common.dev.js (working copy) @@ -95,29 +95,22 @@ page: null, // #wpcontent padding: null, // the closed page padding-top property top: null, // the closed element top property - map: { - 'wp-admin-bar-screen-options': 'screen-options-wrap', - 'wp-admin-bar-help': 'contextual-help-wrap' - }, init: function() { screenMeta.element = $('#screen-meta'); - screenMeta.toggles = $('.screen-meta-toggle'); + screenMeta.toggles = $('.screen-meta-toggle a'); screenMeta.page = $('#wpcontent'); screenMeta.toggles.click( screenMeta.toggleEvent ); }, toggleEvent: function( e ) { - var panel; + var panel = $( this.href.replace(/.+#/, '#') ); e.preventDefault(); - // Check to see if we found a panel. - if ( ! screenMeta.map[ this.id ] ) + if ( !panel.length ) return; - panel = $('#' + screenMeta.map[ this.id ]); - if ( panel.is(':visible') ) screenMeta.close( panel, $(this) ); else Index: wp-includes/admin-bar.php =================================================================== --- wp-includes/admin-bar.php (revision 19125) +++ wp-includes/admin-bar.php (working copy) @@ -633,22 +633,6 @@ } /** - * Add help link. - * - * @since 3.3.0 - */ -function wp_admin_bar_help_menu( $wp_admin_bar ) { - $wp_admin_bar->add_menu( array( - 'id' => 'help', - 'title' => __('Help'), - 'href' => '#', - 'meta' => array( - 'class' => 'screen-meta-toggle hide-if-no-js', - ), - ) ); -} - -/** * Add search form. * * @since 3.3.0 Index: wp-includes/class-wp-admin-bar.php =================================================================== --- wp-includes/class-wp-admin-bar.php (revision 19125) +++ wp-includes/class-wp-admin-bar.php (working copy) @@ -201,13 +201,10 @@ add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 ); add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 90 ); - if ( ! is_admin() ) { + if ( ! is_admin() ) add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 100 ); - } else { - add_action( 'admin_bar_menu', 'wp_admin_bar_help_menu', 90 ); - } - + do_action( 'add_admin_bar_menus' ); } } -?> \ No newline at end of file +?> Index: wp-includes/css/admin-bar.dev.css =================================================================== --- wp-includes/css/admin-bar.dev.css (revision 19125) +++ wp-includes/css/admin-bar.dev.css (working copy) @@ -178,17 +178,14 @@ } #wpadminbar.nojs .ab-top-menu > li.menupop:hover, -#wpadminbar .ab-top-menu li.menupop.hover, -#wpadminbar .ab-top-menu .selected.screen-meta-toggle { +#wpadminbar .ab-top-menu li.menupop.hover { background: #fff; } #wpadminbar.nojs .quicklinks .menupop:hover a, #wpadminbar.nojs .quicklinks .menupop:hover span, #wpadminbar .quicklinks .menupop.hover a, -#wpadminbar .quicklinks .menupop.hover span, -#wpadminbar .ab-top-menu .selected.screen-meta-toggle a, -#wpadminbar .ab-top-menu .selected.screen-meta-toggle span { +#wpadminbar .quicklinks .menupop.hover span { color: #333; text-shadow: none; }