X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/50091893d44ecfc48c13bb2269f23a6f23aea1d2..77d495ccdc4c6d07cb7795177c73ba541afc44e0:/app/views/traces/_trace.html.erb?ds=sidebyside diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index 180835c28..832187b79 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -1,30 +1,59 @@ - <% cl = cycle('table0', 'table1') %> - + <% if Settings.status != "gpx_offline" %> <% if trace.inserted %> - + "show", :id => trace.id, :display_name => trace.user.display_name %>"> "icon", :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /> <% else %> - <%= t '.pending' %> + <%= t ".pending" %> <% end %> <% end %> - <%= link_to trace.name, :controller => 'traces', :action => 'show', :display_name => trace.user.display_name, :id => trace.id %> - ... - <% if trace.inserted %> - (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %>) + + +

+ + <%= time_ago_in_words(trace.timestamp, :scope => :"datetime.distance_in_words_ago") %> + + <%= t ".by" %> <%= link_to trace.user.display_name, user_path(trace.user) %> + <% if !trace.tags.empty? %> + <%= t ".in" %> + <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %> <% end %> - ... <%= t '.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %> - <%= link_to_if trace.inserted?, t('.map'), { :controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}" }, { :title => t('.view_map') } %> / - <%= link_to t('.edit'), { :controller => 'site', :action => 'edit', :gpx => trace.id }, { :title => t('.edit_map') } %> - <%= t('.' + trace.visibility) %> -
+

+

<%= trace.description %> -
- <%= t '.by' %> <%= link_to h(trace.user.display_name), user_path(trace.user) %> - <% if !trace.tags.empty? %> - <%= t '.in' %> - <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %> +

+ + + <% if trace.inserted? %> + <% end %>