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

[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 da40f5a4d64a16133f15b6083f9711c886ecc7a2..609dbcede69da11ab47d5af6acb772fb02ac277f 100644 (file)
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% 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>
   <ul class='secondary-actions clearfix'>
     <li><%= t(".description") %></li>
     <li><%= rss_link_to :action => "georss", :display_name => @display_name, :tag => @tag %></li>


@@ -25,13 +25,7 @@
 <% if @traces.size > 0 %>
   <%= render :partial => "trace_paging_nav" %>
 
 <% if @traces.size > 0 %>
   <%= render :partial => "trace_paging_nav" %>
 

-  <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 @traces unless @traces.nil? %>
     </tbody>
     <tbody>
       <%= render @traces unless @traces.nil? %>
     </tbody>


@@ -41,5 +35,3 @@
 <% else %>
   <h4><%= t ".empty_html", :upload_link => new_trace_path %></h4>
 <% end %>
 <% else %>
   <h4><%= t ".empty_html", :upload_link => new_trace_path %></h4>
 <% end %>

-
-<%= render :partial => "trace_optionals" %>