Ticket #33167: 331767.6.diff

src/wp-admin/css/forms.css

@@ -1302 +1302 @@
                 top: 0;
         }
 
+        .login-action-rp .wp-pwd button.button{ 
+                background: #f7f7f7 none repeat scroll 0 0; 
+                border:1px solid #ccc; 
+                padding: 0 10px; 
+        } 
+        
+        .login-action-rp .wp-pwd button.button { 
+                right: 30px; 
+        }
+
         .wp-pwd button.button:hover,
         .wp-pwd button.button:focus,
         .wp-pwd button.button:active {

src/wp-admin/css/login.css

@@ -206 +206 @@
         font-family: sans-serif;
 }
 
-.login-action-rp input[type="text"] {
-        -webkit-box-shadow: none;
-        box-shadow: none;
-        margin: 0;
-}
+.login-action-rp input[type="text"]  
+.login-action-rp input[type="text"], 
+.login-action-rp input[type="password"] { 
+        -webkit-box-shadow: none; 
+        box-shadow: none;               
+        margin: 0; 
+        font-size: 15px; 
+} 
+
+.login-action-rp .wp-pwd .input, 
+.login-action-rp .wp-pwd #pass-strength-result{ 
+        width: 69%; 
+} 
+
+.login-action-rp .wp-pwd{ 
+        margin-top: 5px; 
+} 
+
+.login-action-rp .pw-weak{ 
+        margin-bottom: 10px; 
+} 
 
 .login #pass-strength-result {
         font-weight: 600;

src/wp-admin/js/user-profile.js

@@ -85 +85 @@
 
                         if ( passStrength.className ) {
                                 $pass1.add( $pass1Text ).addClass( passStrength.className );
-                                if ( 'short' === passStrength.className || 'bad' === passStrength.className ) {
+                                if ( $(passStrength).is('.short, .bad') ) { 
                                         if ( ! $weakCheckbox.prop( 'checked' ) ) {
                                                 $submitButtons.prop( 'disabled', true );
                                         }
@@ -158 +158 @@
                         $cancelButton;
 
                 $pass1Row = $('.user-pass1-wrap');
-                $pass1Label = $pass1Row.find('th label').attr( 'for', 'pass1-text' );
+                $pass1Label = $pass1Row.find('label').attr( 'for', 'pass1-text' );
 
                 // hide this
                 $('.user-pass2-wrap').hide();
 
-                $submitButton = $( '#submit' ).on( 'click', function () {
+                $submitButton = $( '#submit, #wp-submit' ).on( 'click', function () {
                         updateLock = false;
                 });
 

src/wp-login.php

@@ -627 +627 @@
                         <span class="password-input-wrapper">
                                 <input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
                         </span>
+                        <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>"> 
+                                <span class="dashicons dashicons-hidden"></span> 
+                                <span class="text"><?php _e( 'Hide' ); ?></span> 
+                        </button> 
                         <div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
                 </div>
         </div>
@@ -635 +639 @@
                 <label for="pass2"><?php _e( 'Confirm new password' ) ?></label><br />
                 <input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" />
         </p>
+        <div class="pw-weak">            
+                <label> 
+                        <input type="checkbox" name="pw_weak" class="pw-checkbox" /> 
+                        <?php _e( 'Confirm use of weak password' ); ?> 
+                </label>                 
+        </div> 
 
         <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
         <br class="clear" />