X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/be55f6fd7cf1a251c3977f857a44ee2769e39d8b..eec38e8eeb63f6a93c60fc7b9e7e23b28e3b13e8:/templates/atompage.tmpl

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index 1c672f484..dcb89ab5c 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -1,15 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <feed xmlns="http://www.w3.org/2005/Atom">
-<title><TMPL_VAR TITLE ESCAPE=HTML></title>
+<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.kitenet.net/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
+<generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
 <updated><TMPL_VAR FEEDDATE></updated>
 <TMPL_VAR CONTENT>
 </feed>