From: Steve Coast <steve@asklater.com>
Date: Mon, 27 Nov 2006 21:43:42 +0000 (+0000)
Subject: more trace stuff
X-Git-Tag: live~8613
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/46e9dcbcc7ba632db77a2137ee0da2a66d77c47b?hp=fb1467a94487cfdfcb19e4f88e05be7aa88096f0;ds=sidebyside

more trace stuff
---

diff --git a/app/views/trace/_trace.rhtml b/app/views/trace/_trace.rhtml
index 3149e4c0a..73fb5080c 100644
--- a/app/views/trace/_trace.rhtml
+++ b/app/views/trace/_trace.rhtml
@@ -1 +1,16 @@
-bleh
+<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} %>
+    <span class="gpxsummary" title="<%= trace.timestamp %>"> ... 
+      <% if trace.inserted %> 
+      (<%= trace.size %> points)
+      <% 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 %>
+    <br />
+    by <%= link_to trace.user.display_name, {:controller => 'trace', :action => 'list', :user => trace.user.display_name} %>
+  </td>
+</tr>
diff --git a/app/views/trace/list.rhtml b/app/views/trace/list.rhtml
index ce2e76349..6ff6b34a6 100644
--- a/app/views/trace/list.rhtml
+++ b/app/views/trace/list.rhtml
@@ -3,4 +3,10 @@
   <%= link_to 'See just your traces', {:controller => 'trace', :action => 'mine'} %>
 <% end %>
 
-<%= render :partial => 'trace', :collection => @traces %>
+<table id="keyvalue" cellpadding="3">
+  <tr>
+    <th></th>
+    <th></th>
+  </tr>
+  <%= render :partial => 'trace', :collection => @traces %>
+</table>
diff --git a/config/routes.rb b/config/routes.rb
index 620509473..d6ac73468 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,7 +28,7 @@ ActionController::Routing::Routes.draw do |map|
   
   map.connect '/traces', :controller => 'trace', :action => 'list'
   map.connect '/traces/mine', :controller => 'trace', :action => 'users'
-  map.connect '/traces/user/:user_login/:id', :controller => 'trace', :action => 'user'
+  map.connect '/traces/user/:user/:id', :controller => 'trace', :action => 'list', :id => nil
 
   map.connect ':controller/:action/:id'
 end