User an RJS template for the javascript response

[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 c1d5e044570f1b1b197fa62e284f3a69525cb3db..0d9b6213f81a1ebb3dc4b69de7645b688d0869d8 100644 (file)
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -1,6 +1,6 @@
 <h2><%= t 'trace.view.heading', :name => h(@trace.name) %></h2>
 
-<% if OSM_STATUS != :gpx_offline %>
+<% if STATUS != :gpx_offline %>
   <% if @trace.inserted %>
     <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
   <% else %>
@@ -15,7 +15,7 @@
   </tr> 
   <tr>
     <td><%= t'trace.view.uploaded' %></td>
-    <td><%= l @trace.timestamp %></td>
+    <td><%= l @trace.timestamp, :format => :friendly %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>
@@ -52,13 +52,11 @@
 
 <br /><br />
 
-<table>
-  <tr>
-    <% if @trace.user == @user %>
-    <td><%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %></td>
-    <% end %>
-    <% if @trace.user == @user %>
-    <td><%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %></td>
-    <% end %>
-  </tr>
-</table>
+<% if_user(@trace.user) do %>
+  <table>
+    <tr>
+      <td><%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %></td>
+      <td><%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %></td>
+    </tr>
+  </table>
+<% end %>