Merge branch 'master' into 'debian/master'

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

diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index fa90e6d26f87d756339dd1773a79fb43fc137da5..e2924407b587d3a4c6663e6aad9b349f1c3676dc 100644 (file)
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,6 +1,10 @@
 <TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>">
 <TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF>
 
+<TMPL_IF COMMENTAUTHORAVATAR><div class="comment-avatar">
+<img src="<TMPL_VAR COMMENTAUTHORAVATAR>" alt="" />
+</div></TMPL_IF>
+
 <TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
 <TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
@@ -14,32 +18,35 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
-Comment by
 <TMPL_IF COMMENTUSER>
+Comment by
 <TMPL_IF COMMENTOPENID>
 <span class="author" title="OpenID">
-<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>
+<a rel="nofollow" href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>
 </span>
 <TMPL_ELSE>
 <span class="author" title="Signed in">
 <TMPL_IF COMMENTAUTHORURL>
-<a href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a>
+<a rel="nofollow" href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR COMMENTAUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
 <TMPL_ELSE>
+<TMPL_IF AUTHOR>
+Comment by
 <TMPL_IF COMMENTIP>
 <span class="author" title="Unauthenticated, from <TMPL_VAR COMMENTIP>">
 <TMPL_ELSE>
 <span class="author" title="Unauthenticated, from unknown IP address">
 </TMPL_IF>
 <TMPL_IF AUTHORURL>
-<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<a rel="nofollow" href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
 </TMPL_IF>
+</TMPL_IF>
 </span>
 </TMPL_IF>
 &mdash; <TMPL_VAR CTIME>
@@ -55,4 +62,5 @@ Comment by
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+<div style="clear: both"></div>
 <TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>