Merge branch 'master' into convert_roundabout_exits

[rails.git] / app / views / trace / georss.rss.builder

diff --git a/app/views/trace/georss.rss.builder b/app/views/trace/georss.rss.builder
index 0b2e26d11e66e49b9c52cef2f2982aebcb53134b..984284174bb66994f48bd61d000fb62b7b8273f4 100644 (file)
--- a/app/views/trace/georss.rss.builder
+++ b/app/views/trace/georss.rss.builder
@@ -1,16 +1,16 @@
 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
         "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 t("trace.georss.title")
-    xml.description t("trace.georss.title")
+    xml.title t(".title")
+    xml.description t(".title")

     xml.link url_for(:controller => :trace, :action => :list, :only_path => false)
 
     xml.image do
     xml.link url_for(:controller => :trace, :action => :list, :only_path => false)
 
     xml.image do

-      xml.url image_path("mag_map-rss2.0.png")
+      xml.url image_url("mag_map-rss2.0.png")

       xml.title t("trace.georss.title")
       xml.width 100
       xml.height 100
       xml.title t("trace.georss.title")
       xml.width 100
       xml.height 100


@@ -25,14 +25,14 @@ xml.rss("version" => "2.0",
         xml.guid url_for(:controller => :trace, :action => :view, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
 
         xml.description do
         xml.guid url_for(:controller => :trace, :action => :view, :id => trace.id, :display_name => trace.user.display_name, :only_path => false)
 
         xml.description do

-          xml.cdata! render(:partial => "description", :object => trace, :formats => [ :html ])
+          xml.cdata! render(:partial => "description", :object => trace, :formats => [:html])

         end
 
         xml.dc :creator, trace.user.display_name
 
         xml.pubDate trace.timestamp.to_s(:rfc822)
 
         end
 
         xml.dc :creator, trace.user.display_name
 
         xml.pubDate trace.timestamp.to_s(:rfc822)
 

-        if trace.latitude and trace.longitude
+        if trace.latitude && trace.longitude

           xml.geo :lat, trace.latitude
           xml.geo :long, trace.longitude
           xml.georss :point, "#{trace.latitude} #{trace.longitude}"
           xml.geo :lat, trace.latitude
           xml.geo :long, trace.longitude
           xml.georss :point, "#{trace.latitude} #{trace.longitude}"