diff options
Diffstat (limited to 'templates/web/default')
| -rw-r--r-- | templates/web/default/auth/change_password.html | 26 | ||||
| -rw-r--r-- | templates/web/default/auth/general.html | 39 | ||||
| -rw-r--r-- | templates/web/default/auth/logout.html | 8 | ||||
| -rw-r--r-- | templates/web/default/auth/token.html | 6 | ||||
| -rw-r--r-- | templates/web/default/email_sent.html | 4 |
5 files changed, 45 insertions, 38 deletions
diff --git a/templates/web/default/auth/change_password.html b/templates/web/default/auth/change_password.html index d4a7f107b..2dd37cb91 100644 --- a/templates/web/default/auth/change_password.html +++ b/templates/web/default/auth/change_password.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title => loc('Change Password') %] +[% INCLUDE 'header.html', title = loc('Change Password') %] <h1>[% loc('Change Password') %]</h1> @@ -9,6 +9,8 @@ <form action="[% c.uri_for('change_password') %]" method="post" name="change_password"> + <div id="fieldset"> + [% IF password_error; errors = { @@ -17,23 +19,23 @@ 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> + loc_password_error = errors.$password_error || errors.other; %] + <div class="form-error">[% loc_password_error %]</div> + [% END %] + + <div class="form-field"> <label for="new_password">[% loc('Password:') %]</label> <input type="password" name="new_password" value="[% new_password | html %]"> - <br> - + </div> + <div class="form-field"> <label for="confirm">[% loc('Again:') %]</label> <input type="password" name="confirm" value="[% confirm | html %]"> - <br> - - <label for="login"> </label> + </div> + <div class="checkbox"> <input type="submit" value="[% loc('Change Password') %]"> </div> + + </div> </form> diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 32ea03177..5a5e63480 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -1,9 +1,9 @@ -[% INCLUDE 'header.html', title => loc('Login or create an account') %] - -<h1>[% loc('Login or create an account') %]</h1> +[% INCLUDE 'header.html', title = loc('Sign in or create an account') %] +<h1>[% loc('Sign in or create an account') %]</h1> <form action="[% c.uri_for() %]" method="post" name="general_auth"> +<input type="hidden" name="r" value="[% c.req.params.r | html %]"> [% IF email_error; @@ -18,33 +18,40 @@ END %] - <div> + <div id="fieldset"> [% IF loc_email_error %] - <span class="error">[% loc_email_error %]</span><br> + <div class="form-error">[% loc_email_error %]</div> [% ELSIF login_error %] - <span class="error">Email or password wrong - please try again.</span><br> + <div class="form-error">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 %]"> - <br> + </div> + <div class="form-field"> <label for="password">[% loc('Password:') %]</label> <input type="password" name="password" value=""> - <br> - - <label for="remember_me"> </label> - <input type="checkbox" name="remember_me" value='1' [% 'checked="checked"' IF remember_me %]> - Remember me - do not use on a public computer - <br> + </div> + + <div class="checkbox"> + <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> + </div> - <label for="login"> </label> - <input type="submit" name="login" value="[% loc('Log me in') %]"> + <div class="checkbox"> + <input type="submit" name="login" value="[% loc('Sign me in') %]"> + </div> <h3>I don't have an account, or I've forgotten my password...</h3> - <label for="email_login"> </label> + <div class="checkbox"> <input type="submit" name="email_login" value="[% loc('Email the details I need to the address I entered above') %]"> + </div> + </div> </form> diff --git a/templates/web/default/auth/logout.html b/templates/web/default/auth/logout.html index 9f3390f0a..3d8df60e4 100644 --- a/templates/web/default/auth/logout.html +++ b/templates/web/default/auth/logout.html @@ -1,8 +1,8 @@ -[% INCLUDE 'header.html', title => loc('Logout') %] +[% INCLUDE 'header.html', title => loc('Sign out') %] -<h1>[% loc('You have been logged out') %]</h1> +<h1>[% loc('You have been signed out') %]</h1> -<p>Please feel free to <a href="[% c.uri_for('/auth/') %]">login again</a>.</p> +<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>.</p> -[% INCLUDE 'footer.html' %]
\ No newline at end of file +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/auth/token.html b/templates/web/default/auth/token.html index b3a3d5cc8..0f44d1074 100644 --- a/templates/web/default/auth/token.html +++ b/templates/web/default/auth/token.html @@ -16,9 +16,11 @@ <h1>[% loc('Please check your email') %]</h1> -<p>We have sent you an email containing a link to confirm your account.</p> +<p>[% loc("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> +<p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</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> [% END %] diff --git a/templates/web/default/email_sent.html b/templates/web/default/email_sent.html index 47a6f82cf..fd947022a 100644 --- a/templates/web/default/email_sent.html +++ b/templates/web/default/email_sent.html @@ -14,10 +14,6 @@ action => loc('your alert will not be activated'), worry => loc("we'll hang on to your alert while you're checking your email."), }, - tms => { - action => 'your expression of interest will not be registered', - worry => "we'll hang on to your expression of interest while you're checking your email.", - } } %] |