-<div class="comment" id="<TMPL_VAR NAME=INLINEPAGE>">
+<div class="comment" id="<TMPL_VAR NAME=COMMENTID>">
+
+<div class="comment-subject">
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<TMPL_VAR TITLE>
+</TMPL_IF>
+</div>
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
<div class="comment-header">
-Posted by
+Comment by
<TMPL_IF NAME="COMMENTUSER">
-<span class="author">
<TMPL_IF NAME="COMMENTOPENID">
-
-<img src="/wikiicons/openid.png" width="20" height="15" alt="[OpenID]"
- title="Signed in with OpenID" />
+<span class="author" title="OpenID">
<a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
-
+</span>
<TMPL_ELSE>
-
-<img src="/wikiicons/signedin.png" width="15" height="15" alt="[Signed in]"
- title="Signed in directly" />
+<span class="author" title="Signed in">
<TMPL_IF NAME="COMMENTAUTHORURL">
<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
<TMPL_ELSE>
<TMPL_VAR NAME=COMMENTAUTHOR>
-</TMPL_IF>
-
</TMPL_IF>
</span>
-
+</TMPL_IF>
<TMPL_ELSE><!-- !COMMENTUSER -->
-
<TMPL_IF NAME=COMMENTIP>
<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
<TMPL_ELSE><!-- !COMMENTIP -->
<span class="author" title="Unauthenticated, from unknown IP address">
</TMPL_IF>
-<img src="/wikiicons/anonymous.png" width="15" height="15" alt="[Unauthenticated]" />
<TMPL_IF NAME="AUTHORURL">
<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
<TMPL_ELSE>
<TMPL_VAR NAME=AUTHOR>
</TMPL_IF>
</span>
-
</TMPL_IF><!-- !COMMENTUSER -->
-(<TMPL_VAR CTIME>)
+— <TMPL_VAR CTIME>
</div>
-<div class="comment-subject"><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a></div>
-
-<div class="inlinecontent">
-<TMPL_VAR CONTENT>
-</div>
+<TMPL_IF NAME="HAVE_ACTIONS">
+<div class="actions">
+<ul>
+<TMPL_IF NAME="REMOVEURL">
+<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
+</TMPL_IF>
+</ul>
+</div><!--.actions-->
+</TMPL_IF>
</div><!--.comment-->