Merge branch 'master' into openstreetbugs

[rails.git] / app / views / trace / list.html.erb

diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb
index a954dd76632d4cfbfb1a3879be44541b2bc1c32b..31ea0eb3ae100d49302ceafa93f5a3da935d3d1b 100644 (file)
--- a/app/views/trace/list.html.erb
+++ b/app/views/trace/list.html.erb
@@ -1,5 +1,35 @@
-<%= render :partial => 'trace_header' %>
-<% if_user(@target_user) do %>
-  <%= render :partial => 'trace_form' %>
+<h1><%= h(@title) %></h1>
+
+<% content_for :head do %>
+<%= auto_discovery_link_tag :atom, :action => 'georss', :display_name => @display_name, :tag => @tag %>
 <% end %>
-<%= render :partial => 'trace_list' %>
+
+<p>
+  <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>
+  | <%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %>
+  <% if @tag %>
+    | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>
+    | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
+  <% else %>
+    <% if @display_name %>
+      | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>
+    <% end %>
+    <% unless_user(@target_user, :span) do %>
+      | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
+    <% end %>
+  <% end %>
+</p>
+
+<%= render :partial => 'trace_paging_nav' %>
+
+<table id="trace_list" cellpadding="3">
+  <tr>
+    <th></th>
+    <th></th>
+  </tr>
+  <%= render :partial => 'trace', :collection => @traces unless @traces.nil? %>
+</table>
+
+<%= render :partial => 'trace_paging_nav' %>
+
+<%= render :partial => 'trace_optionals' %>