Merge remote-tracking branch 'upstream/pull/1851'

[rails.git] / app / views / trace / _trace.html.erb

diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index d38fa2f4c74fee873560a4bff508148c96d507ee..0847ddaf18743a50b3136cebc363cff2a63b95ed 100644 (file)
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -1,35 +1,30 @@
 <tr>
   <% cl = cycle('table0', 'table1') %>
   <td class="<%= cl %>">
 <tr>
   <% cl = cycle('table0', 'table1') %>
   <td class="<%= cl %>">

-    <% if trace.inserted %>
-      <a href="<%= url_for :controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => 'trace', :action => 'icon', :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>
-    <% else %>
-      <span style="color:red"><%= t'trace.trace.pending' %></span>
+    <% if STATUS != :gpx_offline %>
+      <% if trace.inserted %>
+        <a href="<%= url_for :controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => 'trace', :action => 'icon', :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>
+      <% else %>
+        <span class="trace_pending"><%= t '.pending' %></span>
+      <% end %>

     <% end %>
   </td>
   <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>
     <% end %>
   </td>
   <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>

-    <span class="gpxsummary" title="<%= trace.timestamp %>"> ... 
-      <% if trace.inserted %> 
-        (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
-      <% end %> 
-      ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
-      <%= 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? %>
-        <span style="color:green"><%= t'trace.trace.public' %></span>
-      <% else %>
-        <span style="color:red"><%= t'trace.trace.private' %></span>
+    <span class="trace_summary" title="<%= trace.timestamp %>"> ...
+      <% if trace.inserted %>
+        (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)

       <% end %>
       <% 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>

       <br />
       <br />

-      <%= h(trace.description) %>
+      <%= trace.description %>

     <br />
     <br />

-    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    <%= t '.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %>

     <% if !trace.tags.empty? %>
     <% 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 %>
+      <%= t '.in' %>
+      <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>

     <% end %>
   </td>
 </tr>
     <% end %>
   </td>
 </tr>