diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2013-10-12 14:27:32 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2013-10-12 14:27:32 +0200 |
| commit | ccc9866cc6e4f35386a654d5eb66a71029b238b6 (patch) | |
| tree | 571738ace013fd5dadd3e6377f4fca4cf93c1590 | |
| parent | 0e6ff999a3e1d255bf4f88c61ffa96e54452f512 (diff) | |
| parent | 0e1bb78e6e1d3a6c587673a1d2d07bca2f8e4422 (diff) | |
Merge branches 'da' and 'h1title' into h1title-da
Conflicts (resolved manually):
autotag.tmpl
| -rw-r--r-- | autotag.tmpl | 2 | ||||
| -rw-r--r-- | page.tmpl | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/autotag.tmpl b/autotag.tmpl index cf07d26..237ee79 100644 --- a/autotag.tmpl +++ b/autotag.tmpl @@ -1,4 +1,4 @@ -[[!meta title="sider med mærkat <TMPL_VAR TAGNAME>"]] +# sider med mærkat <TMPL_VAR TAGNAME> [[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes" feedshow=10]] @@ -135,6 +135,7 @@ <div id="pagebody"> <TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF> +<h1><TMPL_VAR TITLE></h1> <TMPL_VAR CONTENT> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> |