Merge branch 'master' into openstreetbugs

[rails.git] / app / views / changeset / list.html.erb

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index 4ec450c2cfe9f8835f97f2ee04b72cbfe8a14512..5d12aa83794bb1cb7a8a2344acddc298e7f44b00 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,13 +1,17 @@
 <h1><%= @heading %></h1>
-<p><%= @description %></p>
+<p><%= raw(@description) %></p>
 
-<%= render :partial => 'map' %>
 <%= render :partial => 'changeset_paging_nav' %>
-<%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
+
+<div id="changeset_list_container">
+  <%= render :partial => 'map' %>
+  <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
+</div>
+
 <%= render :partial => 'changeset_paging_nav' %>
 
-<%= atom_link_to params.merge({ :page => nil, :format => :atom }) %>
+<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>
 
 <% content_for :head do %>
-<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :format => :atom }) %>
+<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
 <% end %>