Rework notes interface using OpenLayers and rails

[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 0fcf5ddda4af872576ceb4f38f73fd88eecf750e..22a798ffe25f4b89db1efa532bb9ea6bff2aa074 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,12 +1,17 @@
-<h1><%= @title %></h1>
+<h1><%= @heading %></h1>

 <p><%= @description %></p>
 
 <%= render :partial => 'changeset_paging_nav' %>
 <p><%= @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' %>
 
 <%= render :partial => 'changeset_paging_nav' %>
 

-<%= atom_link_to params.merge({ :format => :atom }) %>
+<%= atom_link_to params.merge({ :page => nil, :format => :atom }) %>

 
 <% content_for :head do %>
 
 <% content_for :head do %>

-<%= auto_discovery_link_tag :atom, params.merge({ :format => :atom }) %>
+<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :format => :atom }) %>

 <% end %>
 <% end %>