X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/ac152d06f4cfa9abcd4a88de7dbc6a9040f99c0d..968f044ac93cee0b8ead3f36b76543324de0106f:/templates/login.html

diff --git a/templates/login.html b/templates/login.html
index 65f1939..ab943f9 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -29,8 +29,7 @@ USA
 
    @if{@ne{@label:error@}{error}@}{
    @#{error reporting from some earlier operation}@
-   <!-- TODO make error string visually intrusive, also error.html -->
-   <p>@label{error.@label:error@}@</p>
+   <p class=error>@label{error.@label:error@}@</p>
    }@
 
    @if{@ne{@label:status@}{status}@}{
@@ -38,8 +37,6 @@ USA
    <p class=loginstatus>@label{login.@label:status@}@</p>
    }@
 
-  <p>User: @user@</p>
-
    @if{@eq{@user@}{guest}@}{
    @#{guest user, allow login and registration}@
    <h2>Existing users</h2>
@@ -52,13 +49,18 @@ USA
        <tr>
          <td>@label:login.username@</td>
          <td>
-           <input class=username name=username type=text value="@arg:username@" size=32>
+           <input class=username name=username type=text size=32
+	          value="@arg:username@">
          </td>
        </tr>
        <tr>
          <td>@label:login.password@</td>
-         <td><input class=password name=password type=password value=""
-                    size=32></td>
+         <td>
+           <input class=password name=password type=password value=""
+                  size=32>
+         </td>
+       </tr>
+       <tr>
          <td>
            <button class=login name=action type=submit value=login>
              @label:login.login@
@@ -70,9 +72,7 @@ USA
      <input name=back type=hidden value="@arg:back@">
    </form>
 
-   <!-- TODO disable registration button if guest doesn't have
-   register right -->
-
+   @right{register}{
    <h2>New Users</h2>
 
    <p>If you do not have a login enter a username, a password and your
@@ -86,19 +86,36 @@ USA
        <tr>
          <td>@label:login.username@</td>
          <td>
-           <input class=username name=username type=text value="" size=32>
+           <input class=username name=username type=text size=32
+	          value="">
          </td>
+         <td class=extra>@label:login.registerusernameextra@</td>
        </tr>
        <tr>
          <td>@label:login.email@</td>
          <td>
-           <input class=email name=email type=text value="" size=32>
+           <input class=email name=email type=text size=32
+                  value="">
          </td>
+         <td class=extra>@label:login.registeremailextra@</td>
+       </tr>
+       <tr>
+         <td>@label:login.password1@</td>
+         <td>
+           <input class=password name=password1 type=password size=32
+	          value="">
+         </td>
+         <td class=extra>@label:login.registerpassword1extra@</td>
+       </tr>
+       <tr>
+         <td>@label:login.password2@</td>
+         <td>
+           <input class=password name=password2 type=password size=32
+	          value="">
+         </td>
+         <td class=extra>@label:login.registerpassword2extra@</td>
        </tr>
        <tr>
-         <td>@label:login.password@</td>
-         <td><input class=password name=password type=password value=""
-                    size=32></td>
          <td>
            <button class=register name=action type=submit value=register>
              @label:login.register@
@@ -107,29 +124,52 @@ USA
        </tr>
      </table>
      <input name=nonce type=hidden value="@nonce@">
-   </form>
+   </form>}@
    }{
    @#{not the guest user, allow change of details and logout}@
 
    <h2>Logged in as @user@</h2>
 
-   <p>TODO none of this stuff works yet</p>
+   <form class=logout action="@url@" method=POST
+         enctype="multipart/form-data" accept-charset=utf-8>
+     <div class=logout>
+       <button class=logout name=action type=submit value=logout>
+         @label:login.logout@
+       </button>
+     </div>
+     <input name=nonce type=hidden value="@nonce@">
+   </form>
 
    <p>Use this form to change your email address and/or password.</p>
 
-   <form class=register action="@url@" method=POST
+   <form class=edituser action="@url@" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=edituser>
        <tr>
          <td>@label:login.email@</td>
          <td>
-           <input class=email name=email type=text value="TODO" size=32>
+           <input class=email name=email type=text size=32
+	          value="@userinfo:email@">
          </td>
+         <td class=extra>@label:login.edituseremailextra@</td>
+       </tr>
+       <tr>
+         <td>@label:login.newpassword@</td>
+         <td>
+           <input class=password name=changepassword1 type=password size=32
+	          value="">
+         </td>
+         <td class=extra>@label:login.edituserpassword1extra@</td>
+       </tr>
+       <tr>
+         <td>@label:login.newpassword@</td>
+         <td>
+           <input class=password name=changepassword2 type=password size=32
+	          value="">
+         </td>
+         <td class=extra>@label:login.edituserpassword2extra@</td>
        </tr>
        <tr>
-         <td>@label:login.password@</td>
-         <td><input class=password name=password type=password value=""
-                    size=32></td>
          <td>
            <button class=edituser name=action type=submit value=edituser>
              @label:login.edituser@
@@ -140,18 +180,6 @@ USA
      <input name=nonce type=hidden value="@nonce@">
    </form>
 
-   <p>Use this button to log out @user@.</p>
-
-   <form class=register action="@url@" method=POST
-         enctype="multipart/form-data" accept-charset=utf-8>
-     <div class=logout>
-       <button class=logout name=action type=submit value=logout>
-         @label:login.logout@
-       </button>
-     </div>
-     <input name=nonce type=hidden value="@nonce@">
-   </form>
-
    }@
 
 @include{topbarend}@