Changeset 6785

Timestamp:

02/27/2018 02:54:08 AM (8 years ago)

Author:

obenland

Message:

2FA: Move resend button below the form

Fixes a bug where codes wouldn't be submitted correctly and improves flow.

See #77.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor

Files:

• providers/class-wporg-two-factor-secondary.php (modified) (2 diffs)
• wporg-two-factor.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/providers/class-wporg-two-factor-secondary.php

@@ -43 +43 @@
                         echo '<p class="intro">' . __( 'Enter a backup code.', 'wporg' ) . '</p>';
                 }
-
-                if ( $email_enabled || $slack_enabled ) : ?>
-                        <p class="two-factor-email-resend intro">
-                                <button type="submit" class="button-link" name="two-factor-backup-resend"><span class="dashicons-before dashicons-controls-repeat"><?php esc_html_e( 'Resend Code', 'wporg' ); ?></span></button>
-                        </p>
-                <?php endif; ?>
+                ?>
 
                 <p>
@@ -66 +61 @@
                         }, 200);
                 </script>
-                <?php
+
+                <?php if ( $email_enabled || $slack_enabled ) : ?>
+                <p class="two-factor-email-resend">
+                        <button type="submit" class="button-link" name="two-factor-backup-resend"><span class="dashicons-before dashicons-controls-repeat"><?php esc_html_e( 'Resend Code', 'wporg' ); ?></span></button>
+                </p>
+                <?php endif;
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-two-factor/wporg-two-factor.php

@@ -311 +311 @@
                         .login-action-validate_2fa #login {
                                 margin-bottom: 24px;
+                        }
+                        .wp-core-ui.login .button-primary {
+                                float: none;
+                        }
+                        #login .two-factor-email-resend {
+                                margin-top: 16px;
                         }
                         .backup-methods-wrap {