edit diary entries

[rails.git] / app / views / trace / view.rhtml

diff --git a/app/views/trace/view.rhtml b/app/views/trace/view.rhtml
index f351a1deafa5d25bb7d95b996a21435a652e098c..585342c0224c6abc6c88f024d194ee40efbf6ee9 100644 (file)
--- a/app/views/trace/view.rhtml
+++ b/app/views/trace/view.rhtml
@@ -1,6 +1,10 @@
-<h2><%= @title %></h2>
+<h2><%= h(@title) %></h2>

 
 

-<img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
+  <% if @trace.inserted %>
+    <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
+  <% else %>
+    <span style="color:red">PENDING</span>
+  <% end %>

 
 <table border="0">
   <tr>
 
 <table border="0">
   <tr>


@@ -17,16 +21,16 @@
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>
     <td>Start coordinate:</td>
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>
     <td>Start coordinate:</td>

-    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to 'map', :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to 'edit', :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %>)</td>
+    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to 'map', :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to 'edit', :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)</td>

   </tr>
   <% end %>
   <tr>
     <td>Owner:</td>
   </tr>
   <% end %>
   <tr>
     <td>Owner:</td>

-    <td><%= link_to @trace.user.display_name, {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>
+    <td><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>

   </tr>
   <tr>
     <td>Description:</td>
   </tr>
   <tr>
     <td>Description:</td>

-    <td><%= @trace.description %></td>
+    <td><%= h(@trace.description) %></td>

   </tr>
   <tr>
     <td>Tags:</td>
   </tr>
   <tr>
     <td>Tags:</td>


@@ -49,7 +53,10 @@
     <% unless @trace.public? %>
     <td><%= button_to 'Make this track public permanently', :controller => 'trace', :action => 'make_public', :id => @trace.id %></td>
     <% end %>
     <% unless @trace.public? %>
     <td><%= button_to 'Make this track public permanently', :controller => 'trace', :action => 'make_public', :id => @trace.id %></td>
     <% end %>

-    <% if @trace.user.id == @user.id %>
+    <% if @trace.user == @user %>
+    <td><%= button_to 'Edit this track', :controller => 'trace', :action => 'edit', :id => @trace.id %></td>
+    <% end %>
+    <% if @trace.user == @user %>

     <td><%= button_to 'Delete this track', :controller => 'trace', :action => 'delete', :id => @trace.id %></td>
     <% end %>
   </tr>
     <td><%= button_to 'Delete this track', :controller => 'trace', :action => 'delete', :id => @trace.id %></td>
     <% end %>
   </tr>