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

[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 9ee58cf22122beff7633c1f02bd71c73f5c67e73..184570499dbca6228b01c1b6f031949d11f1de64 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 %>

-        <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 image_tag(trace_icon_path(trace.user, trace), :alt => ""), show_trace_path(trace.user, trace) %>

       <% else %>
         <span class="text-danger"><%= t ".pending" %></span>
       <% end %>
       <% else %>
         <span class="text-danger"><%= t ".pending" %></span>
       <% end %>


@@ -11,7 +11,7 @@
   <td>
     <ul class="list-inline mb-0">
       <li class="list-inline-item">
   <td>
     <ul class="list-inline mb-0">
       <li class="list-inline-item">

-        <%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>
+        <%= link_to trace.name, show_trace_path(trace.user, trace) %>

       </li>
 
       <% if trace.inserted? %>
       </li>
 
       <% if trace.inserted? %>


@@ -29,11 +29,13 @@
       </li>
     </ul>
     <p class="text-muted mb-0">
       </li>
     </ul>
     <p class="text-muted mb-0">

-      <%= friendly_date_ago(trace.timestamp) %>
-      <%= 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 }, ", ") %>
+      <% 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 %>
     </p>
     <p class="fst-italic mb-0">
       <% end %>
     </p>
     <p class="fst-italic mb-0">


@@ -45,10 +47,10 @@
       <nav class="secondary-actions">
         <ul>
           <li>
       <nav class="secondary-actions">
         <ul>
           <li>

-            <%= link_to t(".view_map"), { :controller => "site", :action => "index", :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}" } %>
+            <%= link_to t(".view_map"), root_path(:mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}") %>

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

-            <%= link_to t(".edit_map"), { :controller => "site", :action => "edit", :gpx => trace.id } %>
+            <%= link_to t(".edit_map"), edit_path(:gpx => trace.id) %>

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