Removed directions from roundabout exit instructions

[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 4ab46bd3ef5de04b7dda87d5d27fc1589af83090..df45f2f2d1102b3b82232f5d5e1a448971a5dba6 100644 (file)
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -1,19 +1,23 @@
-<h2><%= t 'trace.view.heading', :name => h(@trace.name) %></h2>
+<% content_for :heading do %>
+  <h2><%= t 'trace.view.heading', :name => h(@trace.name) %></h2>
+<% end %>

 
 

+<% 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 %>
   <% 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>
+    <span class="trace_pending"><%= t'trace.view.pending' %></span>

   <% end %>
   <% end %>

+<% end %>

 
 <table border="0">
   <tr>
     <td><%= t'trace.view.filename' %></td>
 
 <table border="0">
   <tr>
     <td><%= t'trace.view.filename' %></td>

-    <td><%= @trace.name %> (<%= link_to t('trace.view.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
-  </tr> 
+    <td><%= @trace.name %> (<%= link_to t('trace.view.download'), trace_data_path(@trace) %>)</td>
+  </tr>

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


@@ -21,12 +25,12 @@
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>
     <td><%= t'trace.view.start_coordinates' %></td>
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>
     <td><%= t'trace.view.start_coordinates' %></td>

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

   </tr>
   <% end %>
   <tr>
     <td><%= t'trace.view.owner' %></td>
   </tr>
   <% end %>
   <tr>
     <td><%= t'trace.view.owner' %></td>

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

   </tr>
   <tr>
     <td><%= t'trace.view.description' %></td>
   </tr>
   <tr>
     <td><%= t'trace.view.description' %></td>


@@ -36,26 +40,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.collect { |tag| link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } }.join(", ") %>
+      <%= 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>
+<% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?)%>
+  <div class="buttons">
+    <%= if_user(@trace.user) do %>
+      <%= button_to t('trace.view.edit_track'), trace_edit_path(@trace) %>

     <% end %>
     <% 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>
+    <%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %>
+  </div>
+<% end %>