Make linkify preserve HTML safety

[rails.git] / app / views / changeset / list.atom.builder

diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder
index 650ef43756c984f80f063dcb501ed43858fc1cab..9512ef827dece7ffdd26a597afc91c4817b97e54 100644 (file)
--- a/app/views/changeset/list.atom.builder
+++ b/app/views/changeset/list.atom.builder
@@ -5,7 +5,9 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
   feed.title @title
 
   feed.subtitle :type => 'xhtml' do |xhtml|
   feed.title @title
 
   feed.subtitle :type => 'xhtml' do |xhtml|

-    xhtml.p @description
+    xhtml.p do |p|
+      p << @description
+    end

   end
 
   feed.updated @edits.map {|e|  [e.created_at, e.closed_at].max }.max
   end
 
   feed.updated @edits.map {|e|  [e.created_at, e.closed_at].max }.max


@@ -27,7 +29,11 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
                  :href => changeset_download_url(changeset, :only_path => false),
                  :type => "application/osmChange+xml"
 
                  :href => changeset_download_url(changeset, :only_path => false),
                  :type => "application/osmChange+xml"
 

-      entry.title t('browse.changeset.title') + " " + h(changeset.id)
+      if !changeset.tags.empty? and changeset.tags.has_key? "comment"
+        entry.title t('browse.changeset.feed.title_comment', :id => h(changeset.id), :comment => h(changeset.tags['comment'])), :type => "html"
+      else
+        entry.title t('browse.changeset.feed.title', :id => h(changeset.id))
+      end

 
       if changeset.user.data_public?
         entry.author do |author|
 
       if changeset.user.data_public?
         entry.author do |author|


@@ -37,7 +43,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
       end
 
       feed.content :type => 'xhtml' do |xhtml|
       end
 
       feed.content :type => 'xhtml' do |xhtml|

-        xhtml.h2 t("browse.changeset.changeset", :id => changeset.id)
+        xhtml.style "th { text-align: left } tr { vertical-align: top }"

         xhtml.table do |table|
           table.tr do |tr|
             tr.th t("browse.changeset_details.created_at")
         xhtml.table do |table|
           table.tr do |tr|
             tr.th t("browse.changeset_details.created_at")


@@ -50,17 +56,19 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
           if changeset.user.data_public?
             table.tr do |tr|
               tr.th t("browse.changeset_details.belongs_to")
           if changeset.user.data_public?
             table.tr do |tr|
               tr.th t("browse.changeset_details.belongs_to")

-              tr.td link_to(h(changeset.user.display_name), :controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false)
+              tr.td do |td|
+                td.a h(changeset.user.display_name), :href => url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false)
+              end

             end
           end
           unless changeset.tags.empty?
             end
           end
           unless changeset.tags.empty?

-            table.tr :valign => "top" do |tr|
+            table.tr do |tr|

               tr.th t("browse.tag_details.tags")
               tr.td do |td|
                 td.table :cellpadding => "0" do |table|
                   changeset.tags.sort.each do |tag|
                     table.tr do |tr|
               tr.th t("browse.tag_details.tags")
               tr.td do |td|
                 td.table :cellpadding => "0" do |table|
                   changeset.tags.sort.each do |tag|
                     table.tr do |tr|

-                      tr.td "#{h(tag[0])} = #{sanitize(auto_link(tag[1]))}"
+                      tr.td << "#{h(tag[0])} = #{auto_link(h(tag[1]))}"

                     end
                   end
                 end
                     end
                   end
                 end


@@ -70,15 +78,12 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
         end
       end
 
         end
       end
 

-      unless changeset.min_lat.nil?
-        minlon = changeset.min_lon/GeoRecord::SCALE.to_f
-        minlat = changeset.min_lat/GeoRecord::SCALE.to_f
-        maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
-        maxlat = changeset.max_lat/GeoRecord::SCALE.to_f
+      if changeset.has_valid_bbox?
+        bbox = changeset.bbox.to_unscaled

 
         # See http://georss.org/Encodings#Geometry
 
         # See http://georss.org/Encodings#Geometry

-        lower_corner = "#{minlat} #{minlon}"
-        upper_corner = "#{maxlat} #{maxlon}"
+        lower_corner = "#{bbox.min_lat} #{bbox.min_lon}"
+        upper_corner = "#{bbox.max_lat} #{bbox.max_lon}"

 
         feed.georss :box, lower_corner + " " + upper_corner
       end
 
         feed.georss :box, lower_corner + " " + upper_corner
       end