X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e2db4098722ef4460aa455ceaf8d54f5614af557..f6141277d5a727fdec5c7bb26e35b17b1e6f495d:/app/views/traces/_trace.html.erb?ds=sidebyside

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index b7325dc54..f60eea7f1 100644
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -2,55 +2,60 @@
   <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>
+        <%= link_to trace_icon(trace),
+                    show_trace_path(trace.user, trace),
+                    :class => "d-inline-block" %>
       <% else %>
         <span class="text-danger"><%= t ".pending" %></span>
       <% end %>
     <% end %>
   </td>
   <td>
-    <span class="mr-2">
-      <%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>
-    </span>
+    <ul class="list-inline mb-0">
+      <li class="list-inline-item">
+        <%= link_to trace.name, show_trace_path(trace.user, trace) %>
+      </li>
 
-    <% if trace.inserted? %>
-      <span class="mr-2">
-        <%= t ".count_points", :count => trace.size %>
-      </span>
-    <% end %>
-
-    <% badge_class = case trace.visibility
-                     when "public", "identifiable" then "success"
-                     else "danger"
-                     end %>
-    <span class="badge badge-<%= badge_class %> text-white"><%= t(".#{trace.visibility}") %></span>
+      <% if trace.inserted? %>
+        <li class="list-inline-item">
+          <%= t ".count_points", :count => trace.size %>
+        </li>
+      <% end %>
 
-    <br />
-    <span class="text-muted">
-      <span title="<%= trace.timestamp %>">
-        <%= time_ago_in_words(trace.timestamp, :scope => :'datetime.distance_in_words_ago') %>
-      </span>
-      <%= t ".by" %> <%= link_to trace.user.display_name, user_path(trace.user) %>
-      <% if !trace.tags.empty? %>
-        <%= t ".in" %>
-        <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
+      <li class="list-inline-item">
+        <% badge_class = case trace.visibility
+                         when "public", "identifiable" then "success"
+                         else "danger"
+                         end %>
+        <span class="badge bg-<%= badge_class %> text-white"><%= t(".#{trace.visibility}") %></span>
+      </li>
+    </ul>
+    <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) %>
+      <% else %>
+        <%= t ".details_with_tags_html", :time_ago => friendly_date_ago(trace.timestamp),
+                                         :user => link_to(trace.user.display_name, trace.user),
+                                         :tags => safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
       <% end %>
-    </span>
-    <br />
-    <p class="font-italic my-1">
+    </p>
+    <p class="fs-6 mb-0">
       <%= trace.description %>
     </p>
   </td>
   <td>
     <% if trace.inserted? %>
-      <ul class="secondary-actions">
-        <li>
-          <%= link_to t(".view_map"), { :controller => "site", :action => "index", :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}" } %>
-        </li>
-        <li>
-          <%= link_to t(".edit_map"), { :controller => "site", :action => "edit", :gpx => trace.id } %>
-        </li>
-      </ul>
+      <nav class="secondary-actions">
+        <ul>
+          <li>
+            <%= link_to t(".view_map"), root_path(:mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}") %>
+          </li>
+          <li>
+            <%= link_to t(".edit_map"), edit_path(:gpx => trace.id) %>
+          </li>
+        </ul>
+      </nav>
     <% end %>
   </td>
 </tr>