Merge remote-tracking branch 'upstream/pull/1820'

[rails.git] / app / views / trace / _trace.html.erb

diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index 31e4cf0b1cc708fd68f64729507b9c32c02b9af0..ecadacc64942fbe099b55c657950144c3d6b4e2e 100644 (file)
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -10,22 +10,21 @@
     <% end %>
   </td>
   <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>
-    <span class="trace_summary" title="<%= trace.timestamp %>"> ... 
-      <% if trace.inserted %> 
+    <span class="trace_summary" title="<%= trace.timestamp %>"> ...
+      <% if trace.inserted %>
         (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
-      <% end %> 
+      <% end %>
       ... <%= 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_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {: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')} %>
       <span class="trace_<%= trace.visibility %>"><%= t('trace.trace.' + trace.visibility) %></span>
       <br />
-      <%= h(trace.description) %>
+      <%= trace.description %>
     <br />
-    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %>
     <% if !trace.tags.empty? %>
-      <%= t'trace.trace.in' %> 
-      <%= trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ") %>
+      <%= t'trace.trace.in' %>
+      <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
     <% end %>
   </td>
 </tr>