api06: s/delete_with_relations_and_history/delete_with_history/g

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

diff --git a/app/views/trace/_trace.rhtml b/app/views/trace/_trace.rhtml
index 8bd198d4e28e5ff478c8de19c87147bd9a5b00f2..966ee9263fbabca9c0aeb7399c171e8a2bb060a9 100644 (file)
--- a/app/views/trace/_trace.rhtml
+++ b/app/views/trace/_trace.rhtml
@@ -13,16 +13,17 @@
       (<%= trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %> points)
       <% end %> 
       ... <%= time_ago_in_words( trace.timestamp ) %>  ago</span>
-      <%= link_to 'more', {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %> /
-      <%= link_to 'map', {:controller => 'site', :action => 'edit', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => 'create maps'} %>
+      <%= link_to 'more', {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => 'View Trace Details'} %> /
+      <%= link_to_if trace.inserted?, 'map', {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => 'View Map'} %> /
+      <%= link_to 'edit', {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => 'Edit Map'} %>
       <br />
-      <%= escape_once(trace.description) %>
+      <%= h(trace.description) %>
     <br />
-    by <%= link_to trace.user.display_name, {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    by <%= link_to h(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 %>
+        <%= link_to_tag tag.tag %>
       <% end %>
     <% end %>
   </td>