X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/edaddbedaec78a252e988e2271962407e64483fd..e6d19586dffa03e6fac4961c0a1b64b6a237d88d:/app/views/trace/_trace.html.erb?ds=inline
diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index 4e1733148..99d570cf0 100644
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -1,35 +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.each do |tag| %>
- <%= link_to_tag tag.tag %>
- <% end %>
+ <%= t'trace.trace.in' %>
+ <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
<% end %>
|