diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
| commit | ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5 (patch) | |
| tree | 483da9c8b66f4444bb8a410e3d599c7484ad721e /template/en/default/account | |
| parent | daa2d6b1c40354ecce0e48e6c5ee686efe642c4b (diff) | |
| parent | 2f8b999750cc700faf03c6aee1c53d1fc4df767f (diff) | |
| download | bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.gz bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.xz | |
Merge branch 'master' into unstable
Diffstat (limited to 'template/en/default/account')
| -rw-r--r-- | template/en/default/account/auth/login.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/account/prefs/mfa.html.tmpl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl index 160fad43b..8cf5e85ef 100644 --- a/template/en/default/account/auth/login.html.tmpl +++ b/template/en/default/account/auth/login.html.tmpl @@ -42,7 +42,7 @@ </p> <div id="login" class="login-form"> - <form name="login" action="[% target FILTER html %]" method="POST" + <form name="login" action="[% urlbase FILTER html %][% target FILTER uri FILTER html %]" method="POST" [%- IF Bugzilla.cgi.param("data") %] enctype="multipart/form-data"[% END %]> <div class="field-login"> <label for="Bugzilla_login">Email Address:</label> diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl index f75320892..973d38432 100644 --- a/template/en/default/account/prefs/mfa.html.tmpl +++ b/template/en/default/account/prefs/mfa.html.tmpl @@ -91,7 +91,7 @@ [% END %] </p> - [% IF user.mfa && user.in_group("mozilla-employee-confidential") %] + [% IF user.mfa %] <p class="mfa-disable-blurb"> You will need to disable your two-factor authentication in order to change to a different method. There will be a small amount of time when your account will not be as secure, so you may use the @@ -178,7 +178,7 @@ or <a href="https://freeotp.github.io/" target="_blank" rel="noopener noreferrer">Red Hat FreeOTP</a>), </blockquote> - [% IF Param("duo_host") && user.in_group("mozilla-employee-confidential") %] + [% IF Param("duo_host") %] <button type="button" id="mfa-select-duo">Duo Security</button><br> <blockquote> Requires a <a href="https://mana.mozilla.org/wiki/display/SD/DuoSecurity" target="_blank" rel="noopener noreferrer">Duo Security</a> @@ -245,7 +245,7 @@ </div> - [% IF Param("duo_host") && user.in_group("mozilla-employee-confidential") %] + [% IF Param("duo_host") %] [%# enable - duo %] <div id="mfa-enable-duo" style="display:none"> |