X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ad0340b052c606fdbb68bb820a438737295668f..88d80018b52a4b815b5e140c3cd1dd9326567bae:/app/views/traces/show.html.erb?ds=inline diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb index f7517c802..63adf1572 100644 --- a/app/views/traces/show.html.erb +++ b/app/views/traces/show.html.erb @@ -1,10 +1,10 @@ <% content_for :heading do %> -

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

+

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

<% end %> <% 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,32 +12,38 @@ - + - + <% if @trace.inserted? %> - + - - + + <% 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" %>
<%= @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 ".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"), 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}") %>)
<%= 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 }, ", ") %> @@ -47,18 +53,16 @@
<%= t ".visibility" %><%= t ".visibility" %> <%= t "traces.visibility.#{@trace.visibility}" %>
-

- <% 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"), @trace, { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %>
<% end %>