W3C Validator (HTML 5 + XHTML 1.1 + CSS level 3)

12 files changed, 255 insertions, 306 deletions

diff --git a/css/style.css b/css/style.css
index 6b72709..277ff52 100644
--- a/css/style.css
+++ b/css/style.css
@@ -8,9 +8,6 @@ body {
 .error {
   color: #FF0040;
 }
-tt {
-  font-family: Inconsolata, "Lucida Console", "Droid Sans Mono", Cousine, monospace;
-}
 .inactive {
   color: #FF0040;
 }
@@ -21,7 +18,9 @@ h1, h2, h3 {
   margin: 15pt auto 10pt auto;
   width: 600pt;
 }
-
+span.domain, span.email, span.alias, span.mailbox, span.list {
+  font-family: Inconsolata, "Lucida Console", "Droid Sans Mono", Cousine, monospace;
+}
 
 
 /* Login form */
@@ -73,7 +72,7 @@ td.label {
 
 
 /* Listing modes */
-#status {
+#domainstatus {
   margin: 10pt auto;
   width: 600pt;
 }
@@ -102,17 +101,18 @@ table.list tr.odd td {
   background:#f7fbff
 }
 table.list th {
-  font-weight:normal;
+  font-weight: normal;
   color: #678197;
   text-align:left;
   border-bottom: 1px solid #e5eff8;
-  border-left:1px solid #e5eff8;
-  padding:.3em 1em;
+  border-left: 1px solid #e5eff8;
+  padding: .3em 1em;
 }
 table.list thead th {
-  background:#f4f9fe;
-  text-align:center;
-  font-weight:bold;
+  font-size: 12pt;
+  font-weight: 600;
+  background: #f4f9fe;
+  text-align: center;
   color:#66a3d3
 }
 .none {
diff --git a/lib/FPanel/Login.pm b/lib/FPanel/Login.pm
index 3a44768..ab7bf36 100644
--- a/lib/FPanel/Login.pm
+++ b/lib/FPanel/Login.pm
@@ -203,7 +203,7 @@ sub error_rm : ErrorRunmode {
             $mesg = 'Forbidden'
         }
         elsif ($error eq '404' ) {
-            $mesg = 'Not found'
+            $mesg = 'Not Found'
         }
         $template->param( code => $error );
         $template->param( message => encode_entities ($mesg, "‘‘") );
diff --git a/lib/Fripost/Schema/List.pm b/lib/Fripost/Schema/List.pm
index f3ce4b8..ad0902d 100644
--- a/lib/Fripost/Schema/List.pm
+++ b/lib/Fripost/Schema/List.pm
@@ -163,8 +163,6 @@ sub _is_valid {
     must_attrs( $l, qw/list isactive/ );
     email_valid( $l->{list}, -exact => 1 );
 
-    say STDERR $l->{transport};
-
     die "Invalid transport: ‘".$l->{transport}."‘\n"
         if defined $l->{transport} and
             $l->{transport} !~ /^(schleuder|mailman)$/;
diff --git a/template/add-alias.html b/template/add-alias.html
index 385060e..7ceb4cf 100644
--- a/template/add-alias.html
+++ b/template/add-alias.html
@@ -20,59 +20,52 @@
     </div>
     <hr/>
 
-    <h1>Add alias under <tt><TMPL_VAR NAME=domain></tt></h1>
+    <div id="content">
+    <h1>Add alias under <span class="domain"><TMPL_VAR NAME=domain></span></h1>
 
     <TMPL_IF NAME=error>
       <div class="fail">Error: <TMPL_VAR NAME=error></div>
     <TMPL_ELSE>
-      </br>
+      <br/>
     </TMPL_IF>
 
     <br/>
 
-    <form class="editform" name="editform" method="post">
+    <form class="editform" name="editform" method="post" action="?">
       <div class="editform">
-        <input type="hidden" name="a" value="add" />
-        <input type="hidden" name="t" value="alias" />
+      <input type="hidden" name="a" value="add" />
+      <input type="hidden" name="t" value="alias" />
 
-      <p>
-        <h4 class="label">Alias name</h4>
-        <input type="text" name="alias" size="15" value="<TMPL_VAR NAME=alias>"/>@<TMPL_VAR NAME=domain>
-      </p>
+      <h4 class="label">Alias name</h4>
+      <input type="text" name="alias" size="15" value="<TMPL_VAR NAME=alias>"/>@<TMPL_VAR NAME=domain>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Status</h4>
-        <select name="isactive">
-          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
-          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
-        </select>
-        <div class="help">
-          <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
-        </div>
-      </p>
+      <h4 class="label">Status</h4>
+      <select name="isactive">
+        <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option>
+        <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option>
+      </select>
+      <div class="help">
+        <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
+      </div>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
-        <div class="help">
-          An optional description. (HTML tags are allowed.)
-        </div>
-      </p>
+      <h4 class="label">Description</h4>
+      <textarea name="description" cols="50" rows="3" ><TMPL_VAR NAME=description></textarea>
+      <div class="help">
+        An optional description. (HTML tags are allowed.)
+      </div>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Destination(s)</h4>
-        <textarea type="text" name="maildrop" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=maildrop></textarea>
-        <div class="help">
-          The list of destinations (one e-mail address per line) that
-          will receive mail for this alias.
-        </div>
-      </p>
+      <h4 class="label">Destination(s)</h4>
+      <textarea name="maildrop" cols="50" rows="10" ><TMPL_VAR NAME=maildrop></textarea>
+      <div class="help">
+        The list of destinations (one e-mail address per line) that
+        will receive mail for this alias.
+      </div>
 
       <hr/>
       <br/>
@@ -81,5 +74,6 @@
       <input type="submit" name="submit" value="Submit" />
       </div>
     </form>
+    </div>
   </body>
 </html>
diff --git a/template/add-list.html b/template/add-list.html
index 30f31ce..00c94ac 100644
--- a/template/add-list.html
+++ b/template/add-list.html
@@ -20,66 +20,59 @@
     </div>
     <hr/>
 
-    <h1>Add list under <tt><TMPL_VAR NAME=domain></tt></h1>
+    <div id="content">
+    <h1>Add list under <span class="domain"><TMPL_VAR NAME=domain></span></h1>
 
     <TMPL_IF NAME=error>
       <div class="fail">Error: <TMPL_VAR NAME=error></div>
     <TMPL_ELSE>
-      </br>
+      <br/>
     </TMPL_IF>
 
     <br/>
 
-    <form class="editform" name="editform" method="post">
+    <form class="editform" name="editform" method="post" action="?">
       <div class="editform">
-        <input type="hidden" name="a" value="add" />
-        <input type="hidden" name="t" value="list" />
+      <input type="hidden" name="a" value="add" />
+      <input type="hidden" name="t" value="list" />
 
-      <p>
-        <h4 class="label">List name</h4>
-        <input type="text" name="list" size="15" value="<TMPL_VAR NAME=list>"/>@<TMPL_VAR NAME=domain>
-      </p>
+      <h4 class="label">List name</h4>
+      <input type="text" name="list" size="15" value="<TMPL_VAR NAME=list>"/>@<TMPL_VAR NAME=domain>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Status</h4>
-        <select name="isactive">
-          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
-          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
-        </select>
-        <div class="help">
-          <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
-        </div>
-      </p>
+      <h4 class="label">Status</h4>
+      <select name="isactive">
+        <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option>
+        <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option>
+      </select>
+      <div class="help">
+        <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
+      </div>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
-        <div class="help">
-          An optional description. (HTML tags are allowed.)
-        </div>
-      </p>
+      <h4 class="label">Description</h4>
+      <textarea name="description" cols="50" rows="3" ><TMPL_VAR NAME=description></textarea>
+      <div class="help">
+        An optional description. (HTML tags are allowed.)
+      </div>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Transport</h4>
-        <select name="transport">
-          <option value="mailman" <TMPL_UNLESS NAME=isenc>selected</TMPL_UNLESS>>GNU Mailman</option>
-          <option value="schleuder" <TMPL_IF NAME=isenc>selected</TMPL_IF>>Schleuder</option>
-        </select>
-        <div class="help">
-          The mailing list manager. (<i>Note</i>: It is not possible to
-          switch once the list has been created.) The two current
-          choices are the well-known
-          <a href="http://list.org/">GNU Mailman</a>, and
-          <a href="http://schleuder2.nadir.org/">Schleuder</a>. The
-          latter offers GPG-enagbled lists (only).
-        </div>
-      </p>
+      <h4 class="label">Transport</h4>
+      <select name="transport">
+        <option value="mailman" <TMPL_UNLESS NAME=isenc>selected="selected"</TMPL_UNLESS>>GNU Mailman</option>
+        <option value="schleuder" <TMPL_IF NAME=isenc>selected="selected"</TMPL_IF>>Schleuder</option>
+      </select>
+      <div class="help">
+        The mailing list manager. (<i>Note</i>: It is not possible to
+        switch once the list has been created.) The two current
+        choices are the well-known
+        <a href="http://list.org/">GNU Mailman</a>, and
+        <a href="http://schleuder2.nadir.org/">Schleuder</a>. The
+        latter offers GPG-enagbled lists (only).
+      </div>
 
       <hr/>
       <br/>
@@ -88,5 +81,6 @@
       <input type="submit" name="submit" value="Submit" />
       </div>
     </form>
+    </div>
   </body>
 </html>
diff --git a/template/add-mailbox.html b/template/add-mailbox.html
index 5966b5f..d82af0e 100644
--- a/template/add-mailbox.html
+++ b/template/add-mailbox.html
@@ -20,76 +20,67 @@
     </div>
     <hr/>
 
-    <h1>Add mailbox under <tt><TMPL_VAR NAME=domain></tt></h1>
+    <div id="content">
+    <h1>Add mailbox under <span class="domain"><TMPL_VAR NAME=domain></span></h1>
 
     <TMPL_IF NAME=error>
       <div class="fail">Error: <TMPL_VAR NAME=error></div>
     <TMPL_ELSE>
-      </br>
+      <br/>
     </TMPL_IF>
 
     <br/>
 
-    <form class="editform" name="editform" method="post">
+    <form class="editform" name="editform" method="post" action="?">
       <div class="editform">
       <input type="hidden" name="a" value="add" />
       <input type="hidden" name="t" value="mailbox" />
 
-      <p>
-        <h4 class="label">User name</h4>
-        <input type="text" name="user" size="15" value="<TMPL_VAR NAME=user>"/>@<TMPL_VAR NAME=domain>
-      </p>
+      <h4 class="label">User name</h4>
+      <input type="text" name="user" size="15" value="<TMPL_VAR NAME=user>"/>@<TMPL_VAR NAME=domain>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Status</h4>
-        <select name="isactive">
-          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
-          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
-        </select>
-        <div class="help">
-          <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
-        </div>
-      </p>
+      <h4 class="label">Status</h4>
+      <select name="isactive">
+        <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option>
+        <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option>
+      </select>
+      <div class="help">
+        <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
+      </div>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Password</h4>
-
-        <table class="loginform">
-          <tr>
-            <td class="label">Password</td>
-            <td><input type="password" name="password" size="20" /></td>
-          </tr>
-          <tr>
-            <td class="label">Repeat password</td>
-            <td><input type="password" name="password2" size="20" /></td>
-          </tr>
-        </table>
-      </p>
+      <h4 class="label">Password</h4>
+
+      <table class="loginform">
+        <tr>
+          <td class="label">Password</td>
+          <td><input type="password" name="password" size="20" /></td>
+        </tr>
+        <tr>
+          <td class="label">Repeat password</td>
+          <td><input type="password" name="password2" size="20" /></td>
+        </tr>
+      </table>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
-        <div class="help">
-          An optional description. (HTML tags are allowed.)
-        </div>
-      </p>
+      <h4 class="label">Description</h4>
+      <textarea name="description" cols="50" rows="3" ><TMPL_VAR NAME=description></textarea>
+      <div class="help">
+        An optional description. (HTML tags are allowed.)
+      </div>
 
       <hr/>
 
-      <p>
-        <h4 class="label">Mail forwarding</h4>
-        <textarea type="text" name="forwards" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=forwards></textarea>
-        <div class="help">
-          An optional list of destinations (one e-mail address per line) that
-          will <i>also</i> receive mail delivered to this mailbox.
-        </div>
-      </p>
+      <h4 class="label">Mail forwarding</h4>
+      <textarea name="forwards" cols="50" rows="10" ><TMPL_VAR NAME=forwards></textarea>
+      <div class="help">
+        An optional list of destinations (one e-mail address per line) that
+        will <i>also</i> receive mail delivered to this mailbox.
+      </div>
 
       <hr/>
       <br/>
@@ -98,5 +89,6 @@
       <input type="submit" name="submit" value="Submit" />
       </div>
     </form>
+    </div>
   </body>
 </html>
diff --git a/template/edit-alias.html b/template/edit-alias.html
index 316c181..ef7c553 100644
--- a/template/edit-alias.html
+++ b/template/edit-alias.html
@@ -21,7 +21,8 @@
     </div>
     <hr/>
 
-    <h1>Edit alias <tt><TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain></tt></h1>
+    <div id="content">
+    <h1>Edit alias <span class="email"><TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain></span></h1>
 
     <TMPL_IF NAME=newChanges>
       <TMPL_IF NAME=error>
@@ -30,51 +31,42 @@
         <div class="success">Your changes have succesfully been submitted.</div>
       </TMPL_IF>
     <TMPL_ELSE>
-      </br>
+      <br/>
     </TMPL_IF>
 
     <br/>
 
-    <form class="editform" name="editform" method="post">
+    <form class="editform" name="editform" method="post" action="?">
       <div class="editform">
       <input type="hidden" name="a" value="edit" />
       <input type="hidden" name="t" value="alias" />
 
-      <p>
-        <a name="status"></a>
-        <h4 class="label">Status</h4>
-        <select name="isactive">
-          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
-          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
-        </select>
-        <div class="help">
-          <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
-        </div>
-      </p>
+      <h4 class="label" id="status">Status</h4>
+      <select name="isactive">
+        <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option>
+        <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option>
+      </select>
+      <div class="help">
+        <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
+      </div>
 
       <hr/>
 
-      <p>
-        <a name="description"></a>
-        <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
-        <div class="help">
-          An optional description. (HTML tags are allowed.)
-        </div>
-      </p>
+      <h4 class="label" id="description">Description</h4>
+      <textarea name="description" cols="50" rows="3" ><TMPL_VAR NAME=description></textarea>
+      <div class="help">
+        An optional description. (HTML tags are allowed.)
+      </div>
 
       <hr/>
 
-      <p>
-        <a name="destination"></a>
-        <h4 class="label">Destination(s)</h4>
-        <textarea type="text" name="maildrop" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=maildrop></textarea>
-        <div class="help">
-          The list of destinations (one e-mail address per line) that
-          will receive mail sent to
-          <tt><TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain><tt>.
-        </div>
-      </p>
+      <h4 class="label" id="destination">Destination(s)</h4>
+      <textarea name="maildrop" cols="50" rows="10" ><TMPL_VAR NAME=maildrop></textarea>
+      <div class="help">
+        The list of destinations (one e-mail address per line) that
+        will receive mail sent to
+        <span class="email"><TMPL_VAR NAME=alias>@<TMPL_VAR NAME=domain></span>.
+      </div>
 
       <hr/>
       <br/>
@@ -83,5 +75,6 @@
       <input type="submit" name="submit" value="Submit" />
       </div>
     </form>
+    </div>
   </body>
 </html>
diff --git a/template/edit-domain.html b/template/edit-domain.html
index fa3d8e3..e6373e8 100644
--- a/template/edit-domain.html
+++ b/template/edit-domain.html
@@ -20,7 +20,8 @@
     </div>
     <hr/>
 
-    <h1>Edit domain <tt><TMPL_VAR NAME=domain></tt></h1>
+    <div id="content">
+    <h1>Edit domain <span class="domain"><TMPL_VAR NAME=domain></span></h1>
 
     <TMPL_IF NAME=newChanges>
       <TMPL_IF NAME=error>
@@ -29,54 +30,45 @@
         <div class="success">Your changes have succesfully been submitted.</div>
       </TMPL_IF>
     <TMPL_ELSE>
-      </br>
+      <br/>
     </TMPL_IF>
 
     <br/>
 
-    <form class="editform" name="editform" method="post">
+    <form class="editform" name="editform" method="post" action="?">
       <div class="editform">
       <input type="hidden" name="a" value="edit" />
 
-      <p>
-        <a name="status"></a>
-        <h4 class="label">Status</h4>
-        <select name="isactive">
-          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
-          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
-        </select>
-        <div class="help">
-          <b>Warning</b>: emails are <i>not</i> delivered to mailboxes,
-          aliases or lists of inactive domains.
-        </div>
-      </p>
+      <h4 class="label" id="status">Status</h4>
+      <select name="isactive">
+        <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option>
+        <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option>
+      </select>
+      <div class="help">
+        <b>Warning</b>: emails are <i>not</i> delivered to mailboxes,
+        aliases or lists of inactive domains.
+      </div>
 
       <hr/>
 
-      <p>
-        <a name="description"></a>
-        <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
-        <div class="help">
-          An optional description. (HTML tags are allowed.)
-        </div>
-      </p>
+      <h4 class="label" id="description">Description</h4>
+      <textarea name="description" cols="50" rows="3" ><TMPL_VAR NAME=description></textarea>
+      <div class="help">
+        An optional description. (HTML tags are allowed.)
+      </div>
 
       <hr/>
 
-      <p>
-        <a name="catch-all"></a>
-        <h4 class="label">Catch-All aliases</h4>
-        <textarea type="text" name="catchalls" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=catchalls></textarea>
-        <div class="help">
-          An optional list of destinations (one e-mail address per line) that
-          will receive mail sent to <i>non existing</i> recipients.
-          Domain aliases can be defined by leaving the local part of
-          the destination empty, like in <tt>@example.org</tt>: email
-          to <tt>inexisting@<TMPL_VAR NAME=domain></tt>
-          will then be sent to <tt>inexisting@example.org</tt>.
-        </div>
-      </p>
+      <h4 class="label" id="catch-all">Catch-All aliases</h4>
+      <textarea name="catchalls" cols="50" rows="10" ><TMPL_VAR NAME=catchalls></textarea>
+      <div class="help">
+        An optional list of destinations (one e-mail address per line) that
+        will receive mail sent to <i>non existing</i> recipients.
+        Domain aliases can be defined by leaving the local part of
+        the destination empty, like in <span class="email">@example.org</span>:
+        email to <span class="email">inexisting@<TMPL_VAR NAME=domain></span>
+        will then be sent to <span class="email">inexisting@example.org</span>.
+      </div>
 
       <hr/>
       <br/>
@@ -85,5 +77,6 @@
       <input type="submit" name="submit" value="Submit" />
       </div>
     </form>
+    </div>
   </body>
 </html>
diff --git a/template/edit-list.html b/template/edit-list.html
index f77e49b..0a2b5e3 100644
--- a/template/edit-list.html
+++ b/template/edit-list.html
@@ -21,7 +21,8 @@
     </div>
     <hr/>
 
-    <h1>Edit list <tt><TMPL_VAR NAME=list>@<TMPL_VAR NAME=domain></tt></h1>
+    <div id="content">
+    <h1>Edit list <span class="email"><TMPL_VAR NAME=list>@<TMPL_VAR NAME=domain></span></h1>
 
     <TMPL_IF NAME=newChanges>
       <TMPL_IF NAME=error>
@@ -30,38 +31,32 @@
         <div class="success">Your changes have succesfully been submitted.</div>
       </TMPL_IF>
     <TMPL_ELSE>
-      </br>
+      <br/>
     </TMPL_IF>
 
     <br/>
 
-    <form class="editform" name="editform" method="post">
+    <form class="editform" name="editform" method="post" action="?">
       <div class="editform">
       <input type="hidden" name="a" value="edit" />
       <input type="hidden" name="t" value="list" />
 
-      <p>
-        <a name="status"></a>
-        <h4 class="label">Status</h4>
-        <select name="isactive">
-          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
-          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
-        </select>
-        <div class="help">
-          <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
-        </div>
-      </p>
+      <h4 class="label" id="status">Status</h4>
+      <select name="isactive">
+        <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option>
+        <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option>
+      </select>
+      <div class="help">
+        <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
+      </div>
 
       <hr/>
 
-      <p>
-        <a name="description"></a>
-        <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
-        <div class="help">
-          An optional description. (HTML tags are allowed.)
-        </div>
-      </p>
+      <h4 class="label" id="description">Description</h4>
+      <textarea name="description" cols="50" rows="3" ><TMPL_VAR NAME=description></textarea>
+      <div class="help">
+        An optional description. (HTML tags are allowed.)
+      </div>
 
       <hr/>
       <br/>
@@ -70,5 +65,6 @@
       <input type="submit" name="submit" value="Submit" />
       </div>
     </form>
+    </div>
   </body>
 </html>
diff --git a/template/edit-mailbox.html b/template/edit-mailbox.html
index 5cc6a00..5b8ff99 100644
--- a/template/edit-mailbox.html
+++ b/template/edit-mailbox.html
@@ -21,7 +21,8 @@
     </div>
     <hr/>
 
-    <h1>Edit mailbox <tt><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></tt></h1>
+    <div id="content">
+    <h1>Edit mailbox <span class="mailbox"><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></span></h1>
 
     <TMPL_IF NAME=newChanges>
       <TMPL_IF NAME=error>
@@ -30,80 +31,68 @@
         <div class="success">Your changes have succesfully been submitted.</div>
       </TMPL_IF>
     <TMPL_ELSE>
-      </br>
+      <br/>
     </TMPL_IF>
 
     <br/>
 
-    <form class="editform" name="editform" method="post">
+    <form class="editform" name="editform" method="post" action="?">
       <div class="editform">
       <input type="hidden" name="a" value="edit" />
       <input type="hidden" name="t" value="mailbox" />
 
-      <p>
-        <a name="status"></a>
-        <h4 class="label">Status</h4>
-        <select name="isactive">
-          <option value="1" <TMPL_IF NAME=isactive>selected</TMPL_IF>>Active</option>
-          <option value="0" <TMPL_UNLESS NAME=isactive>selected</TMPL_UNLESS>>Inactive</option>
-        </select>
-        <div class="help">
-          <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
-        </div>
-      </p>
+      <h4 class="label" id="status">Status</h4>
+      <select name="isactive">
+        <option value="1" <TMPL_IF NAME=isactive>selected="selected"</TMPL_IF>>Active</option>
+        <option value="0" <TMPL_UNLESS NAME=isactive>selected="selected"</TMPL_UNLESS>>Inactive</option>
+      </select>
+      <div class="help">
+        <b>Warning</b>: emails are <i>not</i> delivered to inactive entries.
+      </div>
 
       <hr/>
 
-      <p>
-        <a name="password"></a>
-        <h4 class="label">Change password</h4>
+      <h4 class="label" id="password">Change password</h4>
 
-        <table class="loginform">
-          <tr>
-            <td class="label">Current password</td>
-            <td><input type="password" name="oldpw" size="20" /></td>
-          </tr>
-          <tr>
-            <td class="label">New password</td>
-            <td><input type="password" name="newpw" size="20" /></td>
-          </tr>
-          <tr>
-            <td class="label">Repeat new password</td>
-            <td><input type="password" name="newpw2" size="20" /></td>
-          </tr>
-        </table>
+      <table class="loginform">
+        <tr>
+          <td class="label">Current password</td>
+          <td><input type="password" name="oldpw" size="20" /></td>
+        </tr>
+        <tr>
+          <td class="label">New password</td>
+          <td><input type="password" name="newpw" size="20" /></td>
+        </tr>
+        <tr>
+          <td class="label">Repeat new password</td>
+          <td><input type="password" name="newpw2" size="20" /></td>
+        </tr>
+      </table>
 
-        <div class="help">
-          <i>Note</i>:
-          You need to enter
-          <tt><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></tt>'s
-          current password first.
-        </div>
-      </p>
+      <div class="help">
+        <i>Note</i>:
+        You need to enter
+        <span class="mailbox"><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></span>'s
+        current password first.
+      </div>
 
       <hr/>
 
-      <p>
-        <a name="description"></a>
-        <h4 class="label">Description</h4>
-        <textarea type="text" name="description" cols="50" rows="3" wrap="soft"><TMPL_VAR NAME=description></textarea>
-        <div class="help">
-          An optional description. (HTML tags are allowed.)
-        </div>
-      </p>
+      <h4 class="label" id="description">Description</h4>
+      <textarea name="description" cols="50" rows="3" ><TMPL_VAR NAME=description></textarea>
+      <div class="help">
+        An optional description. (HTML tags are allowed.)
+      </div>
 
       <hr/>
 
-      <p>
-        <a name="forward"></a>
-        <h4 class="label">Mail forwarding</h4>
-        <textarea type="text" name="forwards" cols="50" rows="10" wrap="hard" ><TMPL_VAR NAME=forwards></textarea>
-        <div class="help">
-          An optional list of destinations (one e-mail address per line) that
-          will <i>also</i> receive mail delivered to
-          <tt><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain><tt>.
-        </div>
-      </p>
+      <h4 class="label" id="forward">Mail forwarding</h4>
+      <textarea name="forwards" cols="50" rows="10" ><TMPL_VAR NAME=forwards></textarea>
+      <div class="help">
+        An optional list of destinations (one e-mail address per line) that
+        will <i>also</i> receive mail delivered to
+        <span class="email"><TMPL_VAR NAME=user>@<TMPL_VAR NAME=domain></span>.
+      </div>
 
       <hr/>
       <br/>
@@ -112,5 +101,6 @@
       <input type="submit" name="submit" value="Submit" />
       </div>
     </form>
+    </div>
   </body>
 </html>
diff --git a/template/list-domains.html b/template/list-domains.html
index 8d89cb7..980b8de 100644
--- a/template/list-domains.html
+++ b/template/list-domains.html
@@ -19,10 +19,10 @@
     </div>
     <hr/>
 
-    <h1>Manage domains<span class="action">[<a href="<TMPL_VAR NAME=url>/?a=add">add</a>]<span></h1>
+    <div id="content">
+    <h1>Manage domains<span class="action">[<a href="<TMPL_VAR NAME=url>/?a=add">add</a>]</span></h1>
 
-    <a name="domains"></a>
-    <table class="list">
+    <table class="list" id="domains">
       <thead>
         <tr class="odd">
           <th>Domain</th>
@@ -33,12 +33,13 @@
       <tbody>
       <TMPL_LOOP NAME=domains>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><tt><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a></tt></td>
+          <td><span class="domain"><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/"><TMPL_VAR NAME=domain></a></span></td>
           <td><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
           <td><TMPL_IF NAME=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
         </tr>
       </TMPL_LOOP>
       </tbody>
     </table>
+    </div>
   </body>
 </html>
diff --git a/template/list-locals.html b/template/list-locals.html
index ba47ac4..1e3a799 100644
--- a/template/list-locals.html
+++ b/template/list-locals.html
@@ -19,12 +19,13 @@
     </div>
     <hr/>
 
-    <h1>Manage domain <tt><TMPL_VAR NAME=domain></tt
-        ><TMPL_IF NAME=canEditDomain><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=edit">edit domain</a>]<span></TMPL_IF></h1>
+    <div id="content">
+    <h1>Manage domain <span class="domain"><TMPL_VAR NAME=domain></span
+        ><TMPL_IF NAME=canEditDomain><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=edit">edit domain</a>]</span></TMPL_IF></h1>
 
     <TMPL_IF NAME=description><p class="description"><TMPL_VAR NAME=description></p></TMPL_IF>
 
-    <p id="status">Domain status:
+    <p id="domainstatus">Domain status:
       <b>
         <TMPL_IF NAME=isactive><span class="active">Active</span>
         <TMPL_ELSE><span class="inactive">Inactive</span>
@@ -35,11 +36,10 @@
 
     <TMPL_IF NAME=listMailboxes>
     <h3>Mailboxes<TMPL_IF NAME=canAddMailbox
-       ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&t=mailbox">add</a>]</span
+       ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&amp;t=mailbox">add</a>]</span
        ></TMPL_IF></h3>
 
-    <a name="mailboxes"></a>
-    <table class="list">
+    <table class="list" id="mailboxes">
       <thead>
         <tr class="odd">
           <th>Account</th>
@@ -52,11 +52,11 @@
       <tbody>
       <TMPL_LOOP NAME=mailboxes>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><tt><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=user>/"><TMPL_VAR NAME=user></a></tt></td>
+          <td><span class="mailbox"><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=user>/"><TMPL_VAR NAME=user></a></span></td>
           <td><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
           <td><TMPL_IF NAME=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
           <td><TMPL_UNLESS NAME=forwards><span class="none">(none)</span></TMPL_UNLESS>
-              <TMPL_LOOP NAME=forwards><tt><TMPL_VAR NAME=forward></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
+              <TMPL_LOOP NAME=forwards><span class="email"><TMPL_VAR NAME=forward></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
 
           <td><TMPL_IF NAME=quota><TMPL_VAR NAME=quota><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
         </tr>
@@ -69,11 +69,10 @@
 
     <TMPL_IF NAME=listAliases>
     <h3>Alias<TMPL_IF NAME=canAddAlias
-       ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&t=alias">add</a>]</span
+       ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&amp;t=alias">add</a>]</span
        ></TMPL_IF></h3>
 
-    <a name="aliases"></a>
-    <table class="list">
+    <table class="list" id="aliases">
       <thead>
         <tr class="odd">
           <th>Alias</th>
@@ -85,20 +84,20 @@
       <tbody>
       <TMPL_LOOP NAME=aliases>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><tt><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=alias>/"><TMPL_VAR NAME=alias></a></tt></td>
+          <td><span class="alias"><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=alias>/"><TMPL_VAR NAME=alias></a></span></td>
           <td><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
           <td><TMPL_IF NAME=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
           <td><TMPL_UNLESS NAME=destinations><span class="none">(none)</span></TMPL_UNLESS>
-              <TMPL_LOOP NAME=destinations><tt><TMPL_VAR NAME=destination></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
+              <TMPL_LOOP NAME=destinations><span class="email"><TMPL_VAR NAME=destination></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
         </tr>
       </TMPL_LOOP>
       <TMPL_IF NAME=catchalls>
         <TMPL_IF NAME=CAodd><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
          <td><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=edit#catch-all">*</a></td>
-         <td>Catch-all alias(es) for domain <tt><TMPL_VAR NAME=domain></tt>.</td>
+         <td>Catch-all alias(es) for domain <span class="domain"><TMPL_VAR NAME=domain></span>.</td>
          <td><span class="dunno">&#x2014;</span></td>
-         <td><TMPL_LOOP NAME=catchalls><tt><TMPL_VAR NAME=catchall></tt><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
-        <tr>
+         <td><TMPL_LOOP NAME=catchalls><span class="email"><TMPL_VAR NAME=catchall></span><TMPL_UNLESS NAME=__last__>, </TMPL_UNLESS></TMPL_LOOP></td>
+        </tr>
       </TMPL_IF>
       </tbody>
     </table>
@@ -108,11 +107,10 @@
 
     <TMPL_IF NAME=listLists>
     <h3>Lists<TMPL_IF NAME=canAddList
-       ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&t=list">add</a>]</span
+       ><span class="action">[<a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/?a=add&amp;t=list">add</a>]</span
        ></TMPL_IF></h3>
 
-    <a name="lists"></a>
-    <table class="list">
+    <table class="list" id="lists">
       <thead>
         <tr class="odd">
           <th>List</th>
@@ -124,7 +122,7 @@
       <tbody>
       <TMPL_LOOP NAME=lists>
         <TMPL_IF NAME=__even__><tr class="odd"><TMPL_ELSE><tr></TMPL_IF>
-          <td><tt><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=list>/"><TMPL_VAR NAME=list></a></tt></td>
+          <td><span class="list"><a href="<TMPL_VAR NAME=url>/<TMPL_VAR NAME=domain>/<TMPL_VAR NAME=list>/"><TMPL_VAR NAME=list></a></span></td>
           <td><TMPL_IF NAME=description><TMPL_VAR NAME=description><TMPL_ELSE><span class="none">(none)</span></TMPL_IF></td>
           <td><TMPL_IF NAME=isactive><span class="active">&#x2714;</span><TMPL_ELSE><span class="inactive">&#x2718;</span></TMPL_IF></td>
           <td><TMPL_VAR NAME=transport></td>
@@ -133,7 +131,7 @@
       </tbody>
     </table>
     </TMPL_IF>
-
+    </div>
 
   </body>
 </html>