X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=templates%2Fatomitem.tmpl;h=768695a2ca0d434e376cdf1b1de7325376b5aa49;hb=527d178c12141d2467dfa86492e249d021b88997;hp=e0f7bb4f9bddd613f8468934cdb14de195e90f47;hpb=be55f6fd7cf1a251c3977f857a44ee2769e39d8b;p=ikiwiki.git

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index e0f7bb4f9..768695a2c 100644
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,20 +1,48 @@
 <entry>
-	<title><TMPL_VAR TITLE ESCAPE=HTML></title>
-	<TMPL_IF NAME="AUTHOR">
-	<author><TMPL_VAR AUTHOR ESCAPE=HTML></author>
+	<title><TMPL_VAR TITLE></title>
+	<TMPL_IF NAME="GUID">
+	  <id><TMPL_VAR GUID></id>
 	<TMPL_ELSE>
+	  <id><TMPL_VAR URL></id>
 	</TMPL_IF>
-	<id><TMPL_VAR URL></id>
 	<link href="<TMPL_VAR PERMALINK>"/>
+	<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><TMPL_VAR CATEGORY></category>
-	</TMPL_LOOP>
+	 <TMPL_LOOP NAME="CATEGORIES">
+	  <category term="<TMPL_VAR CATEGORY>" />
+	 </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>" />
+	<TMPL_ELSE>
+	 <content type="html" xml:lang="en">
+	  <TMPL_VAR CONTENT ESCAPE=HTML>
+	 </content>
+	</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>
-	<updated><TMPL_VAR DATE_3339></updated>
-	<content type="xhtml" xml:lang="en">
-	 <div xmlns="http://www.w3.org/1999/xhtml">
-	 ![CDATA[<TMPL_VAR CONTENT>]]
-	 </div>
-	</content>
 </entry>