diff options
Diffstat (limited to 'templates/web/base/auth')
| -rw-r--r-- | templates/web/base/auth/general.html | 2 | ||||
| -rw-r--r-- | templates/web/base/auth/sign_out.html | 2 | ||||
| -rw-r--r-- | templates/web/base/auth/token.html | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index 41ff3a2e1..2a8bea402 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -2,6 +2,8 @@ <h1>[% loc('Sign in') %]</h1> +[% TRY %][% INCLUDE 'auth/_general_top.html' %][% CATCH file %][% END %] + [% IF oauth_need_email %] <p class="form-error">[% loc('We need your email address, please give it below.') %]</p> [% END %] diff --git a/templates/web/base/auth/sign_out.html b/templates/web/base/auth/sign_out.html index c95efacf5..1a468b278 100644 --- a/templates/web/base/auth/sign_out.html +++ b/templates/web/base/auth/sign_out.html @@ -5,6 +5,6 @@ <p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p> </div> -[% INCLUDE next_steps.html %] +[% INCLUDE next_steps.html utm_content='signed out' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/auth/token.html b/templates/web/base/auth/token.html index a4dedcec3..9a79a5e67 100644 --- a/templates/web/base/auth/token.html +++ b/templates/web/base/auth/token.html @@ -14,8 +14,14 @@ <div class="confirmation-header confirmation-header--inbox"> - <h1>[% loc("Nearly done! Now check your email…") %]</h1> - <p>[% loc("Click the link in our confirmation email to sign in.") %]</p> + [% IF c.config.SIGNUPS_DISABLED %] + <h1>[% loc("Nearly done!") %]</h1> + <p>[% loc("If there's a user associated with the address you entered, we've sent a confirmation email.") %]</p> + <p>[% loc("Click the link in that email to sign in.") %]</p> + [% ELSE %] + <h1>[% loc("Nearly done! Now check your email…") %]</h1> + <p>[% loc("Click the link in our confirmation email to sign in.") %]</p> + [% END %] <p> [% loc("Can’t find our email? Check your spam folder – that’s the solution 99% of the time.") %] |