summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-09-02 07:12:55 +0200
committerByron Jones <glob@mozilla.com>2015-09-02 07:12:55 +0200
commit34e6b2e7cad19a2345328323fd81ac477e13e7eb (patch)
tree68d7b6fbdd8e122121825b45e109e4ac9ca2f6ef /template
parentf072be241bc5335a86758e3f6a1fa48cd7762f2d (diff)
downloadbugzilla-34e6b2e7cad19a2345328323fd81ac477e13e7eb.tar.gz
bugzilla-34e6b2e7cad19a2345328323fd81ac477e13e7eb.tar.xz
Bug 1200618 - Layout of the TOTP 2FA leads to missing the token time window and thus frustration
Diffstat (limited to 'template')
-rw-r--r--template/en/default/account/prefs/mfa.html.tmpl42
1 files changed, 28 insertions, 14 deletions
diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl
index dcf480d9f..a94cb77b8 100644
--- a/template/en/default/account/prefs/mfa.html.tmpl
+++ b/template/en/default/account/prefs/mfa.html.tmpl
@@ -36,9 +36,20 @@
<div id="mfa-disable-container" style="display:none">
+ <p>
+ Your current password and
+ [% IF user.mfa == "TOTP" %]
+ a TOTP verification code
+ [% END %]
+ is required to enable two-factor authentication.
+ </p>
+ <p>
+ <label class="mfa-totp">Current Password:</label>
+ <input type="password" name="password" id="mfa-password" required>
+ </p>
+
[% IF user.mfa == "TOTP" %]
- A verification code is required to confirm this change.<br><br>
- <b>Code:</b>
+ <label class="mfa-totp">Code:</label>
<input type="text" name="mfa_disable_code" id="mfa-totp-disable-code"
placeholder="123456" maxlength="6" pattern="\d{6}" size="10"
autocomplete="off" required autofocus>
@@ -46,7 +57,7 @@
</div>
- <p>
+ <p class="mfa-api-blurb">
[% INCLUDE api_key_pref_blurb %]
</p>
@@ -68,17 +79,25 @@
[%# TOTP %]
<div id="mfa-enable-totp" class="mfa-provider" style="display:none">
+ <p>
+ Your current password is required to enable two-factor authentication.
+ </p>
+ <p>
+ <label class="mfa-totp">Current Password:</label>
+ <input type="password" name="password" id="mfa-password" required>
+ </p>
+
<div id="mfa-totp-throbber">
- Working.. <img src="skins/standard/throbber.gif" width="16" height="11">
+ Generating new QR code.. <img src="skins/standard/throbber.gif" width="16" height="11">
</div>
<div id="mfa-totp-issued" style="display:none">
- <iframe id="mfa-enable-totp-frame" src="userprefs.cgi?tab=mfa&frame=totp"></iframe>
+ <iframe id="mfa-enable-totp-frame" src="userprefs.cgi?tab=mfa&frame=totp" tabindex="-1"></iframe>
<div id="mfa-totp-blurb">
Scan this QR code with your <a href="#" id="mfa-totp-apps">TOTP App</a>,
then enter the six digit code the app generates.<br>
<br>
- <b>Code:</b>
+ <label class="mfa-totp">Code:</label>
<input type="text" name="mfa_enable_code" id="mfa-totp-enable-code"
placeholder="123456" maxlength="6" pattern="\d{6}" size="10"
autocomplete="off" required autofocus>
@@ -117,16 +136,11 @@
<div id="mfa-confirm" style="display:none">
<p>
- Two-factor authentication settings will not be updated until you provide
- your current password and <b>Submit Changes</b>.
- </p>
-
- <p>
- <b>Current Password:</b>
- <input type="password" name="password" required>
+ Two-factor authentication settings will not be updated until you
+ <b>Submit Changes</b>.
</p>
- <p id="mfa-api-blurb" style="display:none">
+ <p class="mfa-api-blurb" style="display:none">
[% INCLUDE api_key_pref_blurb %]
</p>
</div>