Merge remote-tracking branch 'upstream/pull/3138'

[rails.git] / app / views / traces / index.html.erb

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 0fcaeb6f7e6e8c430bab3797fb9b7e4493ac5452..b38436c0a4c5d3ac8e156537108620cb527a0e0a 100644 (file)
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -1,45 +1,37 @@
 <% content_for :heading do %>
-  <h1><%= h(@title) %></h1>
+  <h1><%= @title %></h1>
   <ul class='secondary-actions clearfix'>
-    <li><%= t('.description') %></li>
-    <li><%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %></li>
-    <li><%= link_to t('.upload_trace'), new_trace_path %></li>
+    <li><%= t(".description") %></li>
+    <li><%= rss_link_to :action => "georss", :display_name => @display_name, :tag => @tag %></li>
+    <li><%= link_to t(".upload_trace"), new_trace_path %></li>
     <% if @tag %>
-      <li><%= link_to t('.see_all_traces'), :controller => 'traces', :action => 'index', :display_name => nil, :tag => nil, :page => nil %></li>
-      <li><%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
+      <li><%= link_to t(".see_all_traces"), :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil %></li>
+      <li><%= link_to t(".see_my_traces"), :action => "mine", :tag => nil, :page => nil %></li>
     <% else %>
       <% if @display_name %>
-        <li><%= link_to t('.see_all_traces'), :controller => 'traces', :action => 'index', :display_name => nil, :tag => nil, :page => nil %></li>
+        <li><%= link_to t(".see_all_traces"), :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil %></li>
       <% end %>
       <% if current_user && current_user != @target_user %>
-        <li><%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
+        <li><%= link_to t(".see_my_traces"), :action => "mine", :tag => nil, :page => nil %></li>
       <% end %>
     <% end %>
   </ul>
 <% end %>
 
 <% content_for :auto_discovery_link_tag do %>
-<%= auto_discovery_link_tag :rss, :action => 'georss', :display_name => @display_name, :tag => @tag %>
+<%= auto_discovery_link_tag :rss, :action => "georss", :display_name => @display_name, :tag => @tag %>
 <% end %>
 
 <% if @traces.size > 0 %>
-  <%= render :partial => 'trace_paging_nav' %>
+  <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %>
 
-  <table id="trace_list" cellpadding="3">
-    <thead>
-      <tr>
-        <th></th>
-        <th></th>
-      </tr>
-    </thead>
+  <table id="trace_list" class="table table-borderless table-striped">
     <tbody>
-      <%= render :partial => 'trace', :collection => @traces unless @traces.nil? %>
+      <%= render @traces %>
     </tbody>
   </table>
 
-  <%= render :partial => 'trace_paging_nav' %>
+  <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %>
 <% else %>
-  <h4><%= t '.empty_html', :upload_link => new_trace_path %></h4>
+  <h4><%= t ".empty_html", :upload_link => new_trace_path %></h4>
 <% end %>
-
-<%= render :partial => 'trace_optionals' %>