X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/0d0253c93a64d2b5206e902c648e1e2c6bc5d510..9436c5c22d757657e9e5d204a61774927cb020e0:/templates/login.tmpl diff --git a/templates/login.tmpl b/templates/login.tmpl index 7c45438..c3ef332 100644 --- a/templates/login.tmpl +++ b/templates/login.tmpl @@ -24,40 +24,38 @@ USA @stdmenu{login} -

@label:login.title@

- - @if{@ne{@label:error@}{error}@}{ - @#{error reporting from some earlier operation}@ -
-

@label{error.@label:error@}@

-
- }@ - - @if{@ne{@label:status@}{status}@}{ - @#{some action succeeded}@ -
-

@label{login.@label:status@}@

-
- }@ - - @if{@eq{@user@}{guest}@}{ - @#{guest user, allow login and registration}@ +

@label{login.title}

+ +@if{@ne{@error}{}} + {@# Error reporting from some earlier operation +
+

@label{error.@error}

+
} + +@if{@ne{@status}{}} + {@# Some action succeeded +
+

@label{login.@status}

+
} + +@if{@eq{@user}{guest}} + {@# Guest user, allow login and registration

Existing users

If you have a username, use this form to log in.

-
- + - +
@label:login.username@@label{login.username} + value="@argq{username}">
@label:login.password@@label{login.password} @@ -65,14 +63,12 @@ USA
- + @submit{@label{login.login}}
- +

If you've forgotten your password, use this form to request an @@ -80,21 +76,19 @@ USA your email address, and if a reminder has been sent too recently then it won't be possible to send one.

-
- +
@label:login.username@@label{login.username} + value="@argq{username}">
- + @submit{@label{login.reminder}}
@@ -109,107 +103,100 @@ USA which you must visit to activate your login before you can use it.

- - + - + - + - + - + - + - + - +
@label:login.username@@label{login.username} @label:login.registerusernameextra@@label{login.registerusernameextra}
@label:login.email@@label{login.email} @label:login.registeremailextra@@label{login.registeremailextra}
@label:login.password1@@label{login.password1} @label:login.registerpassword1extra@@label{login.registerpassword1extra}
@label:login.password2@@label{login.password2} @label:login.registerpassword2extra@@label{login.registerpassword2extra}
- + @submit{@label{login.register}}
-

}@ - }{ - @#{not the guest user, allow change of details and logout}@ + } + }{@# not the guest user, allow change of details and logout -

Logged in as @user@

+

Logged in as @user

-
- + @submit{@label{login.logout}}

Use this form to change your email address and/or password.

-
- + - + - + - + - + - +
@label:login.email@@label{login.email} + value="@userinfo{email}"> @label:login.edituseremailextra@@label{login.edituseremailextra}
@label:login.newpassword@@label{login.newpassword} @label:login.edituserpassword1extra@@label{login.edituserpassword1extra}
@label:login.newpassword@@label{login.newpassword} @label:login.edituserpassword2extra@@label{login.edituserpassword2extra}
- + @submit{@label{login.edituser}}
- }@ + } @credits