X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3666b674330ec8d14a224932a191d6121c5974e2..7b05c1c060f3f85f47413ec7db984180514d3ba6:/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 8980cb8f2..992f16199 100644
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -2,34 +2,60 @@
<% 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="" />
+ <%= link_to trace_icon(trace),
+ show_trace_path(trace.user, trace),
+ :class => "d-inline-block" %>
<% else %>
<%= 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 %>)
- <% end %>
- ... <%= time_ago_in_words(trace.timestamp, :scope => :'datetime.distance_in_words_ago') %>
- <%= 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") } %>
+ |
+
+ -
+ <%= link_to trace.name, show_trace_path(trace.user, trace) %>
+
- <% badge_class = case trace.visibility
- when "public", "identifiable" then "success"
- else "danger"
- end %>
- <%= t("." + trace.visibility) %>
+ <% if trace.inserted? %>
+ -
+ <%= t ".count_points", :count => trace.size %>
+
+ <% end %>
-
+ -
+ <% badge_class = case trace.visibility
+ when "public", "identifiable" then "success"
+ else "danger"
+ end %>
+ <%= t(".#{trace.visibility}") %>
+
+
+
+ <% 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 %>
+
+
<%= trace.description %>
-
- <%= 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 }, ", ") %>
+
+ |
+
+ <% if trace.inserted? %>
+
<% end %>
|