Another fixed bug in beautify_urlpath

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

diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index e7e283bbfb16005522decdfc501e610eff217e32..b419404ea68a2a8e10f447c16323628300abfa39 100644 (file)
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,36 +1,53 @@
-<div class="comments-display" id="<TMPL_VAR NAME=INLINEPAGE>">
+<div class="comment" id="<TMPL_VAR NAME=INLINEPAGE>">
+
+<div class="comment-header">
+By

 
 

-<div class="comments-header">
-Posted by

 <TMPL_IF NAME="COMMENTUSER">
 <span class="author">
 <TMPL_IF NAME="COMMENTUSER">
 <span class="author">

+<TMPL_IF NAME="COMMENTOPENID">
+
+<a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<img src="/wikiicons/openid.png" width="20" height="15" alt="[OpenID]"
+    title="Signed in with OpenID" />
+
+<TMPL_ELSE>
+

 <TMPL_IF NAME="COMMENTAUTHORURL">
 <a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
 <TMPL_ELSE>
 <TMPL_IF NAME="COMMENTAUTHORURL">
 <a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
 <TMPL_ELSE>

-<TMPL_VAR NAME=AUTHOR>
+<TMPL_VAR NAME=COMMENTAUTHOR>
+</TMPL_IF>
+<img src="/wikiicons/signedin.png" width="15" height="15" alt="[Signed in]"
+    title="Signed in directly" />
+

 </TMPL_IF>
 </span>
 </TMPL_IF>
 </span>

-<TMPL_ELSE>
+
+<TMPL_ELSE><!-- !COMMENTUSER -->
+

 <TMPL_IF NAME=COMMENTIP>
 <TMPL_IF NAME=COMMENTIP>

-<span class="author">
-<TMPL_VAR NAME=COMMENTIP>
-</span>
+<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
+<TMPL_ELSE><!-- !COMMENTIP -->
+<span class="author" title="Unauthenticated, from unknown IP address">
+</TMPL_IF>
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>

 <TMPL_ELSE>
 <TMPL_ELSE>

-unknown IP address
+<TMPL_VAR NAME=AUTHOR>

 </TMPL_IF>
 </TMPL_IF>

+<img src="/wikiicons/anonymous.png" width="15" height="15" alt="[Unauthenticated]" />
+</span>

 
 

-<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_IF><!-- !COMMENTUSER -->

 
 (<TMPL_VAR CTIME>)
 </div>
 
 
 (<TMPL_VAR CTIME>)
 </div>
 

-<div class="comments-subject"><TMPL_VAR TITLE></div>
+<div class="comment-subject"><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a></div>

 
 <div class="inlinecontent">
 <TMPL_VAR CONTENT>
 </div>
 
 
 <div class="inlinecontent">
 <TMPL_VAR CONTENT>
 </div>
 

-</div><!--.comments-display-->
+</div><!--.comment-->