Changeset 11359

Timestamp:

05/16/2009 06:29:10 AM (15 years ago)

Author:

azaozz

Message:

Clean up user-edit.php, add password strength meter to Add User and Edit User

Location:

trunk/wp-admin

Files:

• user-edit.php (modified) (12 diffs)
• user-new.php (modified) (2 diffs)
• wp-admin.css (modified) (2 diffs)

trunk/wp-admin/user-edit.php

@@ -10 +10 @@
 require_once('admin.php');
 
-if ( defined('IS_PROFILE_PAGE') && IS_PROFILE_PAGE )
-    $is_profile_page = true;
-else
-    $is_profile_page = false;
-
-if ( $is_profile_page ) {
-    wp_enqueue_script('user-profile');
-    wp_enqueue_script('password-strength-meter');
-}
-
-$title = $is_profile_page? __('Profile') : __('Edit User');
-if ( current_user_can('edit_users') && !$is_profile_page )
+if ( !defined('IS_PROFILE_PAGE') )
+    define('IS_PROFILE_PAGE', false);
+
+wp_enqueue_script('user-profile');
+wp_enqueue_script('password-strength-meter');
+
+$title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
+if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
     $submenu_file = 'users.php';
 else
@@ -34 +30 @@
 
 if ( !$user_id ) {
-    if ( $is_profile_page ) {
+    if ( IS_PROFILE_PAGE ) {
         $current_user = wp_get_current_user();
         $user_id = $current_user->ID;
@@ -76 +72 @@
     wp_die(__('You do not have permission to edit this user.'));
 
-if ($is_profile_page)
+if ( IS_PROFILE_PAGE )
     do_action('personal_options_update', $user_id);
 else
@@ -84 +80 @@
 
 if ( !is_wp_error( $errors ) ) {
-    $redirect = ($is_profile_page? "profile.php?" : "user-edit.php?user_id=$user_id&"). "updated=true";
+    $redirect = (IS_PROFILE_PAGE ? "profile.php?" : "user-edit.php?user_id=$user_id&"). "updated=true";
     $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
     wp_redirect($redirect);
@@ -102 +98 @@
 <div id="message" class="updated fade">
     <p><strong><?php _e('User updated.') ?></strong></p>
-    <?php if ( $wp_http_referer && !$is_profile_page ) : ?>
+    <?php if ( $wp_http_referer && !IS_PROFILE_PAGE ) : ?>
     <p><a href="users.php"><?php _e('&larr; Back to Authors and Users'); ?></a></p>
     <?php endif; ?>
@@ -174 +170 @@
 </table>
 <?php
-    if ( $is_profile_page )
+    if ( IS_PROFILE_PAGE )
         do_action('profile_personal_options', $profileuser);
 ?>
@@ -186 +182 @@
     </tr>
 
-<?php if ( !$is_profile_page ): ?>
+<?php if ( !IS_PROFILE_PAGE ): ?>
 <tr><th><label for="role"><?php _e('Role:') ?></label></th>
 <td><select name="role" id="role">
@@ -205 +201 @@
 ?>
 </select></td></tr>
-<?php endif; //!$is_profile_page ?>
+<?php endif; //!IS_PROFILE_PAGE ?>
 
 <tr>
@@ -281 +277 @@
 </table>
 
-<h3><?php $is_profile_page? _e('About Yourself') : _e('About the user'); ?></h3>
+<h3><?php IS_PROFILE_PAGE ? _e('About Yourself') : _e('About the user'); ?></h3>
 
 <table class="form-table">
@@ -298 +294 @@
     <td><input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?></span><br />
         <input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("Type your new password again."); ?></span><br />
-    <?php if ( $is_profile_page ): ?>
         <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
-        <p class="description indicator-hint"><?php _e('Hint: Your password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
-    <?php endif; ?></td>
+        <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
+    </td>
 </tr>
 <?php endif; ?>
@@ -307 +302 @@
 
 <?php
-    if ( $is_profile_page ) {
+    if ( IS_PROFILE_PAGE ) {
         do_action('show_user_profile', $profileuser);
     } else {
@@ -336 +331 @@
     <input type="hidden" name="action" value="update" />
     <input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" />
-    <input type="submit" class="button-primary" value="<?php $is_profile_page? esc_attr_e('Update Profile') : esc_attr_e('Update User') ?>" name="submit" />
+    <input type="submit" class="button-primary" value="<?php IS_PROFILE_PAGE ? esc_attr_e('Update Profile') : esc_attr_e('Update User') ?>" name="submit" />
 </p>
 </form>

trunk/wp-admin/user-new.php

@@ -38 +38 @@
 
 wp_enqueue_script('wp-ajax-response');
+wp_enqueue_script('user-profile');
+wp_enqueue_script('password-strength-meter');
 
 require_once ('admin-header.php');
@@ -118 +120 @@
         <td><input name="pass1" type="password" id="pass1" autocomplete="off" />
         <br />
-        <input name="pass2" type="password" id="pass2" autocomplete="off"/></td>
+        <input name="pass2" type="password" id="pass2" autocomplete="off"/>
+        <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
+        <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
+        </td>
     </tr>
     <tr>

trunk/wp-admin/wp-admin.css

@@ -1305 +1305 @@
 }
 
-.form-table input.regular-text {
-    width: 325px;
+.form-table input.regular-text,
+#adduser .form-field input {
+    width: 25em;
 }
 
@@ -1316 +1317 @@
     width: 500px;
     margin-bottom: 6px;
-}
-
-#profile-page .form-table input[type=text] {
-    width: 300px;
 }