X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1c5642637a87ab250d2a1204cc83a578e7aa29f1..48fff2bfeabb9a9bafd78c9cd4a0077e6569b631:/app/views/traces/show.html.erb diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb index 728b29c45..e72c423d7 100644 --- a/app/views/traces/show.html.erb +++ b/app/views/traces/show.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

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

+

<%= t ".heading", :name => @trace.name %>

<% end %> <% if Settings.status != "gpx_offline" %> @@ -10,7 +10,7 @@ <% end %> <% end %> - +
@@ -22,25 +22,31 @@ <% if @trace.inserted? %> - + - + <% end %> - + - +
<%= t ".filename" %> <%= @trace.name %> (<%= link_to t(".download"), trace_data_path(@trace) %>)
<%= t ".points" %><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %>
<%= number_with_delimiter(@trace.size) %>
<%= t ".start_coordinates" %>
<%= @trace.latitude %>; <%= @trace.longitude %>
(<%= 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}" %>)
+
+ <%= t ".coordinates_html", + :latitude => tag.span(number_with_delimiter(@trace.latitude), :class => "latitude"), + :longitude => tag.span(number_with_delimiter(@trace.longitude), :class => "longitude") %> +
+ (<%= 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}" %>)
<%= t ".owner" %><%= link_to h(@trace.user.display_name), user_path(@trace.user) %><%= link_to @trace.user.display_name, user_path(@trace.user) %>
<%= t ".description" %><%= h(@trace.description) %><%= @trace.description %>
<%= t ".tags" %> <% 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 %> <%= t ".none" %> <% end %> @@ -55,10 +61,10 @@

<% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?) %> -
+
<% 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 %> - <%= 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") } } %>
<% end %>