WordPress.org
Get WordPress

Make WordPress Core

Changeset 9363


Ignore:
Timestamp:
10/27/2008 01:22:24 AM (17 years ago)
Author:
azaozz
Message:

Attach 'Screen Options' button to the sliding layer and related changes

Location:
trunk/wp-admin
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/admin-header.php

    r9359 r9363  
    7474<div id="wphead">
    7575<?php
    76 $settings_pages = array( 'categories.php', 'edit.php', 'edit-comments.php', 'edit-form-advanced.php', 'edit-link-categories.php', 'edit-link-form.php', 'edit-page-form.php', 'edit-tags.php', 'link-manager.php', 'upload.php', 'users.php', 'edit-pages.php', 'post-new.php', 'post.php', 'page-new.php', 'page.php', 'index.php' );
    7776$blog_name = get_bloginfo('name', 'display');
    7877if ( '' == $blog_name )
    … …  
    8079?>
    8180
    82 <img id="logo50" src="images/wp-logo.gif" alt="" /> <h1><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php _e('Visit site') ?>"><?php echo $blog_name ?></a>
    83 <?php if ( false === strpos($_SERVER['REQUEST_URI'], 'page=') && in_array( $pagenow, $settings_pages ) ) { ?>
    84 
    85 <span id="screen-options-link-wrap" class="hide-if-no-js screen-options-closed">
    86 <span id="screen-options">
    87 <a href="#screen-options" id="show-settings-link" class="show-settings"><?php _e('Screen Options') ?></a>
    88 <a href="#screen-options" id="hide-settings-link" class="show-settings" style="display:none;"><?php _e('Hide Options') ?></a>
    89 </span>
    90 </span>
    91 <?php } ?></h1>
     81<img id="logo50" src="images/wp-logo.gif" alt="" /> <h1><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php _e('Visit site') ?>"><?php echo $blog_name ?></a></h1>
    9282
    9383<div id="wphead-info">
    … …  
    9989<?php favorite_actions(); ?>
    10090</div>
    101 
    10291</div>
    10392
    104 <?php
    105 require(ABSPATH . 'wp-admin/menu-header.php');
    106 ?>
    10793<div id="wpbody">
     94<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
     95
    10896<div id="wpbody-content">
    10997<?php

  • trunk/wp-admin/categories.php

    r9354 r9363  
    132132?>
    133133
    134 <div id="screen-options-wrap" class="hidden">
    135 <h5><?php _e('Show on screen') ?></h5>
    136 <form id="adv-settings" action="" method="get">
    137 <div class="metabox-prefs">
    138 <?php manage_columns_prefs('category') ?>
    139 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    140 <br class="clear" />
    141 </div></form>
    142 </div>
     134<?php screen_options('category') ?>
    143135
    144136<?php
    … …  
    148140endif; ?>
    149141
    150 <div class="wrap">
    151 <h2 class="floatedh2"><?php echo wp_specialchars( $title ); ?></h2>
     142<div class="wrap nosubsub">
     143<h2><?php echo wp_specialchars( $title ); ?></h2>
    152144
    153145<form class="search-form topmargin" action="" method="get">

  • trunk/wp-admin/css/colors-fresh.css

    r9345 r9363  
    808808
    809809#screen-options-wrap {
    810     background-color: #E4F2FD;
    811     border-color: #c6d9e9;
     810    background-color: #f1f1f1;
     811    border-color: #dfdfdf;
     812}
     813
     814#screen-options a.show-settings {
     815    color: #606060;
    812816}
    813817

  • trunk/wp-admin/css/global.css

    r9339 r9363  
    1414#wpbody-content {
    1515    overflow: hidden;
    16     padding-top: 10px;
    1716}
    1817
    … …  
    164163.subsubsub {
    165164    list-style: none;
    166     margin: 0;
    167     padding: 0;
    168     position: relative;
    169     top: -5px;
     165    margin: 0 0 5px;
     166    padding: 0;
    170167    white-space: nowrap;
    171168    font-size: 12px;
    … …  
    297294
    298295.wrap h2 {
    299     clear: both;
    300296    font: italic normal normal 24px/29px Georgia, "Times New Roman", Times, serif;
    301     margin: 5px 0 10px;
    302     padding: 8px 15px 4px 0;
     297    margin: 0;
     298    padding: 20px 15px 10px 0;
    303299}
    304300

  • trunk/wp-admin/edit-comments.php

    r9341 r9363  
    8282$search = attribute_escape( $search_dirty ); ?>
    8383
    84 <div id="screen-options-wrap" class="hidden">
    85 <h5><?php _e('Show on screen') ?></h5>
    86 <form id="adv-settings" action="" method="get">
    87 <div class="metabox-prefs">
    88 <?php manage_columns_prefs('comment') ?>
    89 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    90 <br class="clear" />
    91 </div></form>
    92 </div>
     84<?php screen_options('comment') ?>
    9385
    9486<?php

  • trunk/wp-admin/edit-form-advanced.php

    r9319 r9363  
    460460?>
    461461
    462 <div id="screen-options-wrap" class="hidden">
    463 <h5><?php _e('Show on screen') ?></h5>
    464 <form id="adv-settings" action="" method="get">
    465 <div class="metabox-prefs">
    466 <?php meta_box_prefs('post') ?>
    467 <br class="clear" />
    468 </div></form>
    469 </div>
     462<?php screen_options('post', 1) ?>
    470463
    471464<?php if ( $notice ) : ?>

  • trunk/wp-admin/edit-link-categories.php

    r9354 r9363  
    6161$messages[6] = __('Categories deleted.'); ?>
    6262
    63 <div id="screen-options-wrap" class="hidden">
    64 <h5><?php _e('Show on screen') ?></h5>
    65 <form id="adv-settings" action="" method="get">
    66 <div class="metabox-prefs">
    67 <?php manage_columns_prefs('link-category') ?>
    68 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    69 <br class="clear" />
    70 </div></form>
    71 </div>
     63<?php screen_options('link-category') ?>
    7264
    7365<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
    … …  
    7668endif; ?>
    7769
    78 <div class="wrap">
    79 <h2 class="floatedh2"><?php echo wp_specialchars( $title ); ?></h2>
    80 
    81 <form class="search-form topmargin" action="" method="get">
     70<div class="wrap nosubsub">
     71<h2><?php echo wp_specialchars( $title ); ?></h2>
     72
     73<form class="search-form" action="" method="get">
    8274<p class="search-box">
    8375    <label class="hidden" for="category-search-input"><?php _e( 'Search Categories' ); ?>:</label>

  • trunk/wp-admin/edit-link-form.php

    r9319 r9363  
    310310add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core'); ?>
    311311
    312 <div id="screen-options-wrap" class="hidden">
    313 <h5><?php _e('Show on screen') ?></h5>
    314 <form id="adv-settings" action="" method="get">
    315 <div class="metabox-prefs">
    316 <?php meta_box_prefs('link') ?>
    317 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    318 <br class="clear" />
    319 </div></form>
    320 </div>
     312<?php screen_options('link', 1) ?>
    321313
    322314<div class="wrap">

  • trunk/wp-admin/edit-page-form.php

    r9332 r9363  
    350350?>
    351351
    352 <div id="screen-options-wrap" class="hidden">
    353 <h5><?php _e('Show on screen') ?></h5>
    354 <form id="adv-settings" action="" method="get">
    355 <div class="metabox-prefs">
    356 <?php meta_box_prefs('page') ?>
    357 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    358 <br class="clear" />
    359 </div></form>
    360 </div>
     352<?php screen_options('page', 1); ?>
    361353
    362354<div class="wrap">

  • trunk/wp-admin/edit-pages.php

    r9351 r9363  
    101101require_once('admin-header.php'); ?>
    102102
    103 <div id="screen-options-wrap" class="hidden">
    104 <h5><?php _e('Show on screen') ?></h5>
    105 <form id="adv-settings" action="" method="get">
    106 <div class="metabox-prefs">
    107 <?php manage_columns_prefs('page') ?>
    108 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    109 <br class="clear" />
    110 </div></form>
    111 </div>
     103<?php screen_options('page') ?>
    112104
    113105<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) ) { ?>

  • trunk/wp-admin/edit-tags.php

    r9345 r9363  
    130130$messages[6] = __('Tags deleted.'); ?>
    131131
    132 <div id="screen-options-wrap" class="hidden">
    133 <h5><?php _e('Show on screen') ?></h5>
    134 <form id="adv-settings" action="" method="get">
    135 <div class="metabox-prefs">
    136 <?php manage_columns_prefs('tag') ?>
    137 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    138 <br class="clear" />
    139 </div></form>
    140 </div>
     132<?php screen_options('tag') ?>
    141133
    142134<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
    … …  
    145137endif; ?>
    146138
    147 <div class="wrap">
    148 <h2 class="floatedh2"><?php echo wp_specialchars( $title ); ?></h2>
    149 
    150 <form class="search-form topmargin" action="" method="get">
     139<div class="wrap nosubsub">
     140<h2><?php echo wp_specialchars( $title ); ?></h2>
     141
     142<form class="search-form" action="" method="get">
    151143<p class="search-box">
    152144    <label class="hidden" for="tag-search-input"><?php _e( 'Search Tags' ); ?>:</label>

  • trunk/wp-admin/edit.php

    r9331 r9363  
    9191    $mode = attribute_escape($_GET['mode']); ?>
    9292
    93 <div id="screen-options-wrap" class="hidden">
    94 <h5><?php _e('Show on screen') ?></h5>
    95 <form id="adv-settings" action="" method="get">
    96 <div class="metabox-prefs">
    97 <?php manage_columns_prefs('post') ?>
    98 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    99 <br class="clear" />
    100 </div></form>
    101 </div>
     93<?php screen_options('post') ?>
    10294
    10395<?php

  • trunk/wp-admin/includes/template.php

    r9350 r9363  
    30913091}
    30923092
     3093function screen_options($screen, $metabox = false) {
    30933094?>
     3095<div id="screen-options">
     3096    <div id="screen-options-wrap" class="hidden">
     3097    <h5><?php _e('Show on screen') ?></h5>
     3098    <form id="adv-settings" action="" method="get">
     3099    <div class="metabox-prefs">
     3100<?php
     3101    if ( $metabox ) {
     3102        meta_box_prefs($screen);
     3103    } else {
     3104        manage_columns_prefs($screen);
     3105        wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false );
     3106    }
     3107?>
     3108    <br class="clear" />
     3109    </div></form>
     3110    </div>
     3111
     3112    <div id="screen-options-link-wrap" class="hide-if-no-js screen-options-closed">
     3113    <a href="#screen-options" id="show-settings-link" class="show-settings"><?php _e('Screen Options') ?></a>
     3114    <a href="#screen-options" id="hide-settings-link" class="show-settings" style="display:none;"><?php _e('Hide Options') ?></a>
     3115    </div>
     3116</div>
     3117<?php
     3118}
     3119
     3120?>

  • trunk/wp-admin/index.php

    r9319 r9363  
    2929?>
    3030
    31 <div id="screen-options-wrap" class="hidden">
    32 <h5><?php _e('Show on screen') ?></h5>
    33 <form id="adv-settings" action="" method="get">
    34 <div class="metabox-prefs">
    35 <?php meta_box_prefs('dashboard') ?>
    36 <br class="clear" />
    37 </div></form>
    38 </div>
     31<?php screen_options('dashboard', 1); ?>
    3932
    4033<div class="wrap">

  • trunk/wp-admin/link-manager.php

    r9341 r9363  
    7575} ?>
    7676
    77 <div id="screen-options-wrap" class="hidden">
    78 <h5><?php _e('Show on screen') ?></h5>
    79 <form id="adv-settings" action="" method="get">
    80 <div class="metabox-prefs">
    81 <?php manage_columns_prefs('link') ?>
    82 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    83 <br class="clear" />
    84 </div></form>
    85 </div>
     77<?php screen_options('link') ?>
    8678
    8779<?php
    … …  
    9587?>
    9688
    97 <div class="wrap">
    98 <h2 class="floatedh2"><?php echo wp_specialchars( $title ); ?></h2>
    99 
    100 <form class="search-form topmargin" action="" method="get">
     89<div class="wrap nosubsub">
     90<h2><?php echo wp_specialchars( $title ); ?></h2>
     91
     92<form class="search-form" action="" method="get">
    10193<p class="search-box">
    10294    <label class="hidden" for="link-search-input"><?php _e( 'Search Links' ); ?>:</label>
    10395    <input type="text" class="search-input" id="link-search-input" name="s" value="<?php _admin_search_query(); ?>" />
    104     <input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
     96    <input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button-primary" />
    10597</p>
    10698</form>

  • trunk/wp-admin/menu-header.php

    r9337 r9363  
    130130?>
    131131
    132 <ul id="adminmenu" class="wp-menu">
     132<ul id="adminmenu">
    133133
    134134<?php

  • trunk/wp-admin/upload.php

    r9341 r9363  
    146146require_once('admin-header.php'); ?>
    147147
    148 <div id="screen-options-wrap" class="hidden">
    149 <h5><?php _e('Show on screen') ?></h5>
    150 <form id="adv-settings" action="" method="get">
    151 <div class="metabox-prefs">
    152 <?php manage_columns_prefs('media') ?>
    153 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    154 <br class="clear" />
    155 </div></form>
    156 </div>
     148<?php screen_options('media') ?>
    157149
    158150<?php

  • trunk/wp-admin/users.php

    r9347 r9363  
    238238    endif; ?>
    239239
    240 <div id="screen-options-wrap" class="hidden">
    241 <h5><?php _e('Show on screen') ?></h5>
    242 <form id="adv-settings" action="" method="get">
    243 <div class="metabox-prefs">
    244 <?php manage_columns_prefs('user') ?>
    245 <?php wp_nonce_field( 'hiddencolumns', 'hiddencolumnsnonce', false ); ?>
    246 <br class="clear" />
    247 </div></form>
    248 </div>
     240<?php screen_options('user') ?>
    249241
    250242<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
    … …  
    313305    <label class="hidden" for="user-search-input"><?php _e( 'Search Users' ); ?>:</label>
    314306    <input type="text" class="search-input" id="user-search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" />
    315     <input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" />
     307    <input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button-primary" />
    316308</p>
    317309</form>

  • trunk/wp-admin/wp-admin.css

    r9354 r9363  
    10201020}
    10211021
     1022/*
    10221023#wpbody ul.wp-menu {
    10231024    list-style: none;
    … …  
    10431044    color: #666;
    10441045}
    1045 
     1046*/
    10461047/* end menu stuff */
    10471048
    … …  
    14071408.ac_match {
    14081409    text-decoration: underline;
    1409 }
    1410 
    1411 .wrap h2.floatedh2 {
    1412     float: left;
    1413     margin: 5px 0;
    14141410}
    14151411
    … …  
    17531749p.search-box {
    17541750    float: right;
    1755     margin: -10px 0 0;
    1756 }
    1757 
    1758 .topmargin p.search-box {
    1759     margin-top: 25px;
     1751    margin: -5px 0 0;
     1752}
     1753
     1754#wpbody-content .nosubsub p.search-box {
     1755    margin-top: -12px;
     1756}
     1757
     1758#wpbody-content .nosubsub h2 {
     1759    padding-bottom: 0;
    17601760}
    17611761
    … …  
    22592259
    22602260/* show/hide settings */
     2261
     2262#screen-options {
     2263    position: relative;
     2264    clear: both;
     2265}
     2266
     2267#wpbody {
     2268    clear: both;
     2269}
     2270
    22612271#screen-options-link-wrap {
    2262     background: url( images/screen-options-left.gif ) no-repeat 0 0;
     2272    float: right;
     2273    background: transparent url( images/screen-options-left.gif ) no-repeat 0 0;
    22632274    font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
    22642275    height: 23px;
    2265     position: absolute;
     2276    padding: 0;
     2277    position: relative;
    22662278    right: 100px;
    2267     top: 46px;
    2268     padding: 0 0 0 8px;
    2269 }
    2270 
    2271 #screen-options {
    2272     vertical-align: middle;
     2279    top: -1px;
     2280}
     2281
     2282#screen-options a.show-settings {
     2283    text-decoration: none;
     2284    z-index: 1;
     2285    padding: 0 18px 0 8px;
    22732286    height: 23px;
    22742287    line-height: 23px;
    22752288    font-size: 11px;
    2276     background: url( images/screen-options-right.gif ) no-repeat 100% 0;
    22772289    display: block;
    2278     padding-right: 20px;
    2279 }
    2280 
    2281 .screen-options-open #screen-options {
    2282     background: url( images/screen-options-right-up.gif ) no-repeat 100% 0;
    2283 }
    2284 
    2285 #screen-options a.show-settings {
    2286     color: #666;
    2287     text-decoration: none;
    2288     z-index: 1;
    2289     float: left;
    2290     margin-left: -8px;
    2291     padding-left: 8px;
    2292     margin-right: -20px;
    2293     padding-right: 20px;
     2290    background-repeat: no-repeat;
     2291    background-position: right top;
     2292    background-color: tarnsparent;
     2293}
     2294
     2295#screen-options a#show-settings-link {
     2296    background-image: url( images/screen-options-right.gif );
     2297}
     2298
     2299#screen-options a#hide-settings-link {
     2300    background-image: url( images/screen-options-right-up.gif );
    22942301}
    22952302
    … …  
    23082315    border-top: 0 none;
    23092316    border-width: 0 1px 1px;
    2310     margin: -10px 15px 10px;
     2317    margin: 0 15px;
    23112318    -moz-border-radius: 0 0 4px 4px;
    23122319    -webkit-border-bottom-left-radius: 4px;
Note: See TracChangeset for help on using the changeset viewer.