diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 23:45:13 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 23:45:13 +0200 |
| commit | 83ade29837b194950b33ed9b3cfcf8efe1181e1f (patch) | |
| tree | 5d751da265d7a021befbac631844c44e4135af38 /inlinepage.tmpl | |
| parent | 14bb211648396f091577ab4599bbdf8d9e8da26d (diff) | |
| parent | 306eb61d606fd1ab40ef74866a14267384e0b2d6 (diff) | |
Merge branch 'scs-da' into allinone-nonedit-da
Conflicts (manually resolved):
misc.tmpl
page.tmpl
Diffstat (limited to 'inlinepage.tmpl')
| -rw-r--r-- | inlinepage.tmpl | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/inlinepage.tmpl b/inlinepage.tmpl index 59ffd94..5380316 100644 --- a/inlinepage.tmpl +++ b/inlinepage.tmpl @@ -1,43 +1,41 @@ -<div class="inlinepage"> +<TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF> -<div class="inlineheader"> - -<TMPL_IF NAME="AUTHOR"> +<TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF> +<TMPL_IF AUTHOR> <span class="author"> -<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_VAR NAME=AUTHOR> +<TMPL_VAR AUTHOR> </TMPL_IF> </span> </TMPL_IF> -<span class="header"> -<TMPL_IF NAME="PERMALINK"> +<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF> +<TMPL_IF PERMALINK> <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a> <TMPL_ELSE> <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a> </TMPL_IF> -</span> - -</div><!--.inlineheader--> +<TMPL_IF HTML5></header><TMPL_ELSE></span></TMPL_IF> +<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> -<div class="inlinecontent"> +<TMPL_IF HTML5><section class="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 class="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF> <span class="pagedate"> -Posted <TMPL_VAR CTIME> +Leveret <TMPL_VAR CTIME> </span> -<TMPL_IF NAME="TAGS"> -<span class="tags"> +<TMPL_IF TAGS> +<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF> Mærkater: -<TMPL_LOOP NAME="TAGS"> -<TMPL_VAR NAME=LINK> +<TMPL_LOOP TAGS> +<TMPL_VAR LINK> </TMPL_LOOP> -</span> +<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF> </TMPL_IF> <TMPL_IF COPYRIGHT> @@ -52,19 +50,23 @@ Licens: <TMPL_VAR LICENSE> </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> -<TMPL_IF NAME="EDITURL"> +<TMPL_IF EDITURL> <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Redigér</a></li> </TMPL_IF> -<TMPL_IF NAME="DISCUSSIONLINK"> +<TMPL_IF COMMENTSLINK> +<li><TMPL_VAR COMMENTSLINK></li> +<TMPL_ELSE> +<TMPL_IF DISCUSSIONLINK> <li><TMPL_VAR DISCUSSIONLINK></li> </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> |