diff options
Diffstat (limited to 'templates/web/default/auth/general.html')
| -rw-r--r-- | templates/web/default/auth/general.html | 60 |
1 files changed, 42 insertions, 18 deletions
diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 5a5e63480..b5e6bf6e0 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,41 +17,65 @@ 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 login_error %] - <div class="form-error">Email or password wrong - please try again.</div> + <div class="form-error">[% loc('Email or password wrong - please try again.') %]</div> [% END %] - <div class="form-field"> - <label for="email">[% loc('Email:') %]</label> - <input type="text" name="email" value="[% email || '' | html %]"> - </div> <div class="form-field"> - <label for="password">[% loc('Password:') %]</label> - <input type="password" name="password" value=""> + <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="checkbox"> + <h3 style="margin-bottom:0">[% loc("Do you have a FixMyStreet password?") %]</h3> + +<div style="float: left; width: 48%; border-right: solid 1px #999999;"> + + <p> + <label class="n" for="password_login">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <input type="password" name="password_login" id="password_login" 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') %]"> + <p> + <input type="submit" name="login" value="[% loc('Sign in') %]"> + </p> + +</div> +<div style="float: right; width: 48%; clear:none;"> + + <p>[% loc('<strong>No</strong>, I do not, let me sign in by email:') %]</p> + + <div class="form-field"> + <label for="name">[% loc('Your name:') %]</label> + <input type="text" name="name" value=""> </div> - <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 class="form-field"> + <label for="password_register">[% loc('Enter a new password:') %]</label> + <input type="password" name="password_register" id="password_register" value=""> </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_login" value="[% loc('Sign in by email') %]"> + </p> + +</div> + </div> </form> |