X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/46e9dcbcc7ba632db77a2137ee0da2a66d77c47b..7862c89a92a33077cea66c92c58214ba7bcf84ba:/app/views/trace/_trace.rhtml

diff --git a/app/views/trace/_trace.rhtml b/app/views/trace/_trace.rhtml
index 73fb5080c..4e1733148 100644
--- a/app/views/trace/_trace.rhtml
+++ b/app/views/trace/_trace.rhtml
@@ -1,16 +1,35 @@
 <tr>
   <% cl = cycle('table0', 'table1') %>
-  <td class="<%= cl %>">image here</td>
-  <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'onetrace', :id => trace.id} %>
+  <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>
+    <% 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 %> 
-      (<%= trace.size %> points)
+        (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
       <% end %> 
-      ... <%= time_ago_in_words( trace.timestamp ) %>  ago</span>
-    <a href="/traces/user/blars/12701" title="more detail..." >more</a> /
-    <a href="/edit.html?lat=34.1032333&lon=-118.2272333&zoom=14" title="create maps">map</a><br />
-      <%= trace.description %>
+      ... <%= 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>
+      <% end %>
+      <br />
+      <%= h(trace.description) %>
     <br />
-    by <%= link_to trace.user.display_name, {:controller => 'trace', :action => 'list', :user => trace.user.display_name} %>
+    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    <% if !trace.tags.empty? %>
+      <%= t'trace.trace.in' %> 
+      <% trace.tags.each do |tag| %>
+        <%= link_to_tag tag.tag %>
+      <% end %>
+    <% end %>
   </td>
 </tr>