Don't escape HTML in the "user suspended" message

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

diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index e14e152dd1cab05fc10a704c9b527cad5ce2be4e..a694d55bb07b718cc3bf906388d45852aa1d29a4 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -2,7 +2,7 @@
 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
 
-<% form_for :trace, @trace do |f| %>
+<%= form_for @trace, :url => { :action => "edit" } do |f| %>
 
 <table border="0">
   <tr>
@@ -11,7 +11,7 @@
   </tr> 
   <tr>
     <td><%= t'trace.edit.uploaded_at' %></td>
-    <td><%= l @trace.timestamp %></td>
+    <td><%= l @trace.timestamp, :format => :friendly %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>
@@ -34,6 +34,10 @@
     <td><%= t'trace.edit.tags' %></td>
     <td><%= f.text_field :tagstring, :size => 50 %> (<%= t'trace.edit.tags_help' %>)</td>
   </tr>
+  <tr>
+    <td><%= t'trace.edit.visibility' %></td>
+    <td><%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> (<a href="<%= t'trace.edit.visibility_help_url' %>"><%= t'trace.edit.visibility_help' %></a>)</td>
+  </tr>
 </table>
 
 <br /><br />