X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a1b179fa384d689e6cb78c2b8d863621e7bff152..73c95847a6680bea7f35fe5b3da6eb4e52757b9c:/app/views/traces/_trace.html.erb

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index b81e19025..47860d50d 100644
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -1,30 +1,36 @@
 <tr>
-  <% cl = cycle('table0', 'table1') %>
+  <% cl = cycle("table0", "table1") %>
   <td class="<%= cl %>">
-    <% if STATUS != :gpx_offline %>
+    <% if Settings.status != "gpx_offline" %>
       <% if trace.inserted %>
-        <a href="<%= url_for :controller => 'traces', :action => 'show', :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => 'traces', :action => 'icon', :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>
+        <a href="<%= url_for :controller => "traces", :action => "show", :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => "traces", :action => "icon", :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>
       <% else %>
-        <span class="trace_pending"><%= t '.pending' %></span>
+        <span class="text-danger"><%= t ".pending" %></span>
       <% end %>
     <% end %>
   </td>
-  <td class="<%= cl %>"><%= link_to trace.name, { :controller => 'traces', :action => 'show', :display_name => trace.user.display_name, :id => trace.id } %>
+  <td class="<%= cl %>"><%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>
     <span class="trace_summary" title="<%= trace.timestamp %>"> ...
       <% if trace.inserted %>
-        (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
+        (<%= t ".count_points", :count => trace.size %>)
       <% end %>
-      ... <%= t '.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
-      <%= 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')} %>
-      <span class="trace_<%= trace.visibility %>"><%= t('.' + trace.visibility) %></span>
+      ... <%= time_ago_in_words(trace.timestamp, :scope => :'datetime.distance_in_words_ago') %></span>
+      <%= 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") } %>
+
+      <% badge_class = case trace.visibility
+                       when "public", "identifiable" then "success"
+                       else "danger"
+                       end %>
+      <span class="badge badge-<%= badge_class %> text-white"><%= t("." + trace.visibility) %></span>
+
       <br />
       <%= trace.description %>
     <br />
-    <%= t '.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %>
+    <%= 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(", ")) %>
+      <%= t ".in" %>
+      <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
     <% end %>
   </td>
 </tr>