Wrap GPX API calls with the API error handler, and make sure the create

[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 960ce0ce278e83ba94f2fed050e9ae1494634e49..d9d53593c2dd8f047c25999e2eb1e7338c5d30d7 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,6 +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.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")


@@ -55,13 +62,13 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
             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