Revert accidental commit.

[rails.git] / app / views / trace / _trace.rhtml

diff --git a/app/views/trace/_trace.rhtml b/app/views/trace/_trace.rhtml
index f7ea77219d3544392be03417c3748fc6a3eb4848..b79638d1729b5830198070116ab751763d3e0c60 100644 (file)
--- a/app/views/trace/_trace.rhtml
+++ b/app/views/trace/_trace.rhtml
@@ -2,21 +2,27 @@
   <% cl = cycle('table0', 'table1') %>
   <td class="<%= cl %>">
     <% if trace.inserted %>
   <% cl = cycle('table0', 'table1') %>
   <td class="<%= cl %>">
     <% if trace.inserted %>

-    <a href="<%= url_for :controller => 'trace', :action => 'view', :id => trace.id, :user_login => trace.user.display_name %>">
-      <img src="<%= url_for :controller => 'trace', :action => 'icon', :id => trace.id, :user_login => trace.user.display_name %>" border="0">
-    </a>
+    <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"></a>
+    <% else %>
+    <span style="color:red">PENDING</span>

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

-  <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'onetrace', :id => trace.id} %>
+  <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 %> 
     <span class="gpxsummary" title="<%= trace.timestamp %>"> ... 
       <% if trace.inserted %> 

-      (<%= trace.size %> points)
+      (<%= trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %> points)

       <% end %> 
       ... <%= time_ago_in_words( trace.timestamp ) %>  ago</span>
       <% 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 />
+     <%= link_to 'more', {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %> /
+    <a href="/edit.html?lat=<%= trace.latitude %>&lon=<%= trace.longitude %>&zoom=14" title="create maps">map</a><br />

       <%= trace.description %>
     <br />
       <%= trace.description %>
     <br />

-    by <%= link_to trace.user.display_name, {:controller => 'trace', :action => 'list', :user => trace.user.display_name} %>
+    by <%= link_to trace.user.display_name, {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    in 
+    <% if trace.tags %>
+      <% trace.tags.each do |tag| %>
+        <%= link_to tag.tag, :controller => 'trace', :action => @paging_action, :tag => tag.tag %>
+      <% end %>
+    <% end %>

   </td>
 </tr>
   </td>
 </tr>