diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-05-28 23:51:15 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-05-28 23:51:15 +0200 |
| commit | a637dfe26c8a191b52099342c99922075ff65cbc (patch) | |
| tree | ad3f6d5df50c2c11a00d74023f60e2fa4d9d5f72 /change.tmpl | |
| parent | f7cea4ca9c08e2bb2c43128199d12b2464758dd6 (diff) | |
| parent | ca952f3eaea5227909b8cf574ee2d8fa34aa21b7 (diff) | |
Merge branch 'master' into master-da
Manually fix conflicts:
aggregatepost.tmpl
atomitem.tmpl
atompage.tmpl
change.tmpl
page.tmpl
Diffstat (limited to 'change.tmpl')
| -rw-r--r-- | change.tmpl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/change.tmpl b/change.tmpl index fe55505..e4ffcf6 100644 --- a/change.tmpl +++ b/change.tmpl @@ -1,13 +1,13 @@ -[[meta author="""<TMPL_VAR AUTHOR>"""]] +[[!meta author="""<TMPL_VAR AUTHOR>"""]] <TMPL_IF AUTHORURL> -[[meta authorurl="""<TMPL_VAR AUTHORURL>"""]] +[[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]] </TMPL_IF> -[[meta title="""opdatering af <TMPL_VAR WIKINAME>'s<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP>"""]] +[[!meta title="""ændring til<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> på <TMPL_VAR WIKINAME>"""]] <div class="metadata"> <span class="desc"><br />Ændrede sider:</span> <span class="pagelinks"> <TMPL_LOOP NAME="PAGES"> -<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>"><img alt="diff" src="<TMPL_VAR BASEURL>wikiicons/diff.png" /></a><TMPL_VAR LINK> +<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK> <TMPL_ELSE> <TMPL_VAR LINK> </TMPL_IF> @@ -33,4 +33,11 @@ </TMPL_IF> </TMPL_LOOP> </div> +<TMPL_IF NAME="DIFF"> +<div class=diff> +<pre> +<TMPL_VAR NAME="DIFF" ESCAPE="HTML"> +</pre> +</div> +</TMPL_IF> <!-- <TMPL_VAR REV> --> |