'confirm' now logs the user in (and sends back their username so the

[disorder] / templates / login.html

diff --git a/templates/login.html b/templates/login.html
index 6c1d0b9..ee245a3 100644 (file)
--- a/templates/login.html
+++ b/templates/login.html
@@ -29,13 +29,12 @@ 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:registered@}{registered}@}{
-   @#{registration succeeded}@
-   <p>@label:login.registered@</p>
+   @if{@ne{@label:status@}{status}@}{
+   @#{some action succeeded}@
+   <p class=loginstatus>@label{login.@label:status@}@</p>
    }@
 
    @if{@eq{@user@}{guest}@}{
@@ -68,9 +67,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
@@ -99,13 +96,13 @@ USA
                     size=32></td>
          <td>
            <button class=register name=action type=submit value=register>
-             @label:login.login@
+             @label:login.register@
            </button>
          </td>
        </tr>
      </table>
      <input name=nonce type=hidden value="@nonce@">
-   </form>
+   </form>}@
    }{
    @#{not the guest user, allow change of details and logout}@
 
@@ -115,7 +112,7 @@ USA
 
    <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>
@@ -140,7 +137,7 @@ USA
 
    <p>Use this button to log out @user@.</p>
 
-   <form class=register action="@url@" method=POST
+   <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>