Whitespace fixes in traces erb files

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index 849695e80f86514fb7321b2fc8c129a88edd65d0..35536f3e8b363ed7230602349c7ddec2b6565285 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -12,16 +12,16 @@
   <td class="<%= cl %>"><%= link_to trace.name, { :controller => 'traces', :action => 'show', :display_name => trace.user.display_name, :id => trace.id } %>
     <span class="trace_summary" title="<%= trace.timestamp %>"> ...
       <% if trace.inserted %>
   <td class="<%= cl %>"><%= link_to trace.name, { :controller => 'traces', :action => 'show', :display_name => trace.user.display_name, :id => trace.id } %>
     <span class="trace_summary" title="<%= trace.timestamp %>"> ...
       <% if trace.inserted %>

-        (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
+        (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %>)

       <% end %>
       ... <%= t '.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
       <% end %>
       ... <%= t '.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>

-      <%= link_to_if trace.inserted?, t('.map'), {:controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('.view_map')} %> /
-      <%= link_to t('.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('.edit_map')} %>
+      <%= link_to_if trace.inserted?, t('.map'), { :controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}" }, { :title => t('.view_map') } %> /
+      <%= link_to t('.edit'), { :controller => 'site', :action => 'edit', :gpx => trace.id }, { :title => t('.edit_map') } %>

       <span class="trace_<%= trace.visibility %>"><%= t('.' + trace.visibility) %></span>
       <br />
       <%= trace.description %>
     <br />
       <span class="trace_<%= trace.visibility %>"><%= t('.' + trace.visibility) %></span>
       <br />
       <%= trace.description %>
     <br />

-    <%= t '.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %>
+    <%= t '.by' %> <%= link_to h(trace.user.display_name), user_path(trace.user) %>

     <% if !trace.tags.empty? %>
       <%= t '.in' %>
       <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
     <% if !trace.tags.empty? %>
       <%= t '.in' %>
       <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>

diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index b5b4a84d667fc9523406607df8f9861169c843e3..0900a45dc7884cff714541c90e0bdef565232281 100644 (file)
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -19,7 +19,7 @@
   <% if @trace.inserted? %>
     <div class='form-row'>
       <label class='standard-label'><%= t '.points' %></label>
   <% if @trace.inserted? %>
     <div class='form-row'>
       <label class='standard-label'><%= t '.points' %></label>

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

     </div>
     <div class='form-row'>
       <label class='standard-label'><%= t '.start_coord' %></label>
     </div>
     <div class='form-row'>
       <label class='standard-label'><%= t '.start_coord' %></label>


@@ -28,7 +28,7 @@
       <span class="latitude"><%= @trace.latitude %></span>;
       <span class="longitude"><%= @trace.longitude %></span>
     </div>
       <span class="latitude"><%= @trace.latitude %></span>;
       <span class="longitude"><%= @trace.longitude %></span>
     </div>

-    (<%=link_to t('.map'), :controller => 'site', :action => 'index', :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}" %>)
+    (<%= link_to t('.map'), :controller => 'site', :action => 'index', :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}" %>)

   <% end %>
     <div class='form-row'>
       <label class='standard-label'><%= t '.owner' %></label>
   <% end %>
     <div class='form-row'>
       <label class='standard-label'><%= t '.owner' %></label>


@@ -44,7 +44,7 @@
     </div>
     <div class='form-row'>
       <label class='standard-label'><%= t '.visibility' %></label>
     </div>
     <div class='form-row'>
       <label class='standard-label'><%= t '.visibility' %></label>

-      <%= f.select :visibility, [[t('traces.visibility.private'),"private"], [t('traces.visibility.public'),"public"], [t('traces.visibility.trackable'),"trackable"], [t('traces.visibility.identifiable'),"identifiable"]] %> (<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)
+      <%= f.select :visibility, [[t('traces.visibility.private'), "private"], [t('traces.visibility.public'), "public"], [t('traces.visibility.trackable'), "trackable"], [t('traces.visibility.identifiable'), "identifiable"]] %> (<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)

     </div>
   </fieldset>
 
     </div>
   </fieldset>
 

diff --git a/app/views/traces/new.html.erb b/app/views/traces/new.html.erb
index 42d9f8ab27a1b051bcd5333f89f279d16a0bd504..d72899f169a20b6987cea731879d0426a632d656 100644 (file)
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -22,7 +22,7 @@
       </div>
       <div class='form-row'>
         <label class="standard-label"><%= t '.visibility' %></label>
       </div>
       <div class='form-row'>
         <label class="standard-label"><%= t '.visibility' %></label>

-        <%= f.select :visibility, [[t('traces.visibility.private'),"private"],[t('traces.visibility.public'),"public"],[t('traces.visibility.trackable'),"trackable"],[t('traces.visibility.identifiable'),"identifiable"]] %>
+        <%= f.select :visibility, [[t('traces.visibility.private'), "private"], [t('traces.visibility.public'), "public"], [t('traces.visibility.trackable'), "trackable"], [t('traces.visibility.identifiable'), "identifiable"]] %>

         <span class="form-help deemphasize">(<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)</span>
       </div>
     </fieldset>
         <span class="form-help deemphasize">(<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)</span>
       </div>
     </fieldset>

diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb
index f8e8510f9de286c3d1b857fb3b6e2f9d0e3386ce..cea119d5469aec8e8d943216d98212b965434622 100644 (file)
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -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>


@@ -54,7 +54,7 @@
 
 <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 %>
       <%= link_to t('.edit_trace'), edit_trace_path(@trace), :class => "button" %>
   <div class="buttons">
     <% if current_user == @trace.user %>
       <%= link_to t('.edit_trace'), edit_trace_path(@trace), :class => "button" %>