We don't need the @notice hack - we can use flash.now to achieve the same thing.

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

diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index 80733844db285c7a9f107465248f3ff32ce1233f..47a9f8ad22f1f4fed9f8cea05252fefd4ece282a 100644 (file)
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -1,4 +1,4 @@
-<h2><%= t 'trace.view.heading', :name => @trace.name %></h2>
+<h2><%= t 'trace.view.heading', :name => h(@trace.name) %></h2>
 
   <% if @trace.inserted %>
     <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
@@ -35,24 +35,23 @@
   <tr>
     <td><%= t'trace.view.tags' %></td>
     <td>
-    <% if @trace.tags %>
-      <% @trace.tags.each do |tag| %>
-        <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %>
-      <% end %>
+    <% unless @trace.tags.empty? %>
+      <%= @trace.tags.collect { |tag| link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } }.join(", ") %>
     <% else %>
-      <%= t'trace.view.none' %>
+      <i><%= t'trace.view.none' %></i>
     <% end %>
     </td>
   </tr>
+  <tr>
+    <td><%= t'trace.view.visibility' %></td>
+    <td><%= t"trace.visibility.#{@trace.visibility}" %></td>
+  </tr>
 </table>
 
 <br /><br />
 
 <table>
   <tr>
-    <% unless @trace.public? %>
-    <td><%= button_to t('trace.view.make_public'), :controller => 'trace', :action => 'make_public', :id => @trace.id %></td>
-    <% end %>
     <% if @trace.user == @user %>
     <td><%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %></td>
     <% end %>