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

1 files changed, 46 insertions, 56 deletions

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>