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

Timestamp:

08/20/2008 09:42:31 PM (18 years ago)

Author:

ryan

Message:

Collapse crazyhorse to trunk. Incoming! see #7552

File:

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

trunk/wp-admin/users.php

@@ -23 +23 @@
 
 if ( empty($action) ) {
-    if ( isset($_GET['deleteit']) )
-        $action = 'delete';
-    elseif ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
+    if ( isset($_GET['changeit']) && !empty($_GET['new_role']) )
         $action = 'promote';
 }
@@ -259 +257 @@
 <form id="posts-filter" action="" method="get">
     <?php if ( $wp_user_search->is_search() ) : ?>
-        <h2><?php printf(__('Users Matching "%s"'), wp_specialchars($wp_user_search->search_term)); ?></h2>
+        <h2><?php printf( current_user_can('create_users') ? __('Users Matching "%2$s" (<a href="%1$s">Add New</a>)') : __('Add New'), '#add-new-user', wp_specialchars($wp_user_search->search_term) ); ?></h2>
     <?php else : ?>
-        <h2><?php _e('Manage Users'); ?></h2>
+        <h2><?php printf( current_user_can('create_users') ? __('Users (<a href="%s">Add New</a>)') : __('Add New'), '#add-new-user' ); ?></h2>
     <?php endif; ?>
 
@@ -302 +300 @@
 ?>
 </ul>
+
     <p id="post-search">
     <label class="hidden" for="post-search-input"><?php _e( 'Search Users' ); ?>:</label>
@@ -315 +314 @@
 
 <div class="alignleft">
-<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" />
+<select name="action">
+<option value="" selected><?php _e('Actions'); ?></option>
+<option value="delete"><?php _e('Delete'); ?></option>
+</select>
+<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" class="button-secondary action" />
 <label class="hidden" for="new_role"><?php _e('Change role to&hellip;') ?></label><select name="new_role" id="new_role"><option value=''><?php _e('Change role to&hellip;') ?></option>"<?php wp_dropdown_roles(); ?></select>
 <input type="submit" value="<?php _e('Change'); ?>" name="changeit" class="button-secondary" />