X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ba1765fbdfeb0fd1fdf1354c1688580ef7864b68..85cc90cccdb4a4c7a83a3e0964dbb7d84fc385e4:/templates/atompage.tmpl

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index 1bca3e7f8..e834d7693 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -3,11 +3,39 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
 <title><TMPL_VAR TITLE></title>
 <link href="<TMPL_VAR PAGEURL>"/>
-<link href="<TMPL_VAR FEEDURL>" rel="self"/>
+<link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <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>
-<id><TMPL_VAR PAGEURL></id>
+<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>
+<TMPL_IF NAME="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>
 <updated><TMPL_VAR FEEDDATE></updated>