From 6137005a40de0efbae16f4b5e810bb6af3abe59e Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 20 Jan 2008 20:43:20 +0100
Subject: Sync with upstream commit 405e8a703126cc5de426063dedbd2394b747782a
 (Wed Jan 9, release 2.20).

---
 atompage.tmpl | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'atompage.tmpl')

diff --git a/atompage.tmpl b/atompage.tmpl
index 1bca3e7..acc4737 100644
--- a/atompage.tmpl
+++ b/atompage.tmpl
@@ -5,8 +5,32 @@
 <link href="<TMPL_VAR PAGEURL>"/>
 <link href="<TMPL_VAR FEEDURL>" rel="self"/>
 <author>
-<name><TMPL_VAR WIKINAME></name>
+<TMPL_IF NAME="AUTHOR">
+ <name><TMPL_VAR AUTHOR></name>
+<TMPL_ELSE>
+ <name><TMPL_VAR WIKINAME></name>
+</TMPL_IF>
 </author>
+<TMPL_IF NAME="COPYRIGHT">
+ <rights type="xhtml" xml:lang="en">
+  <div xmlns="http://www.w3.org/1999/xhtml">
+   <TMPL_IF NAME="LICENSE">
+    <TMPL_VAR LICENSE>
+    <TMPL_VAR COPYRIGHT>
+   <TMPL_ELSE>
+    <TMPL_VAR COPYRIGHT>
+   </TMPL_IF>
+  </div>
+ </rights>
+<TMPL_ELSE>
+ <TMPL_IF NAME="LICENSE">
+  <rights type="xhtml" xml:lang="en">
+   <div xmlns="http://www.w3.org/1999/xhtml">
+    <TMPL_VAR LICENSE>
+   </div>
+  </rights>
+ </TMPL_IF>
+</TMPL_IF>
 <id><TMPL_VAR PAGEURL></id>
 <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
 <generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
-- 
cgit v1.2.3