urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt comment.tmpl to html5 

Note that I put comment-header in a <header> despite it being
below the comment. Using a <footer> would be confusing given
the class name. Also, the content is semantically closer to
a header than a footer.
master
Joey Hess 2010-05-02 16:12:08 -04:00
parent cbe0726b63
commit 154732dc42
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IkiWiki/Plugin/comments.pm
View File

@ -673,6 +673,7 @@ sub previewcomment ($$$) {
my $template = template("comment.tmpl"); my $template = template("comment.tmpl");
$template->param(content => $preview); $template->param(content => $preview);
$template->param(ctime => displaytime($time, undef, 1)); $template->param(ctime => displaytime($time, undef, 1));
$template->param(html5 => $config{html5});
IkiWiki::run_hooks(pagetemplate => sub { IkiWiki::run_hooks(pagetemplate => sub {
shift->(page => $location, shift->(page => $location,

1
IkiWiki/Plugin/inline.pm
View File

@ -362,6 +362,7 @@ sub preprocess_inline (@) {
$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat})); $template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
$template->param(first => 1) if $page eq $list[0]; $template->param(first => 1) if $page eq $list[0];
$template->param(last => 1) if $page eq $list[$#list]; $template->param(last => 1) if $page eq $list[$#list];
$template->param(html5 => $config{html5});
if ($actions) { if ($actions) {
my $file = $pagesources{$page}; my $file = $pagesources{$page};

2
doc/style.css
View File

@ -49,7 +49,7 @@
border-bottom: 1px solid #000; border-bottom: 1px solid #000;
} }
div.inlinecontent { .inlinecontent {
margin-top: .4em; margin-top: .4em;
} }

29
templates/comment.tmpl
View File

@ -1,20 +1,20 @@
<div class="comment" id="<TMPL_VAR NAME=COMMENTID>"> <TMPL_IF HTML5><article class="comment" id="<TMPL_VAR NAME=COMMENTID>">
<TMPL_ELSE><div class="comment" id="<TMPL_VAR NAME=COMMENTID>"></TMPL_IF>
<div class="comment-subject"> <TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
<TMPL_IF PERMALINK> <TMPL_IF PERMALINK>
<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a> <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
<TMPL_ELSE> <TMPL_ELSE>
<TMPL_VAR TITLE> <TMPL_VAR TITLE>
</TMPL_IF> </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>
Comment by Comment by
<TMPL_IF NAME="COMMENTUSER"> <TMPL_IF NAME="COMMENTUSER">
<TMPL_IF NAME="COMMENTOPENID"> <TMPL_IF NAME="COMMENTOPENID">
<span class="author" title="OpenID"> <span class="author" title="OpenID">
@ -29,10 +29,10 @@ Comment by
</TMPL_IF> </TMPL_IF>
</span> </span>
</TMPL_IF> </TMPL_IF>
<TMPL_ELSE><!-- !COMMENTUSER --> <TMPL_ELSE>
<TMPL_IF NAME=COMMENTIP> <TMPL_IF NAME=COMMENTIP>
<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>"> <span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
<TMPL_ELSE><!-- !COMMENTIP --> <TMPL_ELSE>
<span class="author" title="Unauthenticated, from unknown IP address"> <span class="author" title="Unauthenticated, from unknown IP address">
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="AUTHORURL"> <TMPL_IF NAME="AUTHORURL">
@ -41,19 +41,18 @@ Comment by
<TMPL_VAR NAME=AUTHOR> <TMPL_VAR NAME=AUTHOR>
</TMPL_IF> </TMPL_IF>
</span> </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"> <TMPL_IF NAME="HAVE_ACTIONS">
<div class="actions"> <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
<ul> <ul>
<TMPL_IF NAME="REMOVEURL"> <TMPL_IF NAME="REMOVEURL">
<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li> <li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
</TMPL_IF> </TMPL_IF>
</ul> </ul>
</div><!--.actions--> <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF> </TMPL_IF>
</div><!--.comment--> <TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>