Only show each note once is the user notes view

[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 22a798ffe25f4b89db1efa532bb9ea6bff2aa074..8ecdda9468fa15ba77d8c9c440467417608f7b13 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,17 +1,35 @@
-<h1><%= @heading %></h1>
-<p><%= @description %></p>
+<% content_for :head do -%>
+  <%= javascript_include_tag "changeset" %>
+<% end -%>

 
 

-<%= render :partial => 'changeset_paging_nav' %>
+<% content_for :heading do %>

 
 

-<div id="changeset_list_container">
-  <%= render :partial => 'map' %>
-  <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
-</div>
+  <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>

 
 

-<%= render :partial => 'changeset_paging_nav' %>
+<% end %>

 
 

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

 
 

-<% content_for :head do %>
-<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :format => :atom }) %>
+<% 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 %>
 <% 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