X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f07819d81a7437e58c6e64c2e76ba7e54fad9034..5f663b765a85fe2e7a35493077df89268cb1aab3:/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 0d9b6213f..fac0139d9 100644 --- a/app/views/trace/view.html.erb +++ b/app/views/trace/view.html.erb @@ -1,4 +1,6 @@ -

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

+<% content_for :heading do %> +

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

+<% end %> <% if STATUS != :gpx_offline %> <% if @trace.inserted %> @@ -12,7 +14,7 @@ <%= 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, :format => :friendly %> @@ -23,7 +25,7 @@ <%= @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}" %>) <% end %> @@ -38,7 +40,7 @@ <%= t'trace.view.tags' %> <% unless @trace.tags.empty? %> - <%= @trace.tags.collect { |tag| link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } }.join(", ") %> + <%= 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 %> @@ -52,11 +54,9 @@

-<% 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 %>
+<%= 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 %>