X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/783b5e3729228908d7404ae7404af1023501a906..ff7ddb6b86bf918a9418af7382836b41594d45e4:/app/views/traces/show.html.erb diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb index 0ebbd827f..e049797a8 100644 --- a/app/views/traces/show.html.erb +++ b/app/views/traces/show.html.erb @@ -6,7 +6,7 @@ <% if @trace.inserted %> "picture", :id => @trace.id, :display_name => @trace.user.display_name %>"> <% else %> - <%= t ".pending" %> + <%= t ".pending" %> <% end %> <% end %> @@ -25,7 +25,7 @@ <%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %> <%= 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}" %>) +
<%= @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}" %>) <% end %> @@ -40,7 +40,7 @@ <%= 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 %> @@ -59,6 +59,6 @@ <% if current_user == @trace.user %> <%= link_to t(".edit_trace"), edit_trace_path(@trace), :class => "button" %> <% end %> - <%= button_to t(".delete_trace"), { :controller => "traces", :action => "delete", :id => @trace.id }, { :data => { :confirm => t(".confirm_delete") } } %> + <%= button_to t(".delete_trace"), { :controller => "traces", :action => "destroy", :id => @trace.id }, { :method => :delete, :data => { :confirm => t(".confirm_delete") } } %> <% end %>