From c5c9d675f6f1f121cd4c7aa3e96b99a3884caf88 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 1 Sep 2015 22:08:33 +0800
Subject: Bug 1200600 - message about 2fa's interaction with api authentication
 should be visible when 2fa is enabled

---
 template/en/default/account/prefs/mfa.html.tmpl | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'template/en/default/account')

diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl
index 750e34cee..dcf480d9f 100644
--- a/template/en/default/account/prefs/mfa.html.tmpl
+++ b/template/en/default/account/prefs/mfa.html.tmpl
@@ -46,6 +46,10 @@
 
     </div>
 
+    <p>
+      [% INCLUDE api_key_pref_blurb %]
+    </p>
+
   [% ELSE %]
     <p>
       Two-factor authentication is currently <b>disabled</b>.
@@ -123,12 +127,18 @@
     </p>
 
     <p id="mfa-api-blurb" style="display:none">
-      Enabling two-factor authentication will also require systems that
-      interface with [% terms.Bugzilla %]'s API to use <a href="userprefs.cgi?tab=apikey">API-Keys</a>
-      for authentication.<br>
-      While not recommended, this limitation can be lifted by changing the
-      <a href="userprefs.cgi?tab=settings#api_key_only">Require API-Key authentication for API requests</a>
-      preference after 2FA is enabled.
+      [% INCLUDE api_key_pref_blurb %]
+    </p>
   </div>
 
 </div>
+
+[% BLOCK api_key_pref_blurb %]
+  Enabling two-factor authentication will also require systems that
+  interface with [% terms.Bugzilla %]'s API to use <a href="userprefs.cgi?tab=apikey">API-Keys</a>
+  for authentication.<br>
+  <br>
+  While not recommended, this limitation can be lifted by changing the
+  <a href="userprefs.cgi?tab=settings#api_key_only">Require API-Key authentication for API requests</a>
+  preference after 2FA is enabled.
+[% END %]
-- 
cgit v1.2.3-24-g4f1b