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

[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 9db246bd45149cd67180ccfdcf4de801ca023a9a..86ac37f00fe44040982e090fff994d1b2c281a0b 100644 (file)
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -1,5 +1,5 @@
 <% 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>
@@ -25,7 +25,7 @@
 <% if @traces.size > 0 %>
   <%= render :partial => "trace_paging_nav" %>
 
-  <table id="trace_list" cellpadding="3">
+  <table id="trace_list" class="table table-borderless table-striped">
     <thead>
       <tr>
         <th></th>
@@ -33,7 +33,7 @@
       </tr>
     </thead>
     <tbody>
-      <%= render :partial => "trace", :collection => @traces unless @traces.nil? %>
+      <%= render @traces unless @traces.nil? %>
     </tbody>
   </table>
 
@@ -41,5 +41,3 @@
 <% else %>
   <h4><%= t ".empty_html", :upload_link => new_trace_path %></h4>
 <% end %>
-
-<%= render :partial => "trace_optionals" %>