diff options
| author | Joey Hess <joey@kitenet.net> | 2010-05-02 16:36:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-05-02 16:36:10 -0400 |
| commit | 677d2af18aaafdfa1532e9eaff3c39107ec169f6 (patch) | |
| tree | 1d97a5590f924a1340e8a1bc2883900aad795a5e | |
| parent | 154732dc4235b7b31191975da50d780a2765fa02 (diff) | |
| download | ikiwiki-677d2af18aaafdfa1532e9eaff3c39107ec169f6.tar ikiwiki-677d2af18aaafdfa1532e9eaff3c39107ec169f6.tar.gz | |
adapt inlinepage.tmpl to html5
Needed to force tags to display inline, since <nav> is a block element.
| -rw-r--r-- | doc/style.css | 4 | ||||
| -rw-r--r-- | templates/inlinepage.tmpl | 30 |
2 files changed, 18 insertions, 16 deletions
diff --git a/doc/style.css b/doc/style.css index c857157b6..ea18ca0c3 100644 --- a/doc/style.css +++ b/doc/style.css @@ -69,6 +69,10 @@ margin-top: 1em; } +.inlinepage .tags { + display: inline; +} + .mapparent { text-decoration: none; } diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl index 3c0b93315..b32a7e497 100644 --- a/templates/inlinepage.tmpl +++ b/templates/inlinepage.tmpl @@ -1,7 +1,6 @@ -<div class="inlinepage"> - -<div class="inlineheader"> +<TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF> +<TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF> <TMPL_IF NAME="AUTHOR"> <span class="author"> <TMPL_IF NAME="AUTHORURL"> @@ -11,33 +10,32 @@ </TMPL_IF> </span> </TMPL_IF> -<span class="header"> +<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF> <TMPL_IF NAME="PERMALINK"> <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a> <TMPL_ELSE> <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a> </TMPL_IF> -</span> +<TMPL_IF HTML5></span><TMPL_ELSE></div></TMPL_IF> +<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> -</div><!--.inlineheader--> - -<div class="inlinecontent"> +<TMPL_IF HTML5><section id="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF> <TMPL_VAR CONTENT> -</div><!--.inlinecontent--> +<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> -<div class="inlinefooter"> +<TMPL_IF HTML5><footer id="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF> <span class="pagedate"> Posted <TMPL_VAR CTIME> </span> <TMPL_IF NAME="TAGS"> -<span class="tags"> +<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF> Tags: <TMPL_LOOP NAME="TAGS"> <TMPL_VAR LINK> </TMPL_LOOP> -</span> +<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF> </TMPL_IF> <TMPL_IF COPYRIGHT> @@ -53,7 +51,7 @@ License: <TMPL_VAR LICENSE> </TMPL_IF> <TMPL_IF NAME="HAVE_ACTIONS"> -<div class="actions"> +<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF> <ul> <TMPL_IF NAME="EDITURL"> <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li> @@ -66,9 +64,9 @@ License: <TMPL_VAR LICENSE> </TMPL_IF> </TMPL_IF> </ul> -</div><!--.actions--> +<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> -</div><!--.inlinefooter--> +<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF> -</div><!--.inlinepage--> +<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF> |