Drop with_format and user the new :formats render option instead

[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 6da108026608669999779a05618ea5e7a7a26b92..bf8adbe20a333d96df02fef1b64d09260f7d3916 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,12 +1,19 @@
 <h1><%= @heading %></h1>
-<p><%= @description %></p>
+<p><%= raw(@description) %></p>
 
 <%= 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({ :format => :atom }) %>
+<% unless params[:friends] or params[:nearby] -%>
+<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>
 
-<% content_for :head do %>
-<%= auto_discovery_link_tag :atom, params.merge({ :format => :atom }) %>
-<% end %>
+<% content_for :head do -%>
+<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
+<% end -%>
+<% end -%>