Fix exception with GPX and RSS notes#index when no notes are found

[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 523607ae63b660094bcd930dbe92a175b261b105..32c07db75b8f9c0243f499f3cae2a0e485773a39 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -1,17 +1,19 @@
-<h2><%= t 'trace.edit.heading', :name => h(@trace.name) %></h2>
+<% content_for :heading do %>
+  <h2><%= t 'trace.edit.heading', :name => h(@trace.name) %></h2>
+<% end %>

 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
 
 
 <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>
     <td><%= t'trace.edit.filename' %></td>
     <td><%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
 
 <table border="0">
   <tr>
     <td><%= t'trace.edit.filename' %></td>
     <td><%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>

-  </tr> 
+  </tr>

   <tr>
     <td><%= t'trace.edit.uploaded_at' %></td>
   <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>