Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / templates / comment.tmpl

diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index f26cf6d05088ae5505517be82464a0c3b1169605..fb76ea00494880863a8973b1942ae11a2e4e5a87 100644 (file)
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,7 +1,19 @@
-<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">
-By
+Comment by
 
 <TMPL_IF NAME="COMMENTUSER">
 <TMPL_IF NAME="COMMENTOPENID">
@@ -31,13 +43,17 @@ By
 </span>
 </TMPL_IF><!-- !COMMENTUSER -->
 
-(<TMPL_VAR CTIME>)
+&mdash; <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-->