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

[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 44de2ef061114c3c857cadbe4646f68324c61695..832187b79306acda89b58896a595daf054b01ca7 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -25,7 +25,7 @@
                          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 bg-<%= badge_class %> text-white"><%= t(".#{trace.visibility}") %></span>

       </li>
     </ul>
     <p class="text-muted mb-0">
       </li>
     </ul>
     <p class="text-muted mb-0">


@@ -38,20 +38,22 @@
         <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
       <% end %>
     </p>
         <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
       <% end %>
     </p>

-    <p class="font-italic mb-0">
+    <p class="fst-italic mb-0">

       <%= trace.description %>
     </p>
   </td>
   <td>
     <% if trace.inserted? %>
       <%= 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"), { :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>

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