app/views/wiki/rss_feed.rhtml in Pimki-1.6.092 vs app/views/wiki/rss_feed.rhtml in Pimki-1.7.092

@@ -4,10 +4,55 @@
 		<title><%= @web.name %></title>
 		<link><%= "#{@web_url}/show/HomePage" %></link>
 		<description>Pimki - a PIM based on Instiki's wiki technology</description>
 		<language>en-us</language>
 		<ttl>40</ttl>
+<% if @display_todo
+     FAR_FUTURE = Date.new(4000,1,1)
+%>
+  <% @todo_items.each do |page, items| %>
+    <item>
+      <title><%= page.plain_name %></title>
+      <description>
+        <ul>
+        <% items.each do |item| %>
+          <li>
+            <small><%=
+              x = "[#{item.context.join(', ') unless item.context.empty?}#{ " - " unless item.context.empty? or item.due_date == FAR_FUTURE}#{item.due_date unless item.due_date == FAR_FUTURE }]"
+              x unless x == "[]"
+            %></small><br />
+            <span class="<%= get_todo_display_style item.due_date %>"><%= item.text.strip.gsub(/<.*?>/, '') %></span>
+          </li>
+        <% end %>
+        </ul>
+      </description>
+      <guid><%= "#{@web_url}/show/#{page.name}" %></guid>
+      <link><%= "#{@web_url}/show/#{page.name}" %></link>
+      <dc:creator><%= WikiWords.separate(page.author) %></dc:creator>
+    </item>
+  <% end %>
+  <% @bliki_todo_items.each do |page, items| %>
+    <item>
+      <title><%= page.plain_name %></title>
+      <description>
+        <ul>
+          <% items.each do |item| %>
+            <small><%=
+              x = "[#{item.context.join(', ') unless item.context.empty?}#{ " - " if not item.context.empty? or item.due_date == FAR_FUTURE}#{item.due_date unless item.due_date == FAR_FUTURE }]<br />"
+              x unless x == "[]<br />"
+            %></small>
+            <span class="<%= get_todo_display_style item.due_date %>"><%= item.text.strip.gsub(/<.*?>/, '') %></span>
+          <% end %>
+        </ul>
+      </description>
+      <pubDate><%= ctime = entry.created_at; ctime.strftime "%a, %e %b %Y %H:%M:%S #{ctime.gmt_offset/3600}" %></pubDate>
+      <guid><%= "#{@web_url}/bliki_revision/#{entry.name}?rev=#{entry.revisions.length-1}" %></guid>
+      <link><%= "#{@web_url}/bliki_revision/#{entry.name}?rev=#{entry.revisions.length-1}" %></link>
+      <dc:creator><%= WikiWords.separate(entry.author) %></dc:creator>
+    </item>
+  <% end %>
+<% else %>
   <% for entry in @bliki_entries %>
     <item>
       <title>Bliki: <%= entry.plain_name %></title>
     <% unless @hide_description %>
       <description><%= CGI.escapeHTML(entry.display_content) %></description>
@@ -28,7 +73,8 @@
       <guid><%= "#{@web_url}/show/#{page.name}" %></guid>
       <link><%= "#{@web_url}/show/#{page.name}" %></link>
       <dc:creator><%= WikiWords.separate(page.author) %></dc:creator>
     </item>
   <% end %>
+<% end %>
   </channel>
 </rss>
\ No newline at end of file