Fix display of browsed objects on map

[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 8ecdda9468fa15ba77d8c9c440467417608f7b13..262cae15ff56bdc194f5e1a14edc3beb104693c4 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,35 +1,23 @@
 <% content_for :head do -%>
 <% content_for :head do -%>

+  <%= javascript_include_tag "index" %>

   <%= javascript_include_tag "changeset" %>
   <%= javascript_include_tag "changeset" %>

-<% end -%>
-
-<% content_for :heading do %>
-
-  <h1><%= @heading %></h1>
-  <ul class='secondary-actions clearfix'>
-    <li><%= raw(@description) %></li>
-    <% unless params[:friends] or params[:nearby] -%>
-      <li><%= atom_link_to params.merge({ :page => nil, :action => :feed }) %></li>
-    <% end -%>
-  </ul>

 
 

-<% end %>
+  <% unless params[:friends] or params[:nearby] -%>
+    <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
+  <% end -%>
+<% end -%>

 
 

-<%= render :partial => 'changeset_paging_nav' %>
+<% content_for :sidebar do %>
+  <h2><%= @heading %></h2>

 
 

-<% if @edits.size > 0 %>
-  <%= render :partial => 'map' %>
-  <div class='column-1'>
+  <% if @edits.size > 0 %>

     <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
     <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>

-  </div>
-  <%= render :partial => 'changeset_paging_nav' %>
-<% elsif @user and @user.display_name == params[:display_name] %>
-  <h4><%= t('changeset.list.empty_user_html') %></h4>
-<% else %>
-  <h4><%= t('changeset.list.empty_anon_html') %></h4>
+    <%= render :partial => 'changeset_paging_nav' %>
+  <% elsif @user and @user.display_name == params[:display_name] %>
+    <h4><%= t('changeset.list.empty_user_html') %></h4>
+  <% else %>
+    <h4><%= t('changeset.list.empty_anon_html') %></h4>
+  <% end %>

 <% end %>
 
 <% end %>
 

-<% unless params[:friends] or params[:nearby] -%>
-  <% content_for :head do -%>
-    <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
-  <% end -%>
-<% end -%>
\ No newline at end of file
+<%= render :template => 'layouts/map' %>