X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9e504a0b33032635c3dc5801b22ca3e7566d6b0b..1f7dd79daf44de5f8f8b6c246a269e44bb258175:/app/views/trace/view.html.erb?ds=sidebyside diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb index 048d92d35..0887e5605 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? %> @@ -36,28 +40,25 @@ + + + +
<%= 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 %>
<%= t'trace.view.tags' %> <% unless @trace.tags.empty? %> - <% @trace.tags.each do |tag| %> - <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %> - <% end %> + <%= raw(@trace.tags.collect { |tag| link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } }.join(", ")) %> <% else %> <%= 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 %>