Ticket #33167: 33167.2.diff

home/umesh/Wordpress-core/trunk/wp-login.php

@@ -670 +670 @@
                 <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" />
 

home/umesh/Wordpress-core/trunk/wp-admin/css/login.css

@@ -206 +206 @@
         font-family: sans-serif;
 }
 
-.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;
 }
 
+.login-action-rp .wp-pwd{
+        margin-top: 5px;
+}
+
+.login-action-rp .pw-weak{
+        margin-bottom: 10px;
+}
+
 .login #pass-strength-result {
         font-weight: 600;
         margin: -1px 5px 16px 0;

home/umesh/Wordpress-core/trunk/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;
                 });