Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / templates / atompage.tmpl

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index b811b876478594aab1c38173b6ee5a86bf8263a7..fc0088ae809cdb908111715d3ff5ae54f6c5cda9 100644 (file)
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -1,13 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <feed xmlns="http://www.w3.org/2005/Atom">
 <?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 PAGEURL>"/>

-<link href="<TMPL_VAR FEEDURL>" rel="self"/>
+<link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>

 <author>
 <author>

+<TMPL_IF NAME="AUTHOR">
+<name><TMPL_VAR AUTHOR></name>
+<TMPL_ELSE>

 <name><TMPL_VAR WIKINAME></name>
 <name><TMPL_VAR WIKINAME></name>

+</TMPL_IF>

 </author>
 </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_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>
 <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>
 <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>