Merge branch 'master' into comments

[ikiwiki.git] / templates / comments_display.tmpl

diff --git a/templates/comments_display.tmpl b/templates/comments_display.tmpl
index 04e0613e0067a6b497f306cae99c918c715b6a2c..bc4b70273c7b36e78c6e811e3392e20aea4119f6 100644 (file)
--- a/templates/comments_display.tmpl
+++ b/templates/comments_display.tmpl
@@ -2,14 +2,26 @@
 
 <div class="comments-header">
 Posted by
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF NAME="COMMENTUSER">
 <span class="author">
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_IF NAME="COMMENTAUTHORURL">
+<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR NAME=AUTHOR>
 </TMPL_IF>
 </span>
+<TMPL_ELSE>
+<TMPL_IF NAME=COMMENTIP>
+<span class="author">
+<TMPL_VAR NAME=COMMENTIP>
+</span>
+<TMPL_ELSE>
+unknown IP address
+</TMPL_IF>
+
+<TMPL_IF NAME=AUTHOR>
+(<span class="claimedauthor"><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>
 </TMPL_IF>
 
 (<TMPL_VAR CTIME>)