<div class="editcomment">
<TMPL_VAR MESSAGE>
+<br />
<TMPL_VAR FORM-START>
<TMPL_VAR FIELD-DO>
<TMPL_VAR FIELD-SID>
<TMPL_VAR FIELD-PAGE>
-<TMPL_IF NAME=USERNAME>
-Signed in as <TMPL_VAR NAME=USERNAME ESCAPE=HTML><br />
-<TMPL_ELSE>
+<TMPL_UNLESS NAME=USERNAME>
<TMPL_IF NAME=ALLOWAUTHOR>
-Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br />
-Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
-</TMPL_IF>
+<label for="author" class="block">Name:</label>
+<TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>)
+<br/>
+<label for="url" class="block">Website:</label>
+<TMPL_VAR NAME=FIELD-URL> (optional)
+<br />
+<label for="url" class="block">Email:</label>
+<TMPL_VAR NAME=FIELD-EMAIL> <TMPL_VAR FIELD-ANONSUBSCRIBE>
+<br />
+<TMPL_ELSE>
+(You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)
+<br />
</TMPL_IF>
-Subject: <TMPL_VAR FIELD-SUBJECT><br />
+</TMPL_UNLESS>
+<label for="subject" class="block">Subject:</label>
+<TMPL_VAR FIELD-SUBJECT><br />
+<label for="editcontent" class="block">Comment:</label>
<TMPL_VAR FIELD-EDITCONTENT><br />
-Page type: <TMPL_VAR FIELD-TYPE><br />
-<TMPL_VAR FORM-SUBMIT><br />
-<TMPL_VAR HELPONFORMATTINGLINK><br />
-A subset of HTML is allowed.<br />
-IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
+<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK>
+<TMPL_VAR FIELD-SUBSCRIBE><br />
<TMPL_VAR NAME="FORM-END">
+<TMPL_VAR WMD_PREVIEW>
<TMPL_IF NAME="PAGE_PREVIEW">
<hr />