X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3b237dc3dabda181ed68dc587b1befc678a03706..98b4d62462040deb0d3564808917f69cc723c3a3:/app/views/traces/_trace.html.erb?ds=inline diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index 180835c28..992f16199 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -1,30 +1,61 @@ - <% cl = cycle('table0', 'table1') %> - + <% if Settings.status != "gpx_offline" %> <% if trace.inserted %> - + <%= link_to trace_icon(trace), + show_trace_path(trace.user, trace), + :class => "d-inline-block" %> <% 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,') %>) + + +

+ <% if trace.tags.empty? %> + <%= t ".details_without_tags_html", :time_ago => friendly_date_ago(trace.timestamp), + :user => link_to(trace.user.display_name, trace.user) %> + <% else %> + <%= t ".details_with_tags_html", :time_ago => friendly_date_ago(trace.timestamp), + :user => link_to(trace.user.display_name, trace.user), + :tags => 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 %>