Ticket #33167: 33167.8.diff

src/wp-admin/css/login.css

@@ -79 +79 @@
         padding: 0;
 }
 
+.login .password-input-wrapper {
+    display: table;
+}
+
+.login .input.password-input {
+    display: table-cell;
+    margin: 0;
+}
+
+.login .pw-weak {
+    margin-bottom: 15px;
+}
+
+.login .button.button-secondary {
+    display: table-cell;
+    border-radius: 0;
+    vertical-align: middle;
+}
+
 .login form {
         margin-top: 20px;
         margin-left: 0;

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

@@ -161 +161 @@
                 // hide this
                 $('.user-pass2-wrap').hide();
 
-                $submitButton = $( '#submit' ).on( 'click', function () {
+                $submitButton = $( '#submit, #wp-submit' ).on( 'click', function () {
                         updateLock = false;
                 });
 
@@ -314 +314 @@
 
                 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 );
                                 }

src/wp-login.php

@@ -633 +633 @@
                 </p>
 
                 <div class="wp-pwd">
-                        <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>
+                        <div 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 password-input" size="24" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+                                <span class="button button-secondary wp-hide-pw hide-if-no-js">
+                                        <span class="dashicons dashicons-hidden"></span>
+                                </span>
+                        </div>
                         <div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
                 </div>
+                <div class="pw-weak">
+                        <label>
+                                <input type="checkbox" name="pw_weak" class="pw-checkbox" />
+                                <?php _e( 'Confirm use of weak password' ); ?>
+                        </label>
+                </div>
         </div>
 
         <p class="user-pass2-wrap">