Merge branch 'master' into fancypodcast

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

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 0fab42e710ba3689668fbc4f49e2fcbe192195c0..9acefb5d3aab81ac182b2b83e38b7658d458c693 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,21 +1,28 @@
 <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>
-       <TMPL_ELSE>
-       <title><TMPL_VAR TITLE ESCAPE=HTML></title>
-       </TMPL_IF>
-       <guid><TMPL_VAR URL></guid>
+       <title><TMPL_VAR TITLE></title>
+<TMPL_IF GUID>
+       <guid isPermaLink="false"><TMPL_VAR GUID></guid>
+<TMPL_ELSE>
+       <guid isPermaLink="false"><TMPL_VAR URL></guid>
+</TMPL_IF>
        <link><TMPL_VAR PERMALINK></link>
-       <TMPL_IF NAME="CATEGORIES">
-       <TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF AUTHOR>
+       <dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
+</TMPL_IF>
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
        <category><TMPL_VAR CATEGORY></category>
-       </TMPL_LOOP>
-       </TMPL_IF>
-       <pubDate><TMPL_VAR DATE_822></pubDate>
-       <TMPL_IF NAME="ENCLOSURE">
+</TMPL_LOOP>
+</TMPL_IF>
+       <pubDate><TMPL_VAR CDATE_822></pubDate>
+       <dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
+<TMPL_IF ENCLOSURE>
        <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
-       <TMPL_ELSE>
-       <description><![CDATA[<TMPL_VAR CONTENT>]]></description>
-       </TMPL_IF>
+</TMPL_IF>
+<TMPL_UNLESS SIMPLEPODCAST>
+       <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+</TMPL_UNLESS>
+<TMPL_IF COMMENTSURL>
+       <comments><TMPL_VAR COMMENTSURL></comments>
+</TMPL_IF>
 </item>