Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

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

diff --git a/app/views/trace/_trace.rhtml b/app/views/trace/_trace.rhtml
index b79638d1729b5830198070116ab751763d3e0c60..d54f77ab6d31bbbbdec0922bcc1c56025ac5643a 100644 (file)
--- a/app/views/trace/_trace.rhtml
+++ b/app/views/trace/_trace.rhtml
@@ -2,26 +2,33 @@
   <% 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"></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" alt="" /></a>
     <% else %>
-    <span style="color:red">PENDING</span>
+      <span style="color:red">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.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %> points)
+        (<%= 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} %> /
-    <a href="/edit.html?lat=<%= trace.latitude %>&lon=<%= trace.longitude %>&zoom=14" title="create maps">map</a><br />
-      <%= trace.description %>
+      <%= 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'} %>
+      <% if trace.public? %>
+        <span style="color:green">PUBLIC</span>
+      <% else %>
+        <span style="color:red">PRIVATE</span>
+      <% end %>
+      <br />
+      <%= h(trace.description) %>
     <br />
-    by <%= link_to trace.user.display_name, {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
-    in 
-    <% if trace.tags %>
+    by <%= link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    <% if !trace.tags.empty? %>
+      in 
       <% 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>