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

[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 07134dbbd4b8599ff4fe874e94900060f4f5f852..6df31760ab6e522dd2049db547e6925a57c36b58 100644 (file)
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -1,16 +1,16 @@
 <% 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" %>
   <% if @trace.inserted %>
     <img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">
   <% else %>
 <% end %>
 
 <% if Settings.status != "gpx_offline" %>
   <% if @trace.inserted %>
     <img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">
   <% else %>

-    <span class="trace_pending"><%= t ".pending" %></span>
+    <span class="text-danger"><%= t ".pending" %></span>

   <% 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,19 +22,25 @@
   <% 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>
   <tr>
     <td><%= t ".start_coordinates" %></td>

-    <td><div class="geo"><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>
+    <td>
+      <div class="d-inline">
+        <%= t ".coordinates_html",
+              :latitude => tag.span(number_with_delimiter(@trace.latitude), :class => "latitude"),
+              :longitude => tag.span(number_with_delimiter(@trace.longitude), :class => "longitude") %>
+      </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>
   <% end %>
   <tr>
     <td><%= t ".owner" %></td>
   </tr>
   <% 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>
   </tr>
   <tr>
     <td><%= t ".tags" %></td>


@@ -55,10 +61,10 @@
 <br /><br />
 
 <% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?) %>
 <br /><br />
 
 <% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?) %>

-  <div class="buttons">
+  <div>

     <% if current_user == @trace.user %>
     <% if current_user == @trace.user %>

-      <%= link_to t(".edit_trace"), edit_trace_path(@trace), :class => "button" %>
+      <%= link_to t(".edit_trace"), edit_trace_path(@trace), :class => "btn btn-outline-primary" %>

     <% end %>
     <% end %>

-    <%= button_to t(".delete_trace"), { :controller => "traces", :action => "destroy", :id => @trace.id }, { :method => :delete, :data => { :confirm => t(".confirm_delete") } } %>
+    <%= link_to t(".delete_trace"), { :controller => "traces", :action => "destroy", :id => @trace.id }, { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %>

   </div>
 <% end %>
   </div>
 <% end %>