X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f702d5c426fd993fe21c2572ba668368afc0ee72..18409c05ab43a2f818f6db911ae383eb0ebfb07d:/app/views/traces/show.html.erb?ds=sidebyside diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb index a8f9c5967..63adf1572 100644 --- a/app/views/traces/show.html.erb +++ b/app/views/traces/show.html.erb @@ -4,7 +4,7 @@ <% if Settings.status != "gpx_offline" %> <% if @trace.inserted %> - "picture", :id => @trace.id, :display_name => @trace.user.display_name %>"> + <%= trace_picture(@trace) %> <% else %> <%= t ".pending" %> <% end %> @@ -12,38 +12,38 @@ - + - + <% if @trace.inserted? %> - + - + + (<%= link_to t(".map"), root_path(:mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}") %> / <%= link_to t(".edit"), edit_path(:gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}") %>) <% end %> - - + + - + - + - +
<%= t ".filename" %><%= t ".filename" %> <%= @trace.name %> (<%= link_to t(".download"), trace_data_path(@trace) %>)
<%= t ".uploaded" %><%= t ".uploaded" %> <%= l @trace.timestamp, :format => :friendly %>
<%= t ".points" %><%= t ".points" %> <%= number_with_delimiter(@trace.size) %>
<%= t ".start_coordinates" %><%= t ".start_coordinates" %>
<%= 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 @trace.user.display_name, user_path(@trace.user) %><%= t ".owner" %><%= link_to @trace.user.display_name, @trace.user %>
<%= t ".description" %><%= t ".description" %> <%= @trace.description %>
<%= t ".tags" %><%= t ".tags" %> <% unless @trace.tags.empty? %> <%= safe_join(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }, ", ") %> @@ -53,7 +53,7 @@
<%= t ".visibility" %><%= t ".visibility" %> <%= t "traces.visibility.#{@trace.visibility}" %>
@@ -63,6 +63,6 @@ <% if current_user == @trace.user %> <%= link_to t(".edit_trace"), edit_trace_path(@trace), :class => "btn btn-outline-primary" %> <% end %> - <%= link_to t(".delete_trace"), { :controller => "traces", :action => "destroy", :id => @trace.id }, { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %> + <%= link_to t(".delete_trace"), @trace, { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %> <% end %>