diff options
Diffstat (limited to 'templates/web/base/auth')
| -rw-r--r-- | templates/web/base/auth/general.html | 123 | ||||
| -rw-r--r-- | templates/web/base/auth/token.html | 26 |
2 files changed, 69 insertions, 80 deletions
diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index f5e2e423f..6e1db86fe 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -1,83 +1,70 @@ -[% INCLUDE 'header.html', title = loc('Sign in or create an account') %] +[% INCLUDE 'header.html', bodyclass='authpage', title = loc('Sign in or create an account') %] <h1>[% loc('Sign in') %]</h1> <form action="[% c.uri_for() %]" method="post" name="general_auth" class="validate"> -<input type="hidden" name="r" value="[% c.req.params.r | html %]"> - - [% IF email_error; - - # other keys include fqdn, mxcheck if you'd like to write a custom error message - - errors = { - missing => loc('Please enter your email'), - other => loc('Please check your email address is correct') - }; - - loc_email_error = errors.$email_error || errors.other; - END %] - - [% IF loc_email_error %] + <fieldset> + + <input type="hidden" name="r" value="[% c.req.params.r | html %]"> + + [% IF email_error; + + # other keys include fqdn, mxcheck if you'd like to write a custom error message + + errors = { + missing => loc('Please enter your email'), + other => loc('Please check your email address is correct') + }; + + loc_email_error = errors.$email_error || errors.other; + END %] + + <label class="n" for="email">[% loc('Email') %]</label> + [% IF loc_email_error %] <div class="form-error">[% loc_email_error %]</div> - [% ELSIF sign_in_error %] + [% ELSIF sign_in_error %] <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> - [% END %] - - <div class="form-field"> - <label class="n" for="email">[% loc('Your email address:') %]</label> - <input type="email" class="required email" size="30" id="email" name="email" value="[% email | html %]"> - </div> - -<div id="form_sign_in"> - <h3>[% loc("Do you have a FixMyStreet password?") %]</h3> - - <div id="form_sign_in_yes"> - - <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> - <input type="password" name="password_sign_in" id="password_sign_in" value=""> - </p> - - <p> - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="n" for="remember_me"> - [% loc('Keep me signed in on this computer') %] - </label> - </p> - - <p> - <input type="submit" name="sign_in" value="[% loc('Sign in') %]"> - </p> - - </div> - <div id="form_sign_in_no"> - - <p>[% loc('<strong>No</strong>, I do not, let me sign in by email:') %]</p> - - <div class="fieldset"> - <div class="form-field"> - <label for="name">[% loc('Your name:') %]</label> - <input type="text" name="name" value=""> - </div> + [% END %] + <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]" autofocus> + + <div id="form_sign_in"> + <h3>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h3> + + <div id="form_sign_in_yes" class="form-box"> + <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> + + <label class="hidden-js n" for="password_sign_in">[% loc('Password:') %]</label> + + <div class="form-txt-submit-box"> + <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> + <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]"> + </div> + + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> - <div class="form-field"> - <label for="password_register">[% loc('Enter a new password:') %]</label> - <input type="password" name="password_register" id="password_register" value=""> </div> - </div> + <div id="form_sign_in_no" class="form-box"> + <h5>[% loc('<strong>No</strong> let me sign in by email') %]</h5> - <p><small>Providing a name and password is optional, but doing so - will allow you to more easily report problems, leave updates and - manage your reports.</small></p> + <label for="name">[% loc('Name') %]</label> + <input type="text" name="name" value="" placeholder="[% loc('Your name') %]"> - <p> - <input type="submit" name="email_sign_in" value="[% loc('Sign in by email') %]"> - </p> + <label for="password_register">[% loc('Password (optional)') %]</label> - </div> + <div class="general-notes"> + <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> + </div> + + <div class="form-txt-submit-box"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="green-btn" type="submit" name="email_sign_in" value="[% loc('Sign in') %]"> + </div> + </div> + + </div> -</div> - + </fieldset> </form> diff --git a/templates/web/base/auth/token.html b/templates/web/base/auth/token.html index 361d4fbd5..a4dedcec3 100644 --- a/templates/web/base/auth/token.html +++ b/templates/web/base/auth/token.html @@ -1,25 +1,27 @@ -[% INCLUDE 'header.html', title => loc('Confirm account') %] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirm account') %] [% IF token_not_found %] +[%# Shown whenever there's an invalid token, eg while confirming a report or logging in without a password %] -<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('Sorry, that wasn’t a valid link') %]</h1> + <p>[% loc('The link might have expired, or maybe you didn’t quite copy and paste it 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("Nearly done! Now check your email…") %]</h1> + <p>[% loc("Click the link in our confirmation email to sign in.") %]</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 %] + <p> + [% loc("Can’t find our email? Check your spam folder – that’s the solution 99% of the time.") %] + </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 %] |