Update Potlatch 2 to 2.3-534-g63a3364 build

[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 1001cadf9fdf241564523cc91d263a8cb400ff23..5a7c5bcc6c909d090d76dd90a3f277d8d80d514c 100644 (file)
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -1,10 +1,12 @@
 <h2><%= t 'trace.view.heading', :name => h(@trace.name) %></h2>
 
 <h2><%= t 'trace.view.heading', :name => h(@trace.name) %></h2>
 

+<% 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 %>
     <span style="color:red"><%= t'trace.view.pending' %></span>
   <% end %>
   <% 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"><%= t'trace.view.pending' %></span>
   <% end %>

+<% end %>

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


@@ -13,7 +15,7 @@
   </tr> 
   <tr>
     <td><%= t'trace.view.uploaded' %></td>
   </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>
   </tr>
   <% if @trace.inserted? %>
   <tr>


@@ -36,28 +38,25 @@
     <td><%= t'trace.view.tags' %></td>
     <td>
     <% unless @trace.tags.empty? %>
     <td><%= t'trace.view.tags' %></td>
     <td>
     <% unless @trace.tags.empty? %>

-      <% @trace.tags.each_with_index do |tag, index| %>
-        <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %><%=', ' if index+1 < @trace.tags.count %>
-      <% end %>
+      <%= raw(@trace.tags.collect { |tag| link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } }.join(", ")) %>

     <% else %>
       <i><%= t'trace.view.none' %></i>
     <% end %>
     </td>
   </tr>
     <% else %>
       <i><%= t'trace.view.none' %></i>
     <% end %>
     </td>
   </tr>

+  <tr>
+    <td><%= t'trace.view.visibility' %></td>
+    <td><%= t"trace.visibility.#{@trace.visibility}" %></td>
+  </tr>

 </table>
 
 <br /><br />
 
 </table>
 
 <br /><br />
 

-<table>
-  <tr>
-    <% unless @trace.public? %>
-    <td><%= button_to t('trace.view.make_public'), :controller => 'trace', :action => 'make_public', :id => @trace.id %></td>
-    <% end %>
-    <% 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 %>