X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dfadcc797cead0cc1877dbc211b7a081bf8e769c..cf11913d586bf9c25f003f4acd3b114367fa4aa9:/app/views/trace/view.html.erb diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb index 80733844d..fac0139d9 100644 --- a/app/views/trace/view.html.erb +++ b/app/views/trace/view.html.erb @@ -1,19 +1,23 @@ -

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

+<% content_for :heading do %> +

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

+<% end %> +<% if STATUS != :gpx_offline %> <% if @trace.inserted %> <% else %> <%= t'trace.view.pending' %> <% end %> +<% end %> - + - + <% if @trace.inserted? %> @@ -21,7 +25,7 @@ - + <% end %> @@ -35,29 +39,24 @@ + + + +
<%= t'trace.view.filename' %> <%= @trace.name %> (<%= link_to t('trace.view.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)
<%= t'trace.view.uploaded' %><%= l @trace.timestamp %><%= l @trace.timestamp, :format => :friendly %>
<%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>
<%= t'trace.view.start_coordinates' %>
<%= @trace.latitude %>; <%= @trace.longitude %>
(<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)
<%= @trace.latitude %>; <%= @trace.longitude %>
(<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)
<%= t'trace.view.tags' %> - <% if @trace.tags %> - <% @trace.tags.each do |tag| %> - <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %> - <% end %> + <% unless @trace.tags.empty? %> + <%= raw(@trace.tags.collect { |tag| link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } }.join(", ")) %> <% else %> - <%= t'trace.view.none' %> + <%= t'trace.view.none' %> <% end %>
<%= t'trace.view.visibility' %><%= t"trace.visibility.#{@trace.visibility}" %>


- - - <% unless @trace.public? %> - - <% end %> - <% if @trace.user == @user %> - - <% end %> - <% if @trace.user == @user %> - - <% end %> - -
<%= button_to t('trace.view.make_public'), :controller => 'trace', :action => 'make_public', :id => @trace.id %><%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %><%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %>
+<%= if_user(@trace.user) do %> +
+ <%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %> + <%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %> +
+<% end %>