diff options
Diffstat (limited to 'templates/web/default/auth')
| -rw-r--r-- | templates/web/default/auth/change_password.html | 2 | ||||
| -rw-r--r-- | templates/web/default/auth/general.html | 76 | ||||
| -rw-r--r-- | templates/web/default/auth/sign_out.html (renamed from templates/web/default/auth/logout.html) | 0 |
3 files changed, 51 insertions, 27 deletions
diff --git a/templates/web/default/auth/change_password.html b/templates/web/default/auth/change_password.html index 2dd37cb91..be7c14e43 100644 --- a/templates/web/default/auth/change_password.html +++ b/templates/web/default/auth/change_password.html @@ -3,7 +3,7 @@ <h1>[% loc('Change Password') %]</h1> [% IF password_changed %] - <p>Your password has been changed!</p> + <p id="fixed">[% loc('Your password has been changed') %]</p> [% END %] diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 5a5e63480..d30fefcee 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -1,6 +1,6 @@ [% INCLUDE 'header.html', title = loc('Sign in or create an account') %] -<h1>[% loc('Sign in or create an account') %]</h1> +<h1>[% loc('Sign in') %]</h1> <form action="[% c.uri_for() %]" method="post" name="general_auth"> <input type="hidden" name="r" value="[% c.req.params.r | html %]"> @@ -17,42 +17,66 @@ loc_email_error = errors.$email_error || errors.other; END %] - - <div id="fieldset"> + [% IF loc_email_error %] + <div class="form-error">[% loc_email_error %]</div> + [% ELSIF sign_in_error %] + <div class="form-error">[% loc('Email or password wrong - please try again.') %]</div> + [% END %] - [% IF loc_email_error %] - <div class="form-error">[% loc_email_error %]</div> - [% ELSIF login_error %] - <div class="form-error">Email or password wrong - please try again.</div> - [% END %] + <div class="form-field"> + <label class="n" for="email">[% loc('Your email address:') %]</label> + <input type="email" size="30" id="email" name="email" value="[% email | html %]"> + </div> - <div class="form-field"> - <label for="email">[% loc('Email:') %]</label> - <input type="text" name="email" value="[% email || '' | html %]"> - </div> +<div id="form_sign_in"> + <h3>[% loc("Do you have a FixMyStreet password?") %]</h3> - <div class="form-field"> - <label for="password">[% loc('Password:') %]</label> - <input type="password" name="password" value=""> - </div> + <div id="form_sign_in_yes"> - <div class="checkbox"> + <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" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label for="remember_me"> - [% loc('Remember me - do not use on a public computer') %] + <label class="n" for="remember_me"> + [% loc('Keep me signed in on this computer') %] </label> - </div> + </p> - <div class="checkbox"> - <input type="submit" name="login" value="[% loc('Sign me in') %]"> - </div> + <p> + <input type="submit" name="sign_in" value="[% loc('Sign in') %]"> + </p> - <h3>I don't have an account, or I've forgotten my password...</h3> - <div class="checkbox"> - <input type="submit" name="email_login" value="[% loc('Email the details I need to the address I entered above') %]"> + </div> + <div id="form_sign_in_no"> + + <p>[% loc('<strong>No</strong>, I do not, let me sign in by email:') %]</p> + + <div id="fieldset"> + <div class="form-field"> + <label for="name">[% loc('Your name:') %]</label> + <input type="text" name="name" value=""> + </div> + + <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> + <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> + + <p> + <input type="submit" name="email_sign_in" value="[% loc('Sign in by email') %]"> + </p> + </div> + +</div> </form> diff --git a/templates/web/default/auth/logout.html b/templates/web/default/auth/sign_out.html index 3d8df60e4..3d8df60e4 100644 --- a/templates/web/default/auth/logout.html +++ b/templates/web/default/auth/sign_out.html |