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

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

diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb
index 728b29c45fee0868af0ba14a891be4d5b3904a1c..f7517c8021b22ddc167ec849a50ac4c333e19282 100644 (file)
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t ".heading", :name => h(@trace.name) %></h2>
+  <h2><%= t ".heading", :name => @trace.name %></h2>

 <% end %>
 
 <% if Settings.status != "gpx_offline" %>
 <% end %>
 
 <% if Settings.status != "gpx_offline" %>


@@ -10,7 +10,7 @@
   <% end %>
 <% end %>
 
   <% end %>
 <% end %>
 

-<table border="0">
+<table class="table table-borderless table-sm">

   <tr>
     <td><%= t ".filename" %></td>
     <td><%= @trace.name %> (<%= link_to t(".download"), trace_data_path(@trace) %>)</td>
   <tr>
     <td><%= t ".filename" %></td>
     <td><%= @trace.name %> (<%= link_to t(".download"), trace_data_path(@trace) %>)</td>


@@ -22,7 +22,7 @@
   <% if @trace.inserted? %>
   <tr>
     <td><%= t ".points" %></td>
   <% if @trace.inserted? %>
   <tr>
     <td><%= t ".points" %></td>

-    <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></td></tr>
+    <td><%= number_with_delimiter(@trace.size) %></td></tr>

   <tr>
     <td><%= t ".start_coordinates" %></td>
     <td><div class="d-inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%= link_to t(".map"), :controller => "site", :action => "index", :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
   <tr>
     <td><%= t ".start_coordinates" %></td>
     <td><div class="d-inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%= link_to t(".map"), :controller => "site", :action => "index", :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>


@@ -30,17 +30,17 @@
   <% end %>
   <tr>
     <td><%= t ".owner" %></td>
   <% end %>
   <tr>
     <td><%= t ".owner" %></td>

-    <td><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></td>
+    <td><%= link_to @trace.user.display_name, user_path(@trace.user) %></td>

   </tr>
   <tr>
     <td><%= t ".description" %></td>
   </tr>
   <tr>
     <td><%= t ".description" %></td>

-    <td><%= h(@trace.description) %></td>
+    <td><%= @trace.description %></td>

   </tr>
   <tr>
     <td><%= t ".tags" %></td>
     <td>
     <% unless @trace.tags.empty? %>
   </tr>
   <tr>
     <td><%= t ".tags" %></td>
     <td>
     <% unless @trace.tags.empty? %>

-      <%= raw(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }.join(", ")) %>
+      <%= safe_join(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }, ", ") %>

     <% else %>
       <i><%= t ".none" %></i>
     <% end %>
     <% else %>
       <i><%= t ".none" %></i>
     <% end %>