X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ba1765fbdfeb0fd1fdf1354c1688580ef7864b68..72b2cba709e8ddae09107a366dbfc8c197cf6064:/templates/atompage.tmpl?ds=sidebyside

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index 1bca3e7f8..dcb89ab5c 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -3,11 +3,35 @@
 <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="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_ELSE>
+ <TMPL_IF NAME="LICENSE">
+  <rights type="html">
+    <TMPL_VAR LICENSE ESCAPE=HTML>
+  </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>