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

[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 7adcb3b5245309c17693cabaea040e3170d8f8d7..6ff2ed9f363b1305440851bc3cc61ed45d696c06 100644 (file)
--- a/app/views/diary_entry/rss.rss.builder
+++ b/app/views/diary_entry/rss.rss.builder
@@ -1,29 +1,30 @@
 xml.instruct!
 
 xml.rss("version" => "2.0",
 xml.instruct!
 
 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", :host => SERVER_URL)
+    xml.link url_for(:action => "list", :only_path => false)

     xml.image do
     xml.image do

-      xml.url image_path("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", :host => SERVER_URL)
+      xml.link url_for(:action => "list", :only_path => false)

     end
 
     @entries.each do |entry|
       xml.item do
     end
 
     @entries.each do |entry|
       xml.item do

-        xml.title h(entry.title)
-        xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
-        xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
+        xml.title 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 entry.body.to_html
         xml.description entry.body.to_html

-        xml.author entry.user.display_name
+        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", :host => SERVER_URL)
+        xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :only_path => false)

 
         if entry.latitude && entry.longitude
           xml.geo :lat, entry.latitude.to_s
 
         if entry.latitude && entry.longitude
           xml.geo :lat, entry.latitude.to_s