comments_display.tmpl: preferentially use confirmed username, but fall back to claime...

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 04e0613e0067a6b497f306cae99c918c715b6a2c..0e9c82e2e14e1d8da8400eee51a5f76cec91ca80 100644 (file)
--- 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>)