diff options
Diffstat (limited to 'templates/web/default/auth')
| -rw-r--r-- | templates/web/default/auth/change_password.html | 41 | ||||
| -rw-r--r-- | templates/web/default/auth/general.html | 36 | ||||
| -rw-r--r-- | templates/web/default/auth/token.html (renamed from templates/web/default/auth/confirm.html) | 16 | ||||
| -rw-r--r-- | templates/web/default/auth/welcome.html | 11 |
4 files changed, 70 insertions, 34 deletions
diff --git a/templates/web/default/auth/change_password.html b/templates/web/default/auth/change_password.html new file mode 100644 index 000000000..d4a7f107b --- /dev/null +++ b/templates/web/default/auth/change_password.html @@ -0,0 +1,41 @@ +[% INCLUDE 'header.html', title => loc('Change Password') %] + +<h1>[% loc('Change Password') %]</h1> + +[% IF password_changed %] + <p>Your password has been changed!</p> +[% END %] + + +<form action="[% c.uri_for('change_password') %]" method="post" name="change_password"> + + [% IF password_error; + + errors = { + missing => loc('Please enter a password'), + mismatch => loc('The passwords do not match'), + other => loc('Please check the passwords and try again'), + }; + + loc_password_error = errors.$password_error || errors.other; + END %] + + + <div> + <span class="error">[% loc_password_error %]</span><br> + <label for="new_password">[% loc('Password:') %]</label> + <input type="password" name="new_password" value="[% new_password | html %]"> + <br> + + <label for="confirm">[% loc('Again:') %]</label> + <input type="password" name="confirm" value="[% confirm | html %]"> + <br> + + <label for="login"> </label> + <input type="submit" value="[% loc('Change Password') %]"> + </div> + +</form> + + +[% INCLUDE 'footer.html' %] 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> diff --git a/templates/web/default/auth/confirm.html b/templates/web/default/auth/token.html index fc3abeeba..ecbf94b83 100644 --- a/templates/web/default/auth/confirm.html +++ b/templates/web/default/auth/token.html @@ -1,12 +1,6 @@ [% INCLUDE 'header.html', title => loc('Confirm account') %] -[% IF user_now_confirmed %] - -<h1>[% loc('Account now confirmed') %]</h1> - -<p>Your account has been confirmed - thank you!</p> - -[% ELSE %] +[% IF token_not_found %] <h1>[% loc('Error') %]</h1> @@ -18,6 +12,14 @@ <li>FIXME - reasons here</li> </ul> +[% ELSE %] + +<h1>[% loc('Please check you email') %]</h1> + +<p>We have sent you an email containing a link to confirm your account.</p> + +<p>If you do not receive the email in the next few minutes please check your spam folder.</p> + [% END %] [% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/default/auth/welcome.html b/templates/web/default/auth/welcome.html deleted file mode 100644 index 5727f82ad..000000000 --- a/templates/web/default/auth/welcome.html +++ /dev/null @@ -1,11 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Welcome') %] - -<h1>[% loc('Welcome') %]</h1> - -<p>Your new account on FIXME has been created!</p> - -FIXME - add blurb about being sent an email with a confirmation link to confirm -account. - - -[% INCLUDE 'footer.html' %]
\ No newline at end of file |