Ticket #36010: 36010.2.diff

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

@@ -25 +25 @@
                         $pass1.val( $pass1.data( 'pw' ) );
                         $pass1.trigger( 'pwupdate' );
                         showOrHideWeakPasswordCheckbox();
+                        showOrHidePasswordHint();
                 }
                 else {
                         // zxcvbn loaded after the user entered password, check strength.
                         check_pass_strength();
                         showOrHideWeakPasswordCheckbox();
+                        showOrHidePasswordHint();
                 }
 
                 if ( 1 !== parseInt( $toggleButton.data( 'start-masked' ), 10 ) ) {
@@ -58 +60 @@
 
                         $pass1.removeClass( 'short bad good strong' );
                         showOrHideWeakPasswordCheckbox();
+                        showOrHidePasswordHint();
                 } );
         }
 
@@ -244 +247 @@
         }
 
         function showOrHideWeakPasswordCheckbox() {
-                var passStrength = $('#pass-strength-result')[0];
+                var passStrength = $( '#pass-strength-result' )[0];
 
                 if ( passStrength.className ) {
                         $pass1.addClass( passStrength.className );
@@ -265 +268 @@
                 }
         }
 
+        function showOrHidePasswordHint() {
+                var passStrength = $( '#pass-strength-result' )[0];
+
+                if ( passStrength.className ) {
+                        var isWeak = $( passStrength ).is( '.short, .bad' );
+
+                        $( '.indicator-hint' ).toggle( isWeak );
+                }
+        }
+
         $(document).ready( function() {
                 var $colorpicker, $stylesheet, user_id, current_user_id,
                         select       = $( '#display_name' ),

src/wp-admin/css/forms.css

@@ -565 +565 @@
         opacity: 1;
 }
 
-#pass1.short, #pass1-text.short {
-        border-color: #e35b5b;
-}
-
-#pass1.bad, #pass1-text.bad {
-        border-color: #f78b53;
-}
-
-#pass1.good, #pass1-text.good {
-        border-color: #ffc733;
-}
-
-#pass1.strong, #pass1-text.strong {
-        border-color: #83c373;
-}
-
 .pw-weak {
         display: none;
 }

src/wp-admin/css/login.css

@@ -313 +313 @@
 
 .login #pass-strength-result {
         font-weight: 600;
-        margin: -1px 5px 16px 0;
+        margin: 8px 5px 16px 0;
         padding: 6px 5px;
         text-align: center;
         width: 100%;

src/wp-login.php

@@ -871 +871 @@
                         ?>
                         <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
                         <p class="submit">
-                                <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Get New Password' ); ?>" />
+                                <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Start Password Reset' ); ?>" />
                         </p>
                 </form>
 
@@ -951 +951 @@
                 if ( ( ! $errors->has_errors() ) && isset( $_POST['pass1'] ) && ! empty( $_POST['pass1'] ) ) {
                         reset_password( $user, $_POST['pass1'] );
                         setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-                        login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
+                        $new_pass_login_url = add_query_arg( array( 'reset-pass' => 'success' ), wp_login_url() );
+                        login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( $new_pass_login_url ) . '">' . __( 'Log in' ) . '</a></p>' );
                         login_footer();
                         exit;
                 }
@@ -959 +960 @@
                 wp_enqueue_script( 'utils' );
                 wp_enqueue_script( 'user-profile' );
 
-                login_header( __( 'Reset Password' ), '<p class="message reset-pass">' . __( 'Enter your new password below.' ) . '</p>', $errors );
+                login_header( __( 'Reset Password' ), '<p class="message reset-pass">' . __( 'Enter your new password or use the suggested password.' ) . '</p>', $errors );
 
                 ?>
                 <form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
@@ -1006 +1007 @@
                         ?>
                         <input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
                         <p class="submit">
-                                <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Reset Password' ); ?>" />
+                                <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Confirm Password Change' ); ?>" />
                         </p>
                 </form>
 
@@ -1326 +1327 @@
                                 $errors->add( 'newpass', __( 'Check your email for your new password.' ), 'message' );
                         } elseif ( isset( $_GET['checkemail'] ) && 'registered' === $_GET['checkemail'] ) {
                                 $errors->add( 'registered', __( 'Registration complete. Please check your email.' ), 'message' );
+                        } elseif ( isset( $_GET['reset-pass'] ) && 'success' === $_GET['reset-pass'] ) {
+                                $errors->add( 'passreset', __( 'Using your new password, log in below.' ), 'message' );
                         } elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
                                 $errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
                         } elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {