Note on delegation of Google profile openids

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

diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index acc4737c1303b3aed5c20aaaead1072f2f805bf8..dcb89ab5cfac9ed6f26ca1e15a20caf58e6f9491 100644 (file)
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -3,7 +3,7 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
 <title><TMPL_VAR TITLE></title>
 <link href="<TMPL_VAR PAGEURL>"/>
 <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>
 <TMPL_IF NAME="AUTHOR">
  <name><TMPL_VAR AUTHOR></name>
 <author>
 <TMPL_IF NAME="AUTHOR">
  <name><TMPL_VAR AUTHOR></name>


@@ -12,26 +12,26 @@
 </TMPL_IF>
 </author>
 <TMPL_IF NAME="COPYRIGHT">
 </TMPL_IF>
 </author>
 <TMPL_IF NAME="COPYRIGHT">

- <rights type="xhtml" xml:lang="en">
-  <div xmlns="http://www.w3.org/1999/xhtml">
+ <rights type="html" xml:lang="en">

    <TMPL_IF NAME="LICENSE">
     <TMPL_VAR LICENSE>
    <TMPL_IF NAME="LICENSE">
     <TMPL_VAR LICENSE>

-    <TMPL_VAR COPYRIGHT>
+    <TMPL_VAR COPYRIGHT ESCAPE=HTML>

    <TMPL_ELSE>
    <TMPL_ELSE>

-    <TMPL_VAR COPYRIGHT>
+    <TMPL_VAR COPYRIGHT ESCAPE=HTML>

    </TMPL_IF>
    </TMPL_IF>

-  </div>

  </rights>
 <TMPL_ELSE>
  <TMPL_IF NAME="LICENSE">
  </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 type="html">
+    <TMPL_VAR LICENSE ESCAPE=HTML>

   </rights>
  </TMPL_IF>
 </TMPL_IF>
   </rights>
  </TMPL_IF>
 </TMPL_IF>

-<id><TMPL_VAR PAGEURL></id>
+<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>