More tests for mime.c

[disorder] / templates / login.html

diff --git a/templates/login.html b/templates/login.html
index ab943f9888d607462ae3b9e03b61098575bdee6e..11474e286e9d9bdc69aad5003992b6403cce856c 100644 (file)
--- a/templates/login.html
+++ b/templates/login.html
@@ -29,12 +29,16 @@ USA
 
    @if{@ne{@label:error@}{error}@}{
    @#{error reporting from some earlier operation}@
-   <p class=error>@label{error.@label:error@}@</p>
+   <div class=error>
+     <p class=error>@label{error.@label:error@}@</p>
+   </div>
    }@
 
    @if{@ne{@label:status@}{status}@}{
    @#{some action succeeded}@
-   <p class=loginstatus>@label{login.@label:status@}@</p>
+   <div class=loginstatus>
+     <p class=loginstatus>@label{login.@label:status@}@</p>
+   </div>
    }@
 
    @if{@eq{@user@}{guest}@}{
@@ -61,17 +65,45 @@ USA
          </td>
        </tr>
        <tr>
-         <td>
-           <button class=login name=action type=submit value=login>
+         <td colspan=2>
+           <button class=login name=button type=submit>
              @label:login.login@
            </button>
          </td>
        </tr>
      </table>
+     <input name=action type=hidden value=login>
      <input name=nonce type=hidden value="@nonce@">
      <input name=back type=hidden value="@arg:back@">
    </form>
 
+   <p>If you've forgotten your password, use this form to request an
+   email reminder.  A reminder can only be sent if you registered with
+   your email address, and if a reminder has been sent too recently
+   then it won't be possible to send one.</p>
+
+   <form class=reminder action="@url@" method=POST
+         enctype="multipart/form-data" accept-charset=utf-8>
+     <table class=login>
+       <tr>
+         <td>@label:login.username@</td>
+         <td>
+           <input class=username name=username type=text size=32
+                 value="@arg:username@">
+         </td>
+       </tr>
+       <tr>
+         <td colspan=2>
+           <button class=login name=button type=submit>
+             @label:login.reminder@
+           </button>
+         </td>
+       </tr>
+     </table>
+     <input name=action type=hidden value=reminder>
+     <input name=nonce type=hidden value="@nonce@">
+   </form>
+
    @right{register}{
    <h2>New Users</h2>
 
@@ -116,13 +148,14 @@ USA
          <td class=extra>@label:login.registerpassword2extra@</td>
        </tr>
        <tr>
-         <td>
-           <button class=register name=action type=submit value=register>
+         <td colspan=3>
+           <button class=register name=button>
              @label:login.register@
            </button>
          </td>
        </tr>
      </table>
+     <input name=action type=hidden value=register>
      <input name=nonce type=hidden value="@nonce@">
    </form>}@
    }{
@@ -133,10 +166,11 @@ USA
    <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>
+       <button class=logout name=submit type=submit>
          @label:login.logout@
        </button>
      </div>
+     <input name=action type=hidden value=logout>
      <input name=nonce type=hidden value="@nonce@">
    </form>
 
@@ -170,13 +204,14 @@ USA
          <td class=extra>@label:login.edituserpassword2extra@</td>
        </tr>
        <tr>
-         <td>
-           <button class=edituser name=action type=submit value=edituser>
+         <td colspan=3>
+           <button class=edituser name=submit type=submit>
              @label:login.edituser@
            </button>
          </td>
        </tr>
      </table>
+     <input name=action type=hidden value=edituser>
      <input name=nonce type=hidden value="@nonce@">
    </form>