Changeset 3861 for trunk/wp-admin/users.php

Timestamp:

06/10/2006 09:23:19 PM (20 years ago)

Author:

ryan

Message:

User UI tweaks from Mark Jaquith. #2793

File:

• trunk/wp-admin/users.php (modified) (3 diffs)

trunk/wp-admin/users.php

@@ -205 +205 @@
                 $total_users_for_this_query = $wpdb->get_var('SELECT COUNT(ID) ' . $from_where); // no limit
         else
-                $errors = new WP_Error('no_matching_users_found', __('No matching users were found!'));
+                $search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!'));
 
         // Now for the paging
@@ -283 +283 @@
 
 <div class="wrap">
-        <h2><?php _e('Search For Users'); ?></h2>
+
+        <?php if ( $search_term ) : ?>
+                <h2><?php printf(__('Users Matching "%s" by Role'), $search_term); ?></h2>
+        <?php else : ?>
+                <h2><?php _e('User List by Role'); ?></h2>
+        <?php endif; ?>
+
         <form action="" method="get" name="search" id="search">
-                <p><input type="text" name="usersearch" id="usersearch" value="<?php echo wp_specialchars($search_term); ?>" /> <input type="submit" value="Search &raquo;" /></p>
+                <p><input type="text" name="usersearch" id="usersearch" value="<?php echo wp_specialchars($search_term); ?>" /> <input type="submit" value="<?php _e('Search for users &raquo;'); ?>" /></p>
         </form>
+
+        <?php if ( is_wp_error( $search_errors ) ) : ?>
+                <div class="error">
+                        <ul>
+                        <?php
+                                foreach ( $search_errors->get_error_messages() as $message )
+                                        echo "<li>$message</li>";
+                        ?>
+                        </ul>
+                </div>
+        <?php endif; ?>
+
+
+<?php if ( $userids ) : ?>
+
         <?php if ( $search_term ) : ?>
                 <p><a href="users.php"><?php _e('&laquo; Back to All Users'); ?></a></p>
         <?php endif; ?>
-</div>
-
-<?php if ( $userids ) : ?>
+
+        <h3><?php printf(__('Results %1$s - %2$s of %3$s shown below'), $starton + 1, min($starton + $users_per_page, $total_users_for_this_query), $total_users_for_this_query); ?></h3>
+
+        <?php if ( $paging_text ) : ?>
+                <div class="user-paging-text"><?php echo $paging_text; ?></p></div>
+        <?php endif; ?>
 
 <form action="" method="post" name="updateusers" id="updateusers">
 <?php wp_nonce_field('bulk-users') ?>
-<div class="wrap">
-        <?php if ( $search_term ) : ?>
-                <h2><?php printf(__('Users Matching "%s" by Role'), $search_term); ?></h2>
-                <div class="user-paging-text"><?php echo $paging_text; ?></div>
-        <?php else : ?>
-                <h2><?php _e('User List by Role'); ?></h2>
-                <?php if ( $paging_text ) : ?>
-                        <div class="user-paging-text"><?php echo $paging_text; ?></p></div>
-                <?php endif; ?>
-        <?php endif; ?>
-        <h3><?php printf(__('Results %1$s - %2$s of %3$s shown below'), $starton + 1, min($starton + $users_per_page, $total_users_for_this_query), $total_users_for_this_query); ?></h3>
 <table class="widefat">
 <?php
@@ -357 +370 @@
                 <input type="submit" value="<?php _e('Update &raquo;'); ?>" />
         </p>
+</form>
+<?php endif; ?>
 </div>
-</form>
-
-<?php endif; // if users were returned ?>
 
 <?php