diff options
| -rw-r--r-- | templates/web/base/auth/token.html | 27 | ||||
| -rw-r--r-- | templates/web/base/email_sent.html | 18 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/images/inbox-in-circle-100px.png | bin | 0 -> 1725 bytes | |||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 5 |
4 files changed, 31 insertions, 19 deletions
diff --git a/templates/web/base/auth/token.html b/templates/web/base/auth/token.html index 361d4fbd5..b137f0e56 100644 --- a/templates/web/base/auth/token.html +++ b/templates/web/base/auth/token.html @@ -1,25 +1,28 @@ -[% INCLUDE 'header.html', title => loc('Confirm account') %] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirm account') %] [% IF token_not_found %] -<h1>[% loc('Error') %]</h1> + <div class="confirmation-header confirmation-header--failure"> -<p> - [% loc('We have not been able to confirm your account - sorry.') %] - [% loc('This may be because the link is too old or already used, or the address was not copied correctly.') %] -</p> + <h1>[% loc('We have not been able to confirm your account - sorry.') %]</h1> + <p>[% loc('This may be because the link is too old or already used, or the address was not copied correctly.') %]</p> + + </div> [% ELSE %] -<h1>[% loc('Please check your email') %]</h1> + <div class="confirmation-header confirmation-header--inbox"> -<p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p> + <h1>[% loc('Please check your email') %]</h1> + <p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p> -[% IF c.cobrand.moniker != 'zurich' %] -<p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> -[% END %] + [% IF c.cobrand.moniker != 'zurich' %] + <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> + [% END %] + + <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> -<p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> + </div> [% END %] diff --git a/templates/web/base/email_sent.html b/templates/web/base/email_sent.html index 8d7b35a58..3b442cfb5 100644 --- a/templates/web/base/email_sent.html +++ b/templates/web/base/email_sent.html @@ -1,14 +1,16 @@ -[% INCLUDE 'header.html', bodyclass = 'twothirdswidthpage', title = loc('Create a report') %] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Create a report') %] -<h1>[% loc("Nearly Done! Now check your email...") %]</h1> +<div class="confirmation-header confirmation-header--inbox"> -[% IF c.cobrand.moniker != 'zurich' %] + <h1>[% loc("Nearly Done! Now check your email...") %]</h1> + + [% IF c.cobrand.moniker != 'zurich' %] <p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> -[% END %] + [% END %] -<p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> + <p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> -[% IF c.cobrand.moniker != 'zurich' %] + [% IF c.cobrand.moniker != 'zurich' %] <p> [% loc("You must now click the link in the email we've just sent you.") %] [% IF email_type == 'problem' %] @@ -29,6 +31,8 @@ [% loc("(Don't worry — we'll hang on to your alert while you're checking your email.)") %] [% END %] </p> -[% END %] + [% END %] + +</div> [% INCLUDE 'footer.html' %] diff --git a/web/cobrands/fixmystreet/images/inbox-in-circle-100px.png b/web/cobrands/fixmystreet/images/inbox-in-circle-100px.png Binary files differnew file mode 100644 index 000000000..d06685489 --- /dev/null +++ b/web/cobrands/fixmystreet/images/inbox-in-circle-100px.png diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index a660bf928..2ee708903 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -1603,10 +1603,15 @@ table.nicetable { text-align: center; background: transparent url(/cobrands/fixmystreet/images/tick-in-circle-100px.png) center 1em no-repeat; + &.confirmation-header--failure { background-image: url(/cobrands/fixmystreet/images/sad-face-in-circle-100px.png); } + &.confirmation-header--inbox { + background-image: url(/cobrands/fixmystreet/images/inbox-in-circle-100px.png); + } + h1, h2 { margin: 0; line-height: 1.2em; |
