Tidy up login reporting.

[disorder] / templates / login.html
diff --git a/templates/login.html b/templates/login.html

index 9119a5f8a316c327a6dc0c0b75b4b2b090c4871d..65f1939242b07365389125fd9285bbc8ddf96524 100644 (file)
--- a/templates/login.html
+++ b/templates/login.html
@@ -24,7 +24,7 @@ USA
    <title>@label:login.title@</title>
   </head>
   <body>
-@include{@label{menu}@}@
+@include{topbar}@
     <h1 class=title>@label:login.title@</h1>
  
     @if{@ne{@label:error@}{error}@}{
@@ -33,11 +33,13 @@ USA
     <p>@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>
     }@
  
+  <p>User: @user@</p>
+
     @if{@eq{@user@}{guest}@}{
     @#{guest user, allow login and registration}@
     <h2>Existing users</h2>
@@ -95,11 +97,11 @@ USA
         </tr>
         <tr>
           <td>@label:login.password@</td>
-         <td><input class=password name=changepassword type=password value=""
+         <td><input class=password name=password type=password value=""
                      size=32></td>
           <td>
             <button class=register name=action type=submit value=register>
-             @label:login.login@
+             @label:login.register@
             </button>
           </td>
         </tr>
@@ -152,7 +154,7 @@ USA
  
     }@
  
-@include{@label{menu}@end}@
+@include{topbarend}@
   </body>
  </html>
  @@