Convert history page to sidebar layout

[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 0333be5ccde010e7bb6cc0d322598eff06832362..262cae15ff56bdc194f5e1a14edc3beb104693c4 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,12 +1,23 @@
-<h1><%= @heading %></h1>
-<p><%= @description %></p>
+<% content_for :head do -%>
+  <%= javascript_include_tag "index" %>
+  <%= javascript_include_tag "changeset" %>
 
-<%= render :partial => 'changeset_paging_nav' %>
-<%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
-<%= render :partial => 'changeset_paging_nav' %>
+  <% unless params[:friends] or params[:nearby] -%>
+    <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
+  <% end -%>
+<% end -%>
 
-<%= atom_link_to params.merge({ :page => nil, :format => :atom }) %>
+<% content_for :sidebar do %>
+  <h2><%= @heading %></h2>
 
-<% content_for :head do %>
-<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :format => :atom }) %>
+  <% if @edits.size > 0 %>
+    <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
+    <%= 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 %>
+
+<%= render :template => 'layouts/map' %>