Make WordPress Core

Changeset 8867


Ignore:
Timestamp:
09/11/2008 06:54:05 PM (18 years ago)
Author:
azaozz
Message:

Fix the position of the search field on all admin pages.

Location:
trunk/wp-admin
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/categories.php

    r8839 r8867  
    120120?>
    121121
    122 <?php if (isset($_GET['message'])) : ?>
    123 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
     122<form class="search-form" action="" method="get">
     123        <p id="category-search" class="search-box">
     124                <label class="hidden" for="category-search-input"><?php _e('Search Categories'); ?></label>
     125                <input type="text" id="category-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
     126                <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
     127        </p>
     128</form>
     129
     130<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
     131<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
    124132<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
    125133endif; ?>
    … …  
    128136<form id="posts-filter" action="" method="get">
    129137        <h2><?php printf( current_user_can('manage_categories') ? __('Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
    130 
    131 <p id="category-search" class="search-box">
    132         <label class="hidden" for="category-search-input"><?php _e('Search Categories'); ?></label>
    133         <input type="text" id="category-search-input" class="search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
    134         <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
    135 </p>
    136138
    137139<br class="clear" />
  • trunk/wp-admin/css/widgets.css

    r8600 r8867  
    2626        border-bottom-width: 1px;
    2727        border-bottom-style: solid;
    28 }
    29 
    30 p#widget-search {
    31         position: absolute;
    32         right: 0;
    33         top: 0;
    34         margin: 0;
    3528}
    3629
  • trunk/wp-admin/edit-comments.php

    r8856 r8867  
    7070?>
    7171
     72<form class="search-form" action="" method="get">
     73        <p id="comment-search" class="search-box">
     74                <label class="hidden" for="comment-search-input"><?php _e( 'Search Comments' ); ?></label>
     75                <input type="text" id="comment-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
     76                <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
     77        </p>
     78</form>
     79
    7280<?php
    7381if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
    … …  
    128136?>
    129137</ul>
    130 
    131 <p id="comment-search" class="search-box">
    132         <label class="hidden" for="comment-search-input"><?php _e( 'Search Comments' ); ?></label>
    133         <input type="text" id="comment-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
    134         <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
    135 </p>
    136138
    137139<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
  • trunk/wp-admin/edit-link-categories.php

    r8839 r8867  
    5757$messages[5] = __('Category not updated.');
    5858$messages[6] = __('Categories deleted.');
     59?>
    5960
    60 if (isset($_GET['message'])) : ?>
    61 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
     61<form class="search-form" action="" method="get">
     62        <p id="link-category-search" class="search-box">
     63                <label class="hidden" for="link-category-search-input"><?php _e( 'Search Categories' ); ?></label>
     64                <input type="text" id="link-category-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
     65                <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
     66        </p>
     67</form>
     68
     69<?php
     70if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
     71<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
    6272<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
    6373endif; ?>
    … …  
    6777<form id="posts-filter" action="" method="get">
    6878        <h2><?php printf( current_user_can('manage_categories') ? __('Link Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
    69 
    70 <p id="link-category-search" class="search-box">
    71         <label class="hidden" for="link-category-search-input"><?php _e( 'Search Categories' ); ?></label>
    72         <input type="text" id="link-category-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
    73         <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
    74 </p>
    7579
    7680<br class="clear" />
  • trunk/wp-admin/edit-pages.php

    r8860 r8867  
    7777
    7878?>
     79
     80<form class="search-form" action="" method="get">
     81        <p id="page-search" class="search-box">
     82                <label class="hidden" for="page-search-input"><?php _e( 'Search Pages' ); ?></label>
     83                <input type="text" id="page-search-input" name="s" value="<?php the_search_query(); ?>" />
     84                <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
     85        </p>
     86</form>
     87
    7988<div class="wrap">
    8089<form id="posts-filter" action="" method="get">
    … …  
    138147endif;
    139148?>
    140 
    141 <p id="page-search" class="search-box">
    142         <label class="hidden" for="page-search-input"><?php _e( 'Search Pages' ); ?></label>
    143         <input type="text" id="page-search-input" name="s" value="<?php the_search_query(); ?>" />
    144         <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
    145 </p>
    146149
    147150<div class="tablenav">
  • trunk/wp-admin/edit-tags.php

    r8839 r8867  
    126126?>
    127127
    128 <?php if (isset($_GET['message'])) : ?>
    129 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
     128<form class="search-form" action="" method="get">
     129        <p id="tag-search" class="search-box">
     130                <label class="hidden" for="tag-search-input"><?php _e( 'Search Tags' ); ?></label>
     131                <input type="text" id="tag-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
     132                <input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
     133        </p>
     134</form>
     135
     136<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
     137<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
    130138<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
    131139endif; ?>
    … …  
    135143<form id="posts-filter" action="" method="get">
    136144        <h2><?php printf( current_user_can('manage_categories') ? __('Tags (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addtag' ); ?></h2>
    137 
    138 <p id="tag-search" class="search-box">
    139         <label class="hidden" for="tag-search-input"><?php _e( 'Search Tags' ); ?></label>
    140         <input type="text" id="tag-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
    141         <input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
    142 </p>
    143145
    144146<br class="clear" />
  • trunk/wp-admin/edit.php

    r8858 r8867  
    7171        $mode = attribute_escape($_GET['mode']);
    7272?>
     73
     74<form class="search-form" action="" method="get">
     75        <p id="post-search" class="search-box">
     76                <label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?></label>
     77                <input type="text" id="post-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
     78                <input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
     79        </p>
     80</form>
    7381
    7482<div class="wrap">
    … …  
    155163?>
    156164
    157 <p id="post-search" class="search-box">
    158         <label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?></label>
    159         <input type="text" id="post-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
    160         <input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
    161 </p>
    162 
    163165<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
    164166
  • trunk/wp-admin/link-manager.php

    r8844 r8867  
    7272                break;
    7373}
    74 
     74?>
     75
     76<form class="search-form" action="" method="get">
     77        <p id="link-search" class="search-box">
     78                <label class="hidden" for="link-search-input"><?php _e( 'Search Links' ); ?></label>
     79                <input type="text" id="link-search-input" name="s" value="<?php the_search_query(); ?>" />
     80                <input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
     81        </p>
     82</form>
     83
     84<?php
    7585if ( isset($_GET['deleted']) ) {
    7686        echo '<div id="message" class="updated fade"><p>';
    … …  
    8696<form id="links-filter" action="" method="get">
    8797<h2><?php printf( __('Links (<a href="%s">Add New</a>)' ), 'link-add.php' ); ?></h2>
    88 
    89 <p id="link-search" class="search-box">
    90         <label class="hidden" for="link-search-input"><?php _e( 'Search Links' ); ?></label>
    91         <input type="text" id="link-search-input" name="s" value="<?php the_search_query(); ?>" />
    92         <input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
    93 </p>
    9498
    9599<br class="clear" />
  • trunk/wp-admin/upload.php

    r8839 r8867  
    6363
    6464?>
     65
     66<form class="search-form" action="" method="get">
     67        <p id="media-search" class="search-box" >
     68                <label class="hidden" for="media-search-input"><?php _e( 'Search Media' ); ?></label>
     69                <input type="text" id="media-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
     70                <input type="submit" value="<?php _e( 'Search Media' ); ?>" class="button" />
     71        </p>
     72</form>
    6573
    6674<div class="wrap">
    … …  
    140148?>
    141149
    142 <p id="media-search" class="search-box" >
    143         <label class="hidden" for="media-search-input"><?php _e( 'Search Media' ); ?></label>
    144         <input type="text" id="media-search-input" class="search-input" name="s" value="<?php the_search_query(); ?>" />
    145         <input type="submit" value="<?php _e( 'Search Media' ); ?>" class="button" />
    146 </p>
    147 
    148150<?php do_action('restrict_manage_posts'); ?>
    149151
  • trunk/wp-admin/users.php

    r8845 r8867  
    208208        // Query the users
    209209        $wp_user_search = new WP_User_Search($usersearch, $userspage, $role);
    210 
     210       
     211        $messages = array();
    211212        if ( isset($_GET['update']) ) :
    212213                switch($_GET['update']) {
    213214                case 'del':
    214215                case 'del_many':
    215                 ?>
    216                         <?php $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0; ?>
    217                         <div id="message" class="updated fade"><p><?php printf(__ngettext('%s user deleted', '%s users deleted', $delete_count), $delete_count); ?></p></div>
    218                 <?php
     216                        $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
     217                        $messages[] = '<div id="message" class="updated fade"><p>' . sprintf(__ngettext('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '</p></div>';
    219218                        break;
    220219                case 'add':
    221                 ?>
    222                         <div id="message" class="updated fade"><p><?php _e('New user created.'); ?></p></div>
    223                 <?php
     220                        $messages[] = '<div id="message" class="updated fade"><p>' . __('New user created.') . '</p></div>';
    224221                        break;
    225222                case 'promote':
    226                 ?>
    227                         <div id="message" class="updated fade"><p><?php _e('Changed roles.'); ?></p></div>
    228                 <?php
     223                        $messages[] = '<div id="message" class="updated fade"><p>' . __('Changed roles.') . '</p></div>';
    229224                        break;
    230225                case 'err_admin_role':
    231                 ?>
    232                         <div id="message" class="error"><p><?php _e("The current user's role must have user editing capabilities."); ?></p></div>
    233                         <div id="message" class="updated fade"><p><?php _e('Other user roles have been changed.'); ?></p></div>
    234                 <?php
     226                        $messages[] = '<div id="message" class="error"><p>' . __("The current user's role must have user editing capabilities.") . '</p></div>';
     227                        $messages[] = '<div id="message" class="updated fade"><p>' . __('Other user roles have been changed.') . '</p></div>';
    235228                        break;
    236229                case 'err_admin_del':
    237                 ?>
    238                         <div id="message" class="error"><p><?php _e("You can't delete the current user."); ?></p></div>
    239                         <div id="message" class="updated fade"><p><?php _e('Other users have been deleted.'); ?></p></div>
    240                 <?php
     230                        $messages[] = '<div id="message" class="error"><p>' . __("You can't delete the current user.") . '</p></div>';
     231                        $messages[] = '<div id="message" class="updated fade"><p>' . __('Other users have been deleted.') . '</p></div>';
    241232                        break;
    242233                }
    243234        endif; ?>
     235
     236<form class="search-form" action="" method="get">
     237        <p id="user-search" class="search-box">
     238        <label class="hidden" for="user-search-input"><?php _e( 'Search Users' ); ?></label>
     239        <input type="text" id="user-search-input" class="search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" />
     240        <input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" />
     241        </p>
     242</form>
    244243
    245244<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
    … …  
    247246                <ul>
    248247                <?php
    249                         foreach ( $errors->get_error_messages() as $message )
    250                                 echo "<li>$message</li>";
     248                        foreach ( $errors->get_error_messages() as $err )
     249                                echo "<li>$err</li>\n";
    251250                ?>
    252251                </ul>
    253252        </div>
    254 <?php endif; ?>
     253<?php endif;
     254
     255if ( ! empty($messages) ) {
     256        foreach ( $messages as $msg )
     257                echo $msg;
     258} ?>
    255259
    256260<div class="wrap">
    … …  
    300304?>
    301305</ul>
    302 
    303         <p id="user-search" class="search-box">
    304         <label class="hidden" for="user-search-input"><?php _e( 'Search Users' ); ?></label>
    305         <input type="text" id="user-search-input" class="search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" />
    306         <input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" />
    307         </p>
    308306
    309307<div class="tablenav">
  • trunk/wp-admin/widgets.php

    r8841 r8867  
    101101        exit;
    102102}
    103 
    104 
    105 
    106103
    107104// What widget (if any) are we editing
    … …  
    226223$show = isset($_GET['show']) && isset($show_values[$_GET['show']]) ? attribute_escape( $_GET['show'] ) : false;
    227224
    228 
    229225$messages = array(
    230226        'updated' => __('Changes saved.')
    231227);
    232228
    233 require_once( 'admin-header.php' );
    234 
    235 if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?>
    236 
    237 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
    238 
    239 <?php endif; ?>
    240 
    241 <div class="wrap">
    242 
    243         <form id="widgets-filter" action="" method="get">
    244 
    245         <h2><?php _e( 'Widgets' ); ?></h2>
     229require_once( 'admin-header.php' ); ?>
     230
     231<form class="search-form" action="" method="get">
    246232        <p id="widget-search" class="search-box">
    247233                <label class="hidden" for="widget-search-input"><?php _e( 'Search Widgets' ); ?></label>
    … …  
    249235                <input type="submit" class="button" value="<?php _e( 'Search Widgets' ); ?>" />
    250236        </p>
     237</form>
     238
     239<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?>
     240<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
     241<?php endif; ?>
     242
     243<div class="wrap">
     244
     245        <form id="widgets-filter" action="" method="get">
     246
     247        <h2><?php _e( 'Widgets' ); ?></h2>
    251248
    252249        <div class="widget-liquid-left-holder">
  • trunk/wp-admin/wp-admin.css

    r8857 r8867  
    15481548p.search-box {
    15491549        position: absolute;
    1550         right: 0;
    1551         top: -64px;
     1550        right: 15px;
     1551        top: 52px;
    15521552        margin: 0;
    15531553}
Note: See TracChangeset for help on using the changeset viewer.