summaryrefslogtreecommitdiff
path: root/atompage.tmpl
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-20 23:30:56 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-20 23:30:56 +0200
commit842324297a6a9ca98eb496b217d26b119465af40 (patch)
tree64a3a1de845476fb9132279743742ca4d5bfd15a /atompage.tmpl
parente310666f0122eed6767fbc6f36c8895f8c8b713f (diff)
parent3e2f923e92cf5757631a0ed28223a68d38e71f6f (diff)
Merge branch 'scs' into allinone
Conflicts (manually resolved): misc.tmpl page.tmpl
Diffstat (limited to 'atompage.tmpl')
-rw-r--r--atompage.tmpl40
1 files changed, 20 insertions, 20 deletions
diff --git a/atompage.tmpl b/atompage.tmpl
index dcb89ab..e82b598 100644
--- a/atompage.tmpl
+++ b/atompage.tmpl
@@ -5,32 +5,32 @@
<link href="<TMPL_VAR PAGEURL>"/>
<link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
<author>
-<TMPL_IF NAME="AUTHOR">
- <name><TMPL_VAR AUTHOR></name>
+<TMPL_IF AUTHOR>
+<name><TMPL_VAR AUTHOR></name>
<TMPL_ELSE>
- <name><TMPL_VAR WIKINAME></name>
+<name><TMPL_VAR WIKINAME></name>
</TMPL_IF>
</author>
-<TMPL_IF NAME="COPYRIGHT">
- <rights type="html" xml:lang="en">
- <TMPL_IF NAME="LICENSE">
- <TMPL_VAR LICENSE>
- <TMPL_VAR COPYRIGHT ESCAPE=HTML>
- <TMPL_ELSE>
- <TMPL_VAR COPYRIGHT ESCAPE=HTML>
- </TMPL_IF>
- </rights>
+<TMPL_IF COPYRIGHT>
+<rights type="html" xml:lang="en">
+<TMPL_IF LICENSE>
+ <TMPL_VAR LICENSE>
+ <TMPL_VAR COPYRIGHT ESCAPE=HTML>
<TMPL_ELSE>
- <TMPL_IF NAME="LICENSE">
- <rights type="html">
- <TMPL_VAR LICENSE ESCAPE=HTML>
- </rights>
- </TMPL_IF>
+ <TMPL_VAR COPYRIGHT ESCAPE=HTML>
</TMPL_IF>
-<TMPL_IF NAME="GUID">
- <id><TMPL_VAR GUID></id>
+</rights>
<TMPL_ELSE>
- <id><TMPL_VAR PAGEURL></id>
+<TMPL_IF LICENSE>
+<rights type="html">
+ <TMPL_VAR LICENSE ESCAPE=HTML>
+</rights>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF GUID>
+<id><TMPL_VAR GUID></id>
+<TMPL_ELSE>
+<id><TMPL_VAR PAGEURL></id>
</TMPL_IF>
<subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
<generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>