Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[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 51752a246603773b2e2da2f15ea402ae847015ff..1e89e963ddf7372b5afd9caae1da65bc4cdd77fe 100644 (file)
--- a/app/views/trace/list.html.erb
+++ b/app/views/trace/list.html.erb
@@ -1,3 +1,45 @@
-<%= render :partial => 'trace_header' %>
+<% content_for :heading do %>
+  <h1><%= h(@title) %></h1>
+  <ul class='secondary-actions clearfix'>
+    <li><%= t('trace.list.description') %></li>
+    <li><%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %></li>
+    <li><%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %></li>
+    <% if @tag %>
+      <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
+      <li><%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
+    <% else %>
+      <% if @display_name %>
+        <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
+      <% end %>
+      <%= unless_user(@target_user, :li) do %>
+        <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
+      <% end %>
+    <% end %>
+  </ul>
+<% end %>
 
-<%= render :partial => 'trace_list' %>
+<% content_for :auto_discovery_link_tag do %>
+<%= auto_discovery_link_tag :rss, :action => 'georss', :display_name => @display_name, :tag => @tag %>
+<% end %>
+
+<% if @traces.size > 0 %>
+  <%= render :partial => 'trace_paging_nav' %>
+
+  <table id="trace_list" cellpadding="3">
+    <thead>
+      <tr>
+        <th></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render :partial => 'trace', :collection => @traces unless @traces.nil? %>
+    </tbody>
+  </table>
+
+  <%= render :partial => 'trace_paging_nav' %>
+<% else %>
+  <h4><%= t 'trace.list.empty_html', :upload_link => trace_create_path %></h4>
+<% end %>
+
+<%= render :partial => 'trace_optionals' %>