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

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

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index 8b754a591d35803eb2312378fa8d8897cc8f1d2d..c2f4183eb433df939a52300a996fbc453a6fd21c 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -1,6 +1,5 @@
 <tr>
 <tr>

-  <% cl = cycle("table0", "table1") %>
-  <td class="<%= cl %>">
+  <td>

     <% if Settings.status != "gpx_offline" %>
       <% if trace.inserted %>
         <a href="<%= url_for :controller => "traces", :action => "show", :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => "traces", :action => "icon", :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>
     <% if Settings.status != "gpx_offline" %>
       <% if trace.inserted %>
         <a href="<%= url_for :controller => "traces", :action => "show", :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => "traces", :action => "icon", :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>


@@ -9,8 +8,8 @@
       <% end %>
     <% end %>
   </td>
       <% end %>
     <% end %>
   </td>

-  <td class="<%= cl %>"><%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>
-    <span class="trace_summary" title="<%= trace.timestamp %>"> ...
+  <td><%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>
+    <span class="text-muted" title="<%= trace.timestamp %>"> ...

       <% if trace.inserted %>
         (<%= t ".count_points", :count => trace.size %>)
       <% end %>
       <% if trace.inserted %>
         (<%= t ".count_points", :count => trace.size %>)
       <% end %>


@@ -22,15 +21,15 @@
                        when "public", "identifiable" then "success"
                        else "danger"
                        end %>
                        when "public", "identifiable" then "success"
                        else "danger"
                        end %>

-      <span class="badge badge-<%= badge_class %> text-white"><%= t("." + trace.visibility) %></span>
+      <span class="badge badge-<%= badge_class %> text-white"><%= t(".#{trace.visibility}") %></span>

 
       <br />
       <%= trace.description %>
     <br />
 
       <br />
       <%= trace.description %>
     <br />

-    <%= t ".by" %> <%= link_to h(trace.user.display_name), user_path(trace.user) %>
+    <%= t ".by" %> <%= link_to trace.user.display_name, user_path(trace.user) %>

     <% if !trace.tags.empty? %>
       <%= t ".in" %>
     <% if !trace.tags.empty? %>
       <%= t ".in" %>

-      <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
+      <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>

     <% end %>
   </td>
 </tr>
     <% end %>
   </td>
 </tr>