Merge branch 'pull/4985'

[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 ad731c6db2d4ed4bd0859193d7a531f5be353094..992f16199ac38a5044fa8df507b8dfc27b29e6c4 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -2,7 +2,7 @@
   <td>
     <% if Settings.status != "gpx_offline" %>
       <% if trace.inserted %>
   <td>
     <% if Settings.status != "gpx_offline" %>
       <% if trace.inserted %>

-        <%= link_to image_tag(trace_icon_path(trace.user, trace), :alt => "", :class => "trace_image"),
+        <%= link_to trace_icon(trace),

                     show_trace_path(trace.user, trace),
                     :class => "d-inline-block" %>
       <% else %>
                     show_trace_path(trace.user, trace),
                     :class => "d-inline-block" %>
       <% else %>


@@ -27,10 +27,10 @@
                          when "public", "identifiable" then "success"
                          else "danger"
                          end %>
                          when "public", "identifiable" then "success"
                          else "danger"
                          end %>

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

       </li>
     </ul>
       </li>
     </ul>

-    <p class="text-muted mb-0">
+    <p class="text-body-secondary mb-0">

       <% if trace.tags.empty? %>
         <%= t ".details_without_tags_html", :time_ago => friendly_date_ago(trace.timestamp),
                                             :user => link_to(trace.user.display_name, trace.user) %>
       <% if trace.tags.empty? %>
         <%= t ".details_without_tags_html", :time_ago => friendly_date_ago(trace.timestamp),
                                             :user => link_to(trace.user.display_name, trace.user) %>