Don't set clear:both on .pagedate etc., only on .pagefooter

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

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index b811b876478594aab1c38173b6ee5a86bf8263a7..e834d7693829d4253225324328b062a52f7bc680 100644 (file)
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -1,13 +1,41 @@
 <?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>

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

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