Clean up diary_entry.js

[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 8addd5c1c4544aa899a5d10ee26d531100e55a99..32717d8242bebff9b6c6929e7b43de336b6b5a66 100644 (file)
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -5,7 +5,7 @@
       <% 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" alt="" /></a>
       <% else %>
-        <span style="color:red"><%= t'trace.trace.pending' %></span>
+        <span class="trace_pending"><%= t'trace.trace.pending' %></span>
       <% end %>
     <% end %>
   </td>
@@ -18,22 +18,14 @@
       <%= 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 t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %>
-      <% if trace.visibility == "public" %>
-        <span style="color:green"><%= t'trace.trace.public' %></span>
-      <% elsif trace.visibility == "identifiable" %>
-        <span style="color:green"><%= t'trace.trace.identifiable' %></span>
-      <% elsif trace.visibility == "trackable" %>
-        <span style="color:red"><%= t'trace.trace.trackable' %></span>
-      <% else %>
-        <span style="color:red"><%= t'trace.trace.private' %></span>
-      <% end %>
+      <span class="trace_<%= trace.visibility %>"><%= t('trace.trace.' + trace.visibility) %></span>
       <br />
       <%= h(trace.description) %>
     <br />
     <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
     <% if !trace.tags.empty? %>
       <%= t'trace.trace.in' %> 
-      <%= trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ") %>
+      <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
     <% end %>
   </td>
 </tr>