diff options
Diffstat (limited to 'templates/web/default/auth/general.html')
| -rw-r--r-- | templates/web/default/auth/general.html | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index f68843f41..44f203193 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -19,27 +19,31 @@ <div> - <span class="error">[% loc_email_error %]</span><br> - <label for="email">[% loc('Your email:') %]</label> - <input type="text" name="email" value="[% email || '' | html %]"> - </div> + [% IF loc_email_error %] + <span class="error">[% loc_email_error %]</span><br> + [% ELSIF login_error %] + <span class="error">Email or password wrong - please try again.</span><br> + [% END %] - <div> - <h3>I already have an account</h3> - <label for="password">[% loc('Your password:') %]</label> + <label for="email">[% loc('Email:') %]</label> + <input type="text" name="email" value="[% email || '' | html %]"> + <br> + + <label for="password">[% loc('Password:') %]</label> <input type="password" name="password" value=""> + <br> + <!-- FIXME - implement session length choosing + <label for="remember_me"> </label> + <input type="checkbox" name="remember_me"> + Remember me - do not use on a public computer + <br> --> + <label for="login"> </label> <input type="submit" name="login" value="[% loc('Log me in') %]"> - </div> - <div> - <h3>I don't have an account...</h3> - <input type="submit" name="create_account" value="[% loc('...create a new account now') %]"> - </div> - - <div> - <h3>I've forgotten my password...</h3> - <input type="submit" name="email_reset" value="[% loc('...email me a reset link') %]"> + <h3>I don't have an account, or I've forgotten my password...</h3> + <label for="email_login"> </label> + <input type="submit" name="email_login" value="[% loc('Email the details I need to the address I entered above') %]"> </div> </form> |