From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 11 Dec 2008 02:24:27 +0000 (+0000)
Subject: comments_display.tmpl: preferentially use confirmed username, but fall back to claime... 
X-Git-Tag: 2.71~99
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=370c1b87c95bbc381e8cfbfe66ecf84df8b3b482;p=ikiwiki.git

comments_display.tmpl: preferentially use confirmed username, but fall back to claimed author if unauthenticated

This still isn't quite right (it displays the IP address twice if the user
doesn't specify a name).
---

diff --git a/templates/comments_display.tmpl b/templates/comments_display.tmpl
index 04e0613e0..0e9c82e2e 100644
--- a/templates/comments_display.tmpl
+++ b/templates/comments_display.tmpl
@@ -2,14 +2,32 @@
 
 <div class="comments-header">
 Posted by
-<TMPL_IF NAME="AUTHOR">
-<span class="author">
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_IF NAME="COMMENTUSER">
+  <span class="author">
+    <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_VAR NAME=AUTHOR>
-</TMPL_IF>
-</span>
+  <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>)