Merge remote-tracking branch 'upstream/pull/2188'

[rails.git] / app / views / traces / show.html.erb

diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb
index 59c8a0a1f6da5778cb37dc2834aef5fd997b1857..111c71f3621e0852a1c9626ad92968a71bccacd7 100644 (file)
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -2,7 +2,7 @@
   <h2><%= t '.heading', :name => h(@trace.name) %></h2>
 <% end %>
 
   <h2><%= t '.heading', :name => h(@trace.name) %></h2>
 <% end %>
 

-<% if STATUS != :gpx_offline %>
+<% if Settings.status != "gpx_offline" %>

   <% if @trace.inserted %>
     <img src="<%= url_for :controller => 'traces', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
   <% else %>
   <% if @trace.inserted %>
     <img src="<%= url_for :controller => 'traces', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
   <% else %>


@@ -22,10 +22,10 @@
   <% if @trace.inserted? %>
   <tr>
     <td><%= t '.points' %></td>
   <% if @trace.inserted? %>
   <tr>
     <td><%= t '.points' %></td>

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

   <tr>
     <td><%= t '.start_coordinates' %></td>
   <tr>
     <td><%= t '.start_coordinates' %></td>

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

   </tr>
   <% end %>
   <tr>
   </tr>
   <% end %>
   <tr>


@@ -40,7 +40,7 @@
     <td><%= t '.tags' %></td>
     <td>
     <% unless @trace.tags.empty? %>
     <td><%= t '.tags' %></td>
     <td>
     <% unless @trace.tags.empty? %>

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

     <% else %>
       <i><%= t '.none' %></i>
     <% end %>
     <% else %>
       <i><%= t '.none' %></i>
     <% end %>


@@ -54,11 +54,11 @@
 
 <br /><br />
 
 
 <br /><br />
 

-<% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?)%>
+<% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?) %>

   <div class="buttons">
     <% if current_user == @trace.user %>
   <div class="buttons">
     <% if current_user == @trace.user %>

-      <%= link_to t('.edit_track'), edit_trace_path(@trace), :class => "button" %>
+      <%= link_to t('.edit_trace'), edit_trace_path(@trace), :class => "button" %>

     <% end %>
     <% end %>

-    <%= button_to t('.delete_track'), { :controller => 'traces', :action => 'delete', :id => @trace.id }, :data => { :confirm => t('.confirm_delete') } %>
+    <%= button_to t('.delete_trace'), { :controller => 'traces', :action => 'delete', :id => @trace.id }, { :data => { :confirm => t('.confirm_delete') } } %>

   </div>
 <% end %>
   </div>
 <% end %>