X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ebbcf63f0d910458ae255a84de794e3ccede7a7a..48d450060b3b5c19bb1fa8e85341d76177de26d2:/app/views/trace/_trace.html.erb
diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index d38fa2f4c..509c346ed 100644
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -1,14 +1,16 @@
<% cl = cycle('table0', 'table1') %>
- <% if trace.inserted %>
-
- <% else %>
- <%= t'trace.trace.pending' %>
+ <% if OSM_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 %>
(<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
<% end %>
@@ -16,8 +18,12 @@
<%= 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 t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %>
- <% if trace.public? %>
+ <% if trace.visibility == "public" %>
<%= t'trace.trace.public' %>
+ <% elsif trace.visibility == "identifiable" %>
+ <%= t'trace.trace.identifiable' %>
+ <% elsif trace.visibility == "trackable" %>
+ <%= t'trace.trace.trackable' %>
<% else %>
<%= t'trace.trace.private' %>
<% end %>
@@ -27,9 +33,7 @@
<%= 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_with_index do |tag, index| %>
- <%= link_to_tag tag.tag %><%=', ' if index+1 < trace.tags.count %>
- <% end %>
+ <%= trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ") %>
<% end %>
|