Update feed templates from ikiwiki distribution

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 654aa2ac10915ce1d6c15264e5210e3452a90a18..1b1d686dddebb0d830e1c32e2c203cf5c03469ff 100644 (file)
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,24 +1,44 @@
 <entry>
-       <title type="html"><TMPL_VAR TITLE ESCAPE=HTML></title>
+       <title><TMPL_VAR TITLE></title>
+       <id><TMPL_VAR URL></id>
+       <link href="<TMPL_VAR PERMALINK>"/>
        <TMPL_IF NAME="AUTHOR">
-       <author type="html"><TMPL_VAR AUTHOR ESCAPE=HTML></author>
+        <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
+       </TMPL_IF>
+       <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>
-       <id><TMPL_VAR URL></id>
-       <link href="<TMPL_VAR PERMALINK>"/>
        <TMPL_IF NAME="CATEGORIES">
-       <TMPL_LOOP NAME="CATEGORIES">
-       <category term="<TMPL_VAR CATEGORY>" />
-       </TMPL_LOOP>
+        <TMPL_LOOP NAME="CATEGORIES">
+         <category term="<TMPL_VAR CATEGORY>" />
+        </TMPL_LOOP>
        </TMPL_IF>
-       <updated><TMPL_VAR DATE_3339></updated>
+       <updated><TMPL_VAR MDATE_3339></updated>
+       <published><TMPL_VAR CDATE_3339></published>
        <TMPL_IF NAME="ENCLOSURE">
-       <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
+        <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
        <TMPL_ELSE>
-       <content type="xhtml" xml:lang="en">
-        <div xmlns="http://www.w3.org/1999/xhtml">
-        <TMPL_VAR CONTENT>
-        </div>
-       </content>
+        <content type="xhtml" xml:lang="en">
+         <div xmlns="http://www.w3.org/1999/xhtml">
+         <TMPL_VAR CONTENT>
+         </div>
+        </content>
        </TMPL_IF>
 </entry>

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 0fab42e710ba3689668fbc4f49e2fcbe192195c0..f22e5e3fb99c3cba669bccc860618559aad4de5a 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,9 +1,9 @@
 <item>
        <TMPL_IF NAME="AUTHOR">
-       <title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE ESCAPE=HTML></title>
-       <dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator>
+       <title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
+       <dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
        <TMPL_ELSE>
-       <title><TMPL_VAR TITLE ESCAPE=HTML></title>
+       <title><TMPL_VAR TITLE></title>
        </TMPL_IF>
        <guid><TMPL_VAR URL></guid>
        <link><TMPL_VAR PERMALINK></link>
@@ -12,7 +12,8 @@
        <category><TMPL_VAR CATEGORY></category>
        </TMPL_LOOP>
        </TMPL_IF>
-       <pubDate><TMPL_VAR DATE_822></pubDate>
+       <pubDate><TMPL_VAR CDATE_822></pubDate>
+       <dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
        <TMPL_IF NAME="ENCLOSURE">
        <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
        <TMPL_ELSE>