Merge branch 'master' into notes

[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..8ecdda9468fa15ba77d8c9c440467417608f7b13 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,12 +1,35 @@
-<h1><%= @title %></h1>
-<p><%= @description %></p>
+<% content_for :head do -%>
+  <%= javascript_include_tag "changeset" %>
+<% end -%>
 
-<%= render :partial => 'changeset_paging_nav' %>
-<%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
-<%= render :partial => 'changeset_paging_nav' %>
+<% content_for :heading do %>
 
-<%= atom_link_to params.merge({ :format => :atom }) %>
+  <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>
 
-<% content_for :head do %>
-<%= auto_discovery_link_tag :atom, params.merge({ :format => :atom }) %>
 <% end %>
+
+<%= render :partial => 'changeset_paging_nav' %>
+
+<% if @edits.size > 0 %>
+  <%= render :partial => 'map' %>
+  <div class='column-1'>
+    <%= 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>
+<% 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