X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0b6f0c1d34f636c0cdde234f3a62a6ead2b8655f..e0faf6843746464d85a0cfbfc071226c2d62148d:/app/views/trace/_trace.html.erb?ds=sidebyside diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb index 4cd40352a..99d570cf0 100644 --- a/app/views/trace/_trace.html.erb +++ b/app/views/trace/_trace.html.erb @@ -1,33 +1,31 @@ <% cl = cycle('table0', 'table1') %> - <% if trace.inserted %> - - <% else %> - <%= t'trace.trace.pending' %> + <% if STATUS != :gpx_offline %> + <% if trace.inserted %> + + <% else %> + <%= t'trace.trace.pending' %> + <% end %> <% end %> <%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %> - ... - <% if trace.inserted %> + ... + <% if trace.inserted %> (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>) - <% end %> + <% end %> ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %> <%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> / - <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => t('trace.trace.view_map')} %> / + <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('trace.trace.view_map')} %> / <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %> - <% if trace.public? %> - <%= t'trace.trace.public' %> - <% else %> - <%= t'trace.trace.private' %> - <% end %> + <%= t('trace.trace.' + trace.visibility) %>
- <%= h(trace.description) %> + <%= trace.description %>
<%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %> <% if !trace.tags.empty? %> - <%= t'trace.trace.in' %> - <%= trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ") %> + <%= t'trace.trace.in' %> + <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %> <% end %>