Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 9190fcc842d3ffe8bdec47935ec333ae0be8bf49..87cbee9e0877ea20cdcb4922911207804ed63a61 100644 (file)
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,24 +1,48 @@
 <entry>
        <title><TMPL_VAR TITLE></title>
 <entry>
        <title><TMPL_VAR TITLE></title>

-       <TMPL_IF NAME="AUTHOR">
-       <author><TMPL_VAR AUTHOR ESCAPE=HTML></author>
-       <TMPL_ELSE>
-       </TMPL_IF>
+<TMPL_IF NAME="GUID">
+       <id><TMPL_VAR GUID></id>
+<TMPL_ELSE>

        <id><TMPL_VAR URL></id>
        <id><TMPL_VAR URL></id>

+</TMPL_IF>

        <link href="<TMPL_VAR PERMALINK>"/>
        <link href="<TMPL_VAR PERMALINK>"/>

-       <TMPL_IF NAME="CATEGORIES">
-       <TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF NAME="AUTHOR">
+       <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
+</TMPL_IF>
+<TMPL_IF NAME="COPYRIGHT">
+       <rights type="html" xml:lang="en">
+<TMPL_IF NAME="LICENSE">
+               <TMPL_VAR LICENSE ESCAPE=HTML>
+               <TMPL_VAR COPYRIGHT ESCAPE=HTML>
+<TMPL_ELSE>
+               <TMPL_VAR COPYRIGHT ESCAPE=HTML>
+</TMPL_IF>
+       </rights>
+<TMPL_ELSE>
+<TMPL_IF NAME="LICENSE">
+       <rights type="html" xml:lang="en">
+       <TMPL_VAR LICENSE ESCAPE=HTML>
+       </rights>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF NAME="CATEGORIES">
+<TMPL_LOOP NAME="CATEGORIES">

        <category term="<TMPL_VAR CATEGORY>" />
        <category term="<TMPL_VAR CATEGORY>" />

-       </TMPL_LOOP>
-       </TMPL_IF>
-       <updated><TMPL_VAR DATE_3339></updated>
-       <TMPL_IF NAME="ENCLOSURE">
+</TMPL_LOOP>
+</TMPL_IF>
+       <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>
+<TMPL_ELSE>
+       <content type="html" xml:lang="en">
+       <TMPL_VAR CONTENT ESCAPE=HTML>

        </content>
        </content>

-       </TMPL_IF>
+</TMPL_IF>
+<TMPL_IF NAME="COMMENTSURL">
+       <link rel="comments" href="<TMPL_VAR NAME="COMMENTSURL">" type="text/html" />
+</TMPL_IF>
+<TMPL_IF NAME="ATOMCOMMENTSURL">
+       <link rel="comments" href="<TMPL_VAR NAME="ATOMCOMMENTSURL">" type="application/atom+xml" />
+</TMPL_IF>

 </entry>
 </entry>