Added natural=atoll to en.yml

[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 d2f22c0695ee0e17e25e6e196560c4a27b578550..b38436c0a4c5d3ac8e156537108620cb527a0e0a 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>


@@ -23,21 +23,15 @@
 <% end %>
 
 <% if @traces.size > 0 %>
 <% 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" class="table table-borderless table-striped">
 
   <table id="trace_list" class="table table-borderless table-striped">

-    <thead>
-      <tr>
-        <th></th>
-        <th></th>
-      </tr>
-    </thead>

     <tbody>
     <tbody>

-      <%= render @traces unless @traces.nil? %>
+      <%= render @traces %>

     </tbody>
   </table>
 
     </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>
 <% end %>
 <% else %>
   <h4><%= t ".empty_html", :upload_link => new_trace_path %></h4>
 <% end %>