Merge branch 'master' into openID

[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 2f73d2d4ed78c30b8fdb82df0cf9b4915bf8c9d1..202f9039d573b5a81ed954818c91f2af6ee40941 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -11,7 +11,7 @@
   </tr> 
   <tr>
     <td><%= t'trace.edit.uploaded_at' %></td>
   </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>
   </tr>
   <% if @trace.inserted? %>
   <tr>


@@ -28,11 +28,15 @@
   </tr>
   <tr>
     <td><%= t'trace.edit.description' %></td>
   </tr>
   <tr>
     <td><%= t'trace.edit.description' %></td>

-    <td><%= f.text_field :description %></td>
+    <td><%= f.text_field :description, :size => 50 %></td>

   </tr>
   <tr>
     <td><%= t'trace.edit.tags' %></td>
   </tr>
   <tr>
     <td><%= t'trace.edit.tags' %></td>

-    <td><%= f.text_field :tagstring %></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>
 
   </tr>
 </table>