Merge commit 'upstream/master' into pub/master

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

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 421600591ea50189a2e38a06b4d3a13003df2444..42936a668f591bf7cf1a9a23fae4e076e3e48988 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,12 +1,26 @@
 <item>
 <item>

-       <title><TMPL_VAR TITLE ESCAPE=HTML></title>
-       <guid><TMPL_VAR URL></guid>
-       <link><TMPL_VAR URL></link>
+       <TMPL_IF NAME="AUTHOR">
+       <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></title>
+       </TMPL_IF>
+       <TMPL_IF NAME="GUID">
+         <guid isPermaLink="no"><TMPL_VAR GUID></guid>
+       <TMPL_ELSE>
+         <guid><TMPL_VAR URL></guid>
+       </TMPL_IF>
+       <link><TMPL_VAR PERMALINK></link>

        <TMPL_IF NAME="CATEGORIES">
        <TMPL_LOOP NAME="CATEGORIES">
        <TMPL_IF NAME="CATEGORIES">
        <TMPL_LOOP NAME="CATEGORIES">

-       <category><TMPL_VAR NAME=CATEGORY></category>
+       <category><TMPL_VAR CATEGORY></category>

        </TMPL_LOOP>
        </TMPL_IF>
        </TMPL_LOOP>
        </TMPL_IF>

-       <pubDate><TMPL_VAR PUBDATE></pubDate>
-       <description><![CDATA[<TMPL_VAR CONTENT>]]></description>
+       <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>
+       <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+       </TMPL_IF>

 </item>
 </item>