WordPress.org

Make WordPress Core

Ticket #18785: revert-help-so.patch

File revert-help-so.patch, 38.0 KB (added by azaozz, 3 years ago)

Move Screen Options and Help toggles to the H2s

  • wp-admin/comment.php

     
    112112<div class="narrow"> 
    113113 
    114114<?php screen_icon(); ?> 
    115 <h2><?php echo esc_html( $title ); ?></h2> 
     115<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    116116 
    117117<?php 
    118118switch ( $action ) { 
  • wp-admin/css/colors-classic.dev.css

     
    16181618#contextual-help-back { 
    16191619        background-color: #EFF8FF; 
    16201620        border-color: #D1E5EE; 
    1621         -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); 
    1622         -moz-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); 
    1623         box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); 
     1621        -webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); 
     1622        box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); 
    16241623} 
    16251624 
    16261625.contextual-help-tabs a:hover { 
  • wp-admin/css/colors-fresh.dev.css

     
    784784#screen-meta { 
    785785        background-color: #fff; 
    786786} 
     787 
    787788#contextual-help-back { 
    788789        background-color: #f1f1f1; 
    789790        border-color: #ccc; 
    790  
    791         -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); 
    792         -moz-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); 
    793         box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 ); 
     791        -webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); 
     792        box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); 
    794793} 
    795794 
    796795.contextual-help-tabs a:hover { 
  • wp-admin/css/wp-admin.dev.css

     
    393920.0 - Settings 
    404021.0 - Admin Footer 
    414122.0 - Misc 
    42 23.0 - Dead 
    4342 
    4443------------------------------------------------------------------------*/ 
    4544 
     
    606605 
    607606.wrap h2 { 
    608607        font-size: 23px; 
    609         padding: 9px 15px 4px 0; 
     608        padding: 9px 0 4px; 
    610609        line-height: 29px; 
    611610} 
    612611 
     
    13671366        padding: 8px 20px 12px; 
    13681367        max-height: 300px; 
    13691368        overflow: auto; 
     1369        position: relative; 
    13701370} 
    13711371 
    13721372#screen-meta .screen-reader-text { 
     
    14281428} 
    14291429 
    14301430#contextual-help-wrap { 
    1431         position: relative; 
    14321431        padding: 0 0 0 4px; 
    14331432        overflow: auto; 
    14341433} 
     
    46244623  22.0 - Misc 
    46254624------------------------------------------------------------------------------*/ 
    46264625 
    4627 #excerpt, .attachmentlinks { 
     4626#excerpt, 
     4627.attachmentlinks { 
    46284628        margin: 0; 
    46294629        height: 4em; 
    46304630        width: 98%; 
     
    47404740        padding: 0; 
    47414741} 
    47424742 
    4743 #titlediv, #poststuff .postarea { 
     4743#titlediv, 
     4744#poststuff .postarea { 
    47444745        margin-bottom: 20px; 
    47454746} 
    47464747 
    4747 td.post-title strong, td.plugin-title strong { 
     4748td.post-title strong, 
     4749td.plugin-title strong { 
    47484750        display: block; 
    47494751        margin-bottom: .2em; 
    47504752} 
    47514753 
    4752 td.post-title p, td.plugin-title p { 
     4754td.post-title p, 
     4755td.plugin-title p { 
    47534756        margin: 6px 0; 
    47544757} 
    47554758 
     
    48104813        display: none; 
    48114814} 
    48124815 
    4813 .plugin-install #description, .plugin-install-network #description { 
     4816.plugin-install #description, 
     4817.plugin-install-network #description { 
    48144818        width: 60%; 
    48154819} 
    48164820 
     
    48304834        height: 98%; 
    48314835} 
    48324836 
     4837.screen-meta-toggle { 
     4838        float: right; 
     4839        padding-left: 8px; 
     4840        font-size: 12px; 
     4841} 
    48334842 
     4843.screen-meta-toggle a { 
     4844        text-decoration: none; 
     4845} 
     4846 
    48344847/* - Only used once or twice in all of WP - deprecate for global style 
    48354848------------------------------------------------------------------------------*/ 
    48364849td.media-icon { 
  • wp-admin/custom-background.php

     
    172172?> 
    173173<div class="wrap" id="custom-background"> 
    174174<?php screen_icon(); ?> 
    175 <h2><?php _e('Custom Background'); ?></h2> 
     175<h2><?php _e('Custom Background'); $current_screen->print_toggles(); ?></h2> 
    176176<?php if ( !empty($this->updated) ) { ?> 
    177177<div id="message" class="updated"> 
    178178<p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p> 
  • wp-admin/custom-header.php

     
    472472 
    473473<div class="wrap"> 
    474474<?php screen_icon(); ?> 
    475 <h2><?php _e('Custom Header'); ?></h2> 
     475<h2><?php _e('Custom Header'); $current_screen->print_toggles(); ?></h2> 
    476476 
    477477<?php if ( ! empty( $this->updated ) ) { ?> 
    478478<div id="message" class="updated"> 
     
    687687 
    688688<div class="wrap"> 
    689689<?php screen_icon(); ?> 
    690 <h2><?php _e( 'Crop Header Image' ); ?></h2> 
     690<h2><?php _e( 'Crop Header Image' ); $current_screen->print_toggles(); ?></h2> 
    691691 
    692692<form method="post" action="<?php echo esc_attr(add_query_arg('step', 3)); ?>"> 
    693693        <p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p> 
  • wp-admin/edit-comments.php

     
    144144        echo __('Comments'); 
    145145 
    146146if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) 
    147         printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( stripslashes( $_REQUEST['s'] ) ), 50 ) ) . '</span>' ); ?> 
    148 </h2> 
     147        printf( '<span class="subtitle">' . sprintf( __( 'Search results for &#8220;%s&#8221;' ), wp_html_excerpt( esc_html( stripslashes( $_REQUEST['s'] ) ), 50 ) ) . '</span>' ); 
    149148 
     149$current_screen->print_toggles(); 
     150?></h2> 
     151 
    150152<?php 
    151153if ( isset( $_REQUEST['error'] ) ) { 
    152154        $error = (int) $_REQUEST['error']; 
  • wp-admin/edit-form-advanced.php

     
    242242 
    243243<div class="wrap columns-<?php echo (int) $screen_layout_columns ? (int) $screen_layout_columns : 'auto'; ?>"> 
    244244<?php screen_icon(); ?> 
    245 <h2><?php echo esc_html( $title ); ?><?php if ( isset( $post_new_file ) ) : ?> <a href="<?php echo esc_url( $post_new_file ) ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a><?php endif; ?></h2> 
     245<h2><?php 
     246echo esc_html( $title ); 
     247 
     248if ( isset( $post_new_file ) ) : 
     249        ?> <a href="<?php echo esc_url( $post_new_file ) ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a><?php 
     250endif; 
     251 
     252$current_screen->print_toggles(); 
     253?></h2> 
     254 
    246255<?php if ( $notice ) : ?> 
    247256<div id="notice" class="error"><p><?php echo $notice ?></p></div> 
    248257<?php endif; ?> 
  • wp-admin/edit-form-comment.php

     
    2424<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?> 
    2525<div class="wrap"> 
    2626<?php screen_icon(); ?> 
    27 <h2><?php _e('Edit Comment'); ?></h2> 
     27<h2><?php _e('Edit Comment'); $current_screen->print_toggles(); ?></h2> 
    2828 
    2929<div id="poststuff" class="metabox-holder has-right-sidebar"> 
    3030<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" /> 
  • wp-admin/edit-link-form.php

     
    5656 
    5757<div class="wrap columns-<?php echo (int) $screen_layout_columns ? (int) $screen_layout_columns : 'auto'; ?>"> 
    5858<?php screen_icon(); ?> 
    59 <h2><?php echo esc_html( $title ); ?>  <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a></h2> 
     59<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php $current_screen->print_toggles(); ?></h2> 
    6060 
    6161<?php if ( isset( $_GET['added'] ) ) : ?> 
    6262<div id="message" class="updated"><p><?php _e('Link added.'); ?></p></div> 
  • wp-admin/edit-tag-form.php

     
    2828 
    2929<div class="wrap"> 
    3030<?php screen_icon(); ?> 
    31 <h2><?php echo $tax->labels->edit_item; ?></h2> 
     31<h2><?php echo $tax->labels->edit_item; $current_screen->print_toggles(); ?></h2> 
    3232<div id="ajax-response"></div> 
    3333<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"> 
    3434<input type="hidden" name="action" value="editedtag" /> 
  • wp-admin/edit-tags.php

     
    261261 
    262262<div class="wrap nosubsub"> 
    263263<?php screen_icon(); ?> 
    264 <h2><?php echo esc_html( $title ); 
     264<h2><?php 
     265echo esc_html( $title ); 
     266 
    265267if ( !empty($_REQUEST['s']) ) 
    266         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?> 
    267 </h2> 
     268        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); 
    268269 
     270$current_screen->print_toggles(); 
     271?></h2> 
     272 
    269273<?php if ( isset($_REQUEST['message']) && ( $msg = (int) $_REQUEST['message'] ) ) : ?> 
    270274<div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div> 
    271275<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']); 
  • wp-admin/edit.php

     
    193193<div class="wrap"> 
    194194<?php screen_icon(); ?> 
    195195<h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php 
     196 
    196197if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) 
    197         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?> 
    198 </h2> 
     198        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); 
    199199 
     200$current_screen->print_toggles(); 
     201?></h2> 
     202 
    200203<?php 
    201204if ( isset($_REQUEST['posted']) && $_REQUEST['posted'] ) : $_REQUEST['posted'] = (int) $_REQUEST['posted']; ?> 
    202205<div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_REQUEST['posted'] ); ?>"><?php _e('View Post'); ?></a> | <a href="<?php echo get_edit_post_link( $_REQUEST['posted'] ); ?>"><?php _e('Edit Post'); ?></a></p></div> 
  • wp-admin/export.php

     
    119119 
    120120<div class="wrap"> 
    121121<?php screen_icon(); ?> 
    122 <h2><?php echo esc_html( $title ); ?></h2> 
     122<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    123123 
    124124<p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p> 
    125125<p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p> 
  • wp-admin/import.php

     
    5454 
    5555<div class="wrap"> 
    5656<?php screen_icon(); ?> 
    57 <h2><?php echo esc_html( $title ); ?></h2> 
     57<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    5858<?php if ( ! empty( $_GET['invalid'] ) ) : ?> 
    5959        <div class="error"><p><strong><?php _e('ERROR:')?></strong> <?php printf( __('The <strong>%s</strong> importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?></p></div> 
    6060<?php endif; ?> 
  • wp-admin/includes/file.php

     
    998998<form action="<?php echo $form_post ?>" method="post"> 
    999999<div class="wrap"> 
    10001000<?php screen_icon(); ?> 
    1001 <h2><?php _e('Connection Information') ?></h2> 
     1001<h2><?php _e('Connection Information'); $current_screen->print_toggles(); ?></h2> 
    10021002<p><?php 
    10031003        $label_user = __('Username'); 
    10041004        $label_pass = __('Password'); 
  • wp-admin/includes/screen.php

     
    689689                        ) ); 
    690690                } 
    691691 
    692                 // Add screen options tab 
    693                 if ( $this->show_screen_options() ) { 
    694                         $this->add_help_tab( array( 
    695                                 'id'       => 'screen-options', 
    696                                 'title'    => __('Screen Options'), 
    697                                 'callback' => array( $this, 'render_screen_options' ), 
    698                         ) ); 
    699                         $_options_tab = array_pop( $this->_help_tabs ); 
    700                         array_unshift( $this->_help_tabs, $_options_tab ); 
    701                 } 
    702  
    703692                // Time to render! 
    704693                ?> 
    705                 <div id="screen-meta" class='metabox-prefs'> 
     694                <div id="screen-meta" class="metabox-prefs"> 
    706695                        <div id="contextual-help-back"></div> 
    707696                        <div id="contextual-help-wrap" class="hidden"> 
    708697                                <div class="contextual-help-tabs"> 
     
    748737                                        <?php endforeach; ?> 
    749738                                </div> 
    750739                        </div> 
     740                <?php 
     741                // Add screen options 
     742                if ( $this->show_screen_options() ) 
     743                        $this->render_screen_options(); 
     744                ?> 
    751745                </div> 
    752746                <?php 
    753747        } 
     
    789783                $hidden  = get_hidden_columns( $this ); 
    790784 
    791785                ?> 
     786                <div id="screen-options-wrap" class="hidden"> 
    792787                <form id="adv-settings" action="" method="post"> 
    793788                <?php 
    794789                if ( $this->get_option('overview') ) 
     
    840835                ?> 
    841836                <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div> 
    842837                </form> 
     838                </div> 
    843839                <?php 
    844840        } 
    845841 
     
    939935                </div> 
    940936                <?php 
    941937        } 
    942 } 
    943  No newline at end of file 
     938         
     939        public function print_toggles() { 
     940                echo ' <span class="screen-meta-toggle">'; 
     941                 
     942                if ( $this->show_screen_options() ) 
     943                        echo '<a href="#screen-options-wrap">' . __('Screen Options') . '</a> |'; 
     944         
     945                echo ' <a href="#contextual-help-wrap">' . __('Help') . '</a></span>'; 
     946        } 
     947} 
  • wp-admin/index.php

     
    8484 
    8585<div class="wrap"> 
    8686<?php screen_icon(); ?> 
    87 <h2><?php echo esc_html( $title ); ?></h2> 
     87<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    8888 
    8989<?php wp_welcome_panel(); ?> 
    9090 
  • wp-admin/js/common.dev.js

     
    9595        page:    null, // #wpcontent 
    9696        padding: null, // the closed page padding-top property 
    9797        top:     null, // the closed element top property 
    98         map: { 
    99                 'wp-admin-bar-screen-options': 'screen-options-wrap', 
    100                 'wp-admin-bar-help': 'contextual-help-wrap' 
    101         }, 
    10298 
    10399        init: function() { 
    104100                screenMeta.element = $('#screen-meta'); 
    105                 screenMeta.toggles = $('.screen-meta-toggle'); 
     101                screenMeta.toggles = $('.screen-meta-toggle a'); 
    106102                screenMeta.page    = $('#wpcontent'); 
    107103 
    108104                screenMeta.toggles.click( screenMeta.toggleEvent ); 
    109105        }, 
    110106 
    111107        toggleEvent: function( e ) { 
    112                 var panel; 
     108                var panel = $( this.href.replace(/.+#/, '#') ); 
    113109                e.preventDefault(); 
    114110 
    115                 // Check to see if we found a panel. 
    116                 if ( ! screenMeta.map[ this.id ] ) 
     111                if ( !panel.length ) 
    117112                        return; 
    118113 
    119                 panel = $('#' + screenMeta.map[ this.id ]); 
    120  
    121114                if ( panel.is(':visible') ) 
    122115                        screenMeta.close( panel, $(this) ); 
    123116                else 
  • wp-admin/link-manager.php

     
    6262 
    6363<div class="wrap nosubsub"> 
    6464<?php screen_icon(); ?> 
    65 <h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php 
     65<h2><?php 
     66echo esc_html( $title ); 
     67?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php 
     68 
    6669if ( !empty($_REQUEST['s']) ) 
    67         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?> 
    68 </h2> 
     70        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); 
    6971 
     72$current_screen->print_toggles(); 
     73?></h2> 
     74 
    7075<?php 
    7176if ( isset($_REQUEST['deleted']) ) { 
    7277        echo '<div id="message" class="updated"><p>'; 
  • wp-admin/media-upload.php

     
    7676        require_once('./admin-header.php'); ?> 
    7777        <div class="wrap"> 
    7878        <?php screen_icon(); ?> 
    79         <h2><?php echo esc_html( $title ); ?></h2> 
     79        <h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    8080 
    8181        <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-upload.php?inline=&amp;upload-page-form='); ?>" class="media-upload-form type-form validate" id="file-form"> 
    8282 
  • wp-admin/media.php

     
    100100 
    101101<div class="wrap"> 
    102102<?php screen_icon(); ?> 
    103 <h2> 
    104 <?php 
     103<h2><?php 
    105104echo esc_html( $title ); 
     105 
    106106if ( current_user_can( 'upload_files' ) ) { ?> 
    107107        <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a> 
    108 <?php } ?> 
    109 </h2> 
     108<?php } 
    110109 
     110$current_screen->print_toggles(); 
     111?></h2> 
     112 
    111113<form method="post" action="" class="media-upload-form" id="media-single-form"> 
    112114<p class="submit" style="padding-bottom: 0;"> 
    113115<?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?> 
  • wp-admin/my-sites.php

     
    5757 
    5858<div class="wrap"> 
    5959<?php screen_icon(); ?> 
    60 <h2><?php echo esc_html( $title ); ?></h2> 
     60<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    6161<form id="myblogs" action="" method="post"> 
    6262        <?php 
    6363        choose_primary_blog(); 
  • wp-admin/nav-menus.php

     
    462462?> 
    463463<div class="wrap"> 
    464464        <?php screen_icon(); ?> 
    465         <h2><?php esc_html_e('Menus'); ?></h2> 
     465        <h2><?php esc_html_e('Menus'); $current_screen->print_toggles(); ?></h2> 
    466466        <?php 
    467467        foreach( $messages as $message ) : 
    468468                echo $message . "\n"; 
  • wp-admin/network.php

     
    123123?> 
    124124<div class="wrap"> 
    125125<?php screen_icon('tools'); ?> 
    126 <h2><?php echo esc_html( $title ); ?></h2> 
     126<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    127127 
    128128<?php 
    129129/** 
  • wp-admin/network/index.php

     
    4949 
    5050<div class="wrap"> 
    5151<?php screen_icon(); ?> 
    52 <h2><?php echo esc_html( $title ); ?></h2> 
     52<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    5353 
    5454<div id="dashboard-widgets-wrap"> 
    5555 
  • wp-admin/network/settings.php

     
    111111?> 
    112112 
    113113<div class="wrap"> 
    114         <?php screen_icon('options-general'); ?> 
    115         <h2><?php echo esc_html( $title ); ?></h2> 
     114<?php screen_icon('options-general'); ?> 
     115        <h2><?php 
     116 
     117        echo esc_html( $title ); 
     118 
     119        if ( $current_screen->show_screen_options() ) 
     120                echo ' <a class="screen-meta-toggle" href="#screen-options-wrap">' . __('Screen Options') . '</a>'; 
     121 
     122        echo ' <a class="screen-meta-toggle" href="#contextual-help-wrap">' . __('Help') . '</a>'; 
     123 
     124?></h2> 
    116125        <form method="post" action="settings.php"> 
    117126                <?php wp_nonce_field( 'siteoptions' ); ?> 
    118127                <h3><?php _e( 'Operational Settings' ); ?></h3> 
  • wp-admin/network/themes.php

     
    224224 
    225225<div class="wrap"> 
    226226<?php screen_icon('themes'); ?> 
    227 <h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php } 
     227<h2><?php 
     228echo esc_html( $title ); 
     229 
     230if ( current_user_can('install_themes') ) { 
     231        ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php 
     232} 
     233 
    228234if ( $s )  
    229         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>  
    230 </h2> 
     235        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); 
    231236 
     237$current_screen->print_toggles(); 
     238?></h2> 
     239 
    232240<?php 
    233241if ( isset( $_GET['enabled'] ) ) { 
    234242        $_GET['enabled'] = absint( $_GET['enabled'] ); 
  • wp-admin/network/user-new.php

     
    6868 
    6969<div class="wrap"> 
    7070<?php screen_icon(); ?> 
    71 <h2 id="add-new-user"><?php _e('Add New User') ?></h2> 
     71<h2 id="add-new-user"><?php _e('Add New User'); $current_screen->print_toggles(); ?></h2> 
    7272<?php 
    7373if ( ! empty( $messages ) ) { 
    7474        foreach ( $messages as $msg ) 
  • wp-admin/network/users.php

     
    2323 
    2424        screen_icon(); 
    2525        ?> 
    26         <h2><?php esc_html_e( 'Users' ); ?></h2> 
     26        <h2><?php esc_html_e( 'Users' ); $current_screen->print_toggles(); ?></h2> 
    2727        <p><?php _e( 'Transfer or delete posts and links before deleting users.' ); ?></p> 
    2828        <form action="users.php?action=dodelete" method="post"> 
    2929        <input type="hidden" name="dodelete" /> 
     
    274274        ?> 
    275275<div class="wrap"> 
    276276        <?php screen_icon(); ?> 
    277         <h2><?php esc_html_e( 'Users' ); 
     277        <h2><?php 
     278        esc_html_e( 'Users' ); 
     279 
    278280        if ( current_user_can( 'create_users') ) : ?> 
    279281                <a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php 
    280282        endif; 
    281283         
    282284        if ( !empty( $usersearch ) ) 
    283         printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) ); 
    284         ?> 
    285         </h2> 
     285                printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) ); 
     286         
     287        $current_screen->print_toggles(); 
     288        ?></h2> 
    286289 
    287290        <?php $wp_list_table->views(); ?> 
    288291 
  • wp-admin/options-discussion.php

     
    3131 
    3232<div class="wrap"> 
    3333<?php screen_icon(); ?> 
    34 <h2><?php echo esc_html( $title ); ?></h2> 
     34<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    3535 
    3636<form method="post" action="options.php"> 
    3737<?php settings_fields('discussion'); ?> 
  • wp-admin/options-general.php

     
    7878 
    7979<div class="wrap"> 
    8080<?php screen_icon(); ?> 
    81 <h2><?php echo esc_html( $title ); ?></h2> 
     81<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    8282 
    8383<form method="post" action="options.php"> 
    8484<?php settings_fields('general'); ?> 
  • wp-admin/options-media.php

     
    3434 
    3535<div class="wrap"> 
    3636<?php screen_icon(); ?> 
    37 <h2><?php echo esc_html( $title ); ?></h2> 
     37<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    3838 
    3939<form action="options.php" method="post"> 
    4040<?php settings_fields('media'); ?> 
  • wp-admin/options-permalink.php

     
    152152 
    153153<div class="wrap"> 
    154154<?php screen_icon(); ?> 
    155 <h2><?php echo esc_html( $title ); ?></h2> 
     155<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    156156 
    157157<form name="form" action="options-permalink.php" method="post"> 
    158158<?php wp_nonce_field('update-permalink') ?> 
  • wp-admin/options-privacy.php

     
    3232 
    3333<div class="wrap"> 
    3434<?php screen_icon(); ?> 
    35 <h2><?php echo esc_html( $title ); ?></h2> 
     35<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    3636 
    3737<form method="post" action="options.php"> 
    3838<?php settings_fields('privacy'); ?> 
  • wp-admin/options-reading.php

     
    5959 
    6060<div class="wrap"> 
    6161<?php screen_icon(); ?> 
    62 <h2><?php echo esc_html( $title ); ?></h2> 
     62<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    6363 
    6464<form name="form1" method="post" action="options.php"> 
    6565<?php settings_fields( 'reading' ); ?> 
  • wp-admin/options-writing.php

     
    3131 
    3232<div class="wrap"> 
    3333<?php screen_icon(); ?> 
    34 <h2><?php echo esc_html( $title ); ?></h2> 
     34<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    3535 
    3636<form method="post" action="options.php"> 
    3737<?php settings_fields('writing'); ?> 
  • wp-admin/plugin-editor.php

     
    158158<?php endif; ?> 
    159159<div class="wrap"> 
    160160<?php screen_icon(); ?> 
    161 <h2><?php echo esc_html( $title ); ?></h2> 
     161<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    162162 
    163163<div class="fileedit-sub"> 
    164164<div class="alignleft"> 
  • wp-admin/plugin-install.php

     
    5252?> 
    5353<div class="wrap"> 
    5454<?php screen_icon(); ?> 
    55 <h2><?php echo esc_html( $title ); ?></h2> 
     55<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    5656 
    5757<?php $wp_list_table->views(); ?> 
    5858 
  • wp-admin/plugins.php

     
    382382 
    383383<div class="wrap"> 
    384384<?php screen_icon(); ?> 
    385 <h2><?php echo esc_html( $title ); 
     385<h2><?php 
     386echo esc_html( $title ); 
     387 
    386388if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?> 
    387389<a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a> 
    388390<?php } 
     391 
    389392if ( $s ) 
    390         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?> 
    391 </h2> 
     393        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); 
    392394 
     395$current_screen->print_toggles(); 
     396?></h2> 
     397 
    393398<?php do_action( 'pre_current_active_plugins', $plugins['all'] ) ?> 
    394399 
    395400<?php $wp_list_table->views(); ?> 
  • wp-admin/theme-editor.php

     
    143143?> 
    144144<div class="wrap"> 
    145145<?php screen_icon(); ?> 
    146 <h2><?php echo esc_html( $title ); ?></h2> 
     146<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    147147 
    148148<div class="fileedit-sub"> 
    149149<div class="alignleft"> 
  • wp-admin/theme-install.php

     
    5757screen_icon(); 
    5858 
    5959if ( is_network_admin() ) : ?> 
    60 <h2><?php echo esc_html( $title ); ?></h2> 
    61 <?php else : ?> 
    62 <h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2> 
    63  
    64 <?php 
     60<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2><?php 
     61else : 
     62?><h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><?php $current_screen->print_toggles(); ?></h2><?php 
    6563endif; 
    6664 
    6765$wp_list_table->views(); ?> 
  • wp-admin/themes.php

     
    7575screen_icon(); 
    7676if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?> 
    7777<h2 class="nav-tab-wrapper"> 
    78 <a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><a href="<?php echo admin_url( 'theme-install.php'); ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a> 
    79 <?php else : ?> 
    80 <h2><?php echo esc_html( $title ); ?> 
    81 <?php endif; ?> 
     78<a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><a href="<?php echo admin_url( 'theme-install.php'); ?>" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php 
     79$current_screen->print_toggles(); 
     80else : ?> 
     81<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); 
     82endif; ?> 
    8283</h2> 
    8384 
    8485<h3><?php _e('Current Theme'); ?></h3> 
  • wp-admin/tools.php

     
    2828?> 
    2929<div class="wrap"> 
    3030<?php screen_icon(); ?> 
    31 <h2><?php echo esc_html( $title ); ?></h2> 
     31<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    3232 
    3333<?php if ( current_user_can('edit_posts') ) : ?> 
    3434<div class="tool-box"> 
  • wp-admin/upload.php

     
    164164<div class="wrap"> 
    165165<?php screen_icon(); ?> 
    166166<h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a> <?php 
     167 
    167168if ( ! empty( $_REQUEST['s'] ) ) 
    168         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?> 
    169 </h2> 
     169        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); 
    170170 
     171$current_screen->print_toggles(); 
     172?></h2> 
     173 
    171174<?php 
    172175$message = ''; 
    173176if ( ! empty( $_GET['posted'] ) ) { 
  • wp-admin/user-edit.php

     
    170170 
    171171<div class="wrap" id="profile-page"> 
    172172<?php screen_icon(); ?> 
    173 <h2> 
    174 <?php 
     173<h2><?php 
    175174echo esc_html( $title ); 
     175 
    176176if ( ! IS_PROFILE_PAGE ) { 
    177177        if ( current_user_can( 'create_users' ) ) { ?> 
    178178                <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a> 
    179179        <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?> 
    180180                <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a> 
    181181        <?php } 
    182 } ?> 
    183 </h2> 
     182} 
    184183 
     184$current_screen->print_toggles(); 
     185?></h2> 
     186 
    185187<form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post"<?php do_action('user_edit_form_tag'); ?>> 
    186188<?php wp_nonce_field('update-user_' . $user_id) ?> 
    187189<?php if ( $wp_http_referer ) : ?> 
  • wp-admin/user-new.php

     
    189189<div class="wrap"> 
    190190<?php screen_icon(); ?> 
    191191<h2 id="add-new-user"> <?php 
    192 if ( current_user_can( 'create_users' ) ) { 
     192 
     193if ( current_user_can( 'create_users' ) ) 
    193194        echo _x( 'Add New User', 'user' ); 
    194 } elseif ( current_user_can( 'promote_users' ) ) { 
     195elseif ( current_user_can( 'promote_users' ) ) 
    195196        echo _x( 'Add Existing User', 'user' ); 
    196 } ?> 
    197 </h2> 
    198197 
     198$current_screen->print_toggles(); 
     199?></h2> 
     200 
    199201<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?> 
    200202        <div class="error"> 
    201203                <ul> 
  • wp-admin/users.php

     
    359359 
    360360<div class="wrap"> 
    361361<?php screen_icon(); ?> 
    362 <h2> 
    363 <?php 
     362<h2><?php 
    364363echo esc_html( $title ); 
     364 
    365365if ( current_user_can( 'create_users' ) ) { ?> 
    366366        <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a> 
    367367<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?> 
     
    369369<?php } 
    370370 
    371371if ( $usersearch ) 
    372         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?> 
    373 </h2> 
     372        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); 
    374373 
     374$current_screen->print_toggles(); 
     375?></h2> 
     376 
    375377<?php $wp_list_table->views(); ?> 
    376378 
    377379<form action="" method="get"> 
  • wp-admin/widgets.php

     
    301301 
    302302<div class="wrap"> 
    303303<?php screen_icon(); ?> 
    304 <h2><?php echo esc_html( $title ); ?></h2> 
     304<h2><?php echo esc_html( $title ); $current_screen->print_toggles(); ?></h2> 
    305305 
    306306<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?> 
    307307<div id="message" class="updated"><p><?php echo $messages[$_GET['message']]; ?></p></div> 
  • wp-content/themes/twentyeleven/inc/theme-options.php

     
    293293        ?> 
    294294        <div class="wrap"> 
    295295                <?php screen_icon(); ?> 
    296                 <h2><?php printf( __( '%s Theme Options', 'twentyeleven' ), get_current_theme() ); ?></h2> 
     296                <h2><?php printf( __( '%s Theme Options', 'twentyeleven' ), get_current_theme() ); $current_screen->print_toggles(); ?></h2> 
    297297                <?php settings_errors(); ?> 
    298298 
    299299                <form method="post" action="options.php"> 
     
    425425 
    426426        return array_merge( $existing_classes, $classes ); 
    427427} 
    428 add_filter( 'body_class', 'twentyeleven_layout_classes' ); 
    429  No newline at end of file 
     428add_filter( 'body_class', 'twentyeleven_layout_classes' ); 
  • wp-includes/admin-bar.php

     
    633633} 
    634634 
    635635/** 
    636  * Add help link. 
    637  * 
    638  * @since 3.3.0 
    639  */ 
    640 function wp_admin_bar_help_menu( $wp_admin_bar ) { 
    641         $wp_admin_bar->add_menu( array( 
    642                 'id'    => 'help', 
    643                 'title' => __('Help'), 
    644                 'href'  => '#', 
    645                 'meta'  => array( 
    646                         'class' => 'screen-meta-toggle hide-if-no-js', 
    647                 ), 
    648         ) ); 
    649 } 
    650  
    651 /** 
    652636 * Add search form. 
    653637 * 
    654638 * @since 3.3.0 
  • wp-includes/class-wp-admin-bar.php

     
    201201                add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 ); 
    202202                add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 90 ); 
    203203 
    204                 if ( ! is_admin() ) { 
     204                if ( ! is_admin() ) 
    205205                        add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 100 ); 
    206                 } else { 
    207                         add_action( 'admin_bar_menu', 'wp_admin_bar_help_menu', 90 ); 
    208                 } 
    209  
     206                 
    210207                do_action( 'add_admin_bar_menus' ); 
    211208        } 
    212209} 
    213 ?> 
    214  No newline at end of file 
     210?> 
  • wp-includes/css/admin-bar.dev.css

     
    178178} 
    179179 
    180180#wpadminbar.nojs .ab-top-menu > li.menupop:hover, 
    181 #wpadminbar .ab-top-menu li.menupop.hover, 
    182 #wpadminbar .ab-top-menu .selected.screen-meta-toggle { 
     181#wpadminbar .ab-top-menu li.menupop.hover { 
    183182        background: #fff; 
    184183} 
    185184 
    186185#wpadminbar.nojs .quicklinks .menupop:hover a, 
    187186#wpadminbar.nojs .quicklinks .menupop:hover span, 
    188187#wpadminbar .quicklinks .menupop.hover a, 
    189 #wpadminbar .quicklinks .menupop.hover span, 
    190 #wpadminbar .ab-top-menu .selected.screen-meta-toggle a, 
    191 #wpadminbar .ab-top-menu .selected.screen-meta-toggle span { 
     188#wpadminbar .quicklinks .menupop.hover span { 
    192189        color: #333; 
    193190        text-shadow: none; 
    194191}