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

Timestamp:

10/06/2006 01:14:47 AM (18 years ago)

Author:

matt

Message:

Some UI cleanups, changes, and various miscellany.

File:

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

trunk/wp-admin/users.php

@@ -65 +65 @@
         $this->query_from_where = "FROM $wpdb->users WHERE 1=1 $search_sql";
 
-        if ( !$_GET['update'] && !$this->search_term && !$this->raw_page && $wpdb->get_var("SELECT COUNT(ID) FROM $wpdb->users") > $this->users_per_page )
-            $this->too_many_total_users = sprintf(__('Because this blog has more than %s users, they cannot all be shown on one page.  Use the paging or search functionality in order to find the user you want to edit.'), $this->users_per_page);
     }
 
@@ -327 +325 @@
 <?php endif; ?>
 
-<?php if ( $wp_user_search->too_many_total_users ) : ?>
-    <div id="message" class="updated">
-        <p><?php echo $wp_user_search->too_many_total_users; ?></p>
-    </div>
-<?php endif; ?>
-
 <div class="wrap">
 
@@ -342 +334 @@
 
     <form action="" method="get" name="search" id="search">
-        <p><input type="text" name="usersearch" id="usersearch" value="<?php echo wp_specialchars($wp_user_search->search_term, 1); ?>" /> <input type="submit" value="<?php _e('Search for users &raquo;'); ?>" /></p>
+        <p><input type="text" name="usersearch" id="usersearch" value="<?php echo wp_specialchars($wp_user_search->search_term, 1); ?>" /> <input type="submit" value="<?php _e('Search     users &raquo;'); ?>" class="button" /></p>
     </form>
 
@@ -363 +355 @@
     <?php endif; ?>
 
-    <h3><?php printf(__('%1$s &#8211; %2$s of %3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query); ?></h3>
+    <h3><?php 
+    if ( 0 == $wp_user_search->first_user && $wp_user_search->total_users_for_query <= 50 )
+        printf(__('%3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query);
+    else
+        printf(__('%1$s &#8211; %2$s of %3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query); ?></h3>
 
     <?php if ( $wp_user_search->results_are_paged() ) : ?>
-        <div class="user-paging-text"><?php $wp_user_search->page_links(); ?></p></div>
+        <div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
     <?php endif; ?>
 
@@ -406 +402 @@
 
 <?php if ( $wp_user_search->results_are_paged() ) : ?>
-    <div class="user-paging-text"><?php $wp_user_search->page_links(); ?></div>
+    <div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
 <?php endif; ?>
 
@@ -437 +433 @@
 <div class="wrap">
 <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
+<div class="narrow">
 <?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php').'</p>'; ?>
 <form action="#add-new-user" method="post" name="adduser" id="adduser">
@@ -487 +484 @@
     <input name="adduser" type="submit" id="addusersub" value="<?php _e('Add User &raquo;') ?>" />
 </p>
+</div>
 </form>