Merge branch 'master' into openstreetbugs

[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 16f2cbfdad5d9d08978ed0bbbb5229756d4dc7f4..d9d53593c2dd8f047c25999e2eb1e7338c5d30d7 100644 (file)
--- a/app/views/changeset/list.atom.builder
+++ b/app/views/changeset/list.atom.builder
@@ -3,7 +3,13 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
           :root_url => url_for(params.merge({ :only_path => false, :format => nil })),
           "xmlns:georss" => "http://www.georss.org/georss") do |feed|
   feed.title @title
           :root_url => url_for(params.merge({ :only_path => false, :format => nil })),
           "xmlns:georss" => "http://www.georss.org/georss") do |feed|
   feed.title @title

-  feed.subtitle @description
+
+  feed.subtitle :type => 'xhtml' do |xhtml|
+    xhtml.p do |p|
+      p << @description
+    end
+  end
+

   feed.updated @edits.map {|e|  [e.created_at, e.closed_at].max }.max
   feed.icon "http://#{SERVER_URL}/favicon.ico"
   feed.logo "http://#{SERVER_URL}/images/mag_map-rss2.0.png"
   feed.updated @edits.map {|e|  [e.created_at, e.closed_at].max }.max
   feed.icon "http://#{SERVER_URL}/favicon.ico"
   feed.logo "http://#{SERVER_URL}/images/mag_map-rss2.0.png"


@@ -23,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|


@@ -32,8 +42,40 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
         end
       end
 
         end
       end
 

-      if changeset.tags['comment']
-        feed.content changeset.tags['comment']
+      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")
+            tr.td l(changeset.created_at)
+          end
+          table.tr do |tr|
+            tr.th t("browse.changeset_details.closed_at")
+            tr.td l(changeset.closed_at)
+          end
+          if changeset.user.data_public?
+            table.tr do |tr|
+              tr.th t("browse.changeset_details.belongs_to")
+              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?
+            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])} = #{auto_link(h(tag[1]))}"
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end

       end
 
       unless changeset.min_lat.nil?
       end
 
       unless changeset.min_lat.nil?