Merge branch 'master' into cvs

[ikiwiki.git] / templates / comment.tmpl

diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index fb76ea00494880863a8973b1942ae11a2e4e5a87..c16ca7c810c78f6cabac99bfed6b5bfb19c8b72c 100644 (file)
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,59 +1,66 @@
-<div class="comment" id="<TMPL_VAR NAME=COMMENTID>">
+<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>">
+<TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF>

 
 

-<div class="comment-subject">
+<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>
 <TMPL_ELSE>
 <TMPL_VAR TITLE>
 </TMPL_IF>
 <TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <TMPL_VAR TITLE>
 </TMPL_IF>

-</div>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>

 
 

-<div class="inlinecontent">
+<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>

 <TMPL_VAR CONTENT>
 <TMPL_VAR CONTENT>

-</div>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>

 
 

-<div class="comment-header">
+<TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
+<TMPL_IF COMMENTUSER>

 Comment by
 Comment by

-
-<TMPL_IF NAME="COMMENTUSER">
-<TMPL_IF NAME="COMMENTOPENID">
+<TMPL_IF COMMENTOPENID>

 <span class="author" title="OpenID">
 <span class="author" title="OpenID">

-<a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>

 </span>
 <TMPL_ELSE>
 <span class="author" title="Signed in">
 </span>
 <TMPL_ELSE>
 <span class="author" title="Signed in">

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

 <TMPL_ELSE>
 <TMPL_ELSE>

-<TMPL_VAR NAME=COMMENTAUTHOR>
+<TMPL_VAR COMMENTAUTHOR>

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

-<TMPL_ELSE><!-- !COMMENTUSER -->
-<TMPL_IF NAME=COMMENTIP>
-<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
-<TMPL_ELSE><!-- !COMMENTIP -->
+<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>
 <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_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>

 <TMPL_ELSE>
 <TMPL_ELSE>

-<TMPL_VAR NAME=AUTHOR>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>

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

-</TMPL_IF><!-- !COMMENTUSER -->
-
+</TMPL_IF>

 &mdash; <TMPL_VAR CTIME>
 &mdash; <TMPL_VAR CTIME>

-</div>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>

 
 

-<TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HAVE_ACTIONS>
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>

 <ul>
 <ul>

-<TMPL_IF NAME="REMOVEURL">
+<TMPL_IF REMOVEURL>

 <li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
 </TMPL_IF>
 </ul>
 <li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
 </TMPL_IF>
 </ul>

-</div><!--.actions-->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>

 </TMPL_IF>
 
 </TMPL_IF>
 

-</div><!--.comment-->
+<div style="clear: both"></div>
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>