Merge remote-tracking branch 'upstream/pull/1985'

[rails.git] / app / views / diary_entry / rss.rss.builder

diff --git a/app/views/diary_entry/rss.rss.builder b/app/views/diary_entry/rss.rss.builder
index 4c9670a6d5f118230a536fe24961723cf769fb88..be627437dd9b0ea8efb863e7d845f364dbfdeb1c 100644 (file)
--- a/app/views/diary_entry/rss.rss.builder
+++ b/app/views/diary_entry/rss.rss.builder
@@ -1,34 +1,35 @@
 xml.instruct!
 
 xml.instruct!
 

-xml.rss("version" => "2.0", 
+xml.rss("version" => "2.0",
+        "xmlns:dc" => "http://purl.org/dc/elements/1.1/",

         "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
     xml.title @title
     xml.description @description
         "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
     xml.title @title
     xml.description @description

-    xml.link url_for(:action => "list", :only_path => false)
+    xml.link url_for(:action => "index", :only_path => false)

     xml.image do
     xml.image do

-      xml.url "http://www.openstreetmap.org/images/mag_map-rss2.0.png"
-      xml.title "OpenStreetMap"
+      xml.url image_url("mag_map-rss2.0.png")
+      xml.title @title

       xml.width "100"
       xml.height "100"
       xml.width "100"
       xml.height "100"

-      xml.link url_for(:action => "list", :only_path => false)
+      xml.link url_for(:action => "index", :only_path => false)

     end
 
     end
 

-    for entry in @entries
+    @entries.each do |entry|

       xml.item do
       xml.item do

-        xml.title h(entry.title)
-        xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
-        xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
-        xml.description htmlize(entry.body)
-        xml.author entry.user.display_name
+        xml.title entry.title
+        xml.link diary_entry_url(entry.user, entry, :only_path => false)
+        xml.guid diary_entry_url(entry.user, entry, :only_path => false)
+        xml.description entry.body.to_html
+        xml.dc :creator, entry.user.display_name

         xml.pubDate entry.created_at.to_s(:rfc822)
         xml.pubDate entry.created_at.to_s(:rfc822)

-        xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :only_path => false)
-        
-        if entry.latitude and entry.longitude
+        xml.comments diary_entry_url(entry.user, entry, :anchor => "comments", :only_path => false)
+
+        if entry.latitude && entry.longitude

           xml.geo :lat, entry.latitude.to_s
           xml.geo :long, entry.longitude.to_s
           xml.geo :lat, entry.latitude.to_s
           xml.geo :long, entry.longitude.to_s

-          xml.georss :point, "#{entry.latitude.to_s} #{entry.longitude.to_s}"
+          xml.georss :point, "#{entry.latitude} #{entry.longitude}"

         end
       end
     end
         end
       end
     end