cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Whitespace fixes in traces erb files

Browse source
This commit is contained in:
Andy Allan 2019-03-06 10:17:44 +01:00 • committed by Tom Hughes
parent 9afcf14dfa
commit bbd44f8099
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/traces/_trace.html.erb
View file

@ -12,16 +12,16 @@
<td class="<%= cl %>"><%= link_to trace.name, { :controller => 'traces', :action => 'show', :display_name => trace.user.display_name, :id => trace.id } %> <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 %>"> ... <span class="trace_summary" title="<%= trace.timestamp %>"> ...
<% if trace.inserted %> <% 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 %> <% end %>
... <%= t '.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span> ... <%= 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_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 t('.edit'), { :controller => 'site', :action => 'edit', :gpx => trace.id }, { :title => t('.edit_map') } %>
<span class="trace_<%= trace.visibility %>"><%= t('.' + trace.visibility) %></span> <span class="trace_<%= trace.visibility %>"><%= t('.' + trace.visibility) %></span>
<br /> <br />
<%= trace.description %> <%= trace.description %>
<br /> <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? %> <% if !trace.tags.empty? %>
<%= t '.in' %> <%= t '.in' %>
<%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %> <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>

6
app/views/traces/edit.html.erb
View file

@ -19,7 +19,7 @@
<% if @trace.inserted? %> <% if @trace.inserted? %>
<div class='form-row'> <div class='form-row'>
<label class='standard-label'><%= t '.points' %></label> <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>
<div class='form-row'> <div class='form-row'>
<label class='standard-label'><%= t '.start_coord' %></label> <label class='standard-label'><%= t '.start_coord' %></label>
@ -28,7 +28,7 @@
<span class="latitude"><%= @trace.latitude %></span>; <span class="latitude"><%= @trace.latitude %></span>;
<span class="longitude"><%= @trace.longitude %></span> <span class="longitude"><%= @trace.longitude %></span>
</div> </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 %> <% end %>
<div class='form-row'> <div class='form-row'>
<label class='standard-label'><%= t '.owner' %></label> <label class='standard-label'><%= t '.owner' %></label>
@ -44,7 +44,7 @@
</div> </div>
<div class='form-row'> <div class='form-row'>
<label class='standard-label'><%= t '.visibility' %></label> <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> </div>
</fieldset> </fieldset>

2
app/views/traces/new.html.erb
View file

@ -22,7 +22,7 @@
</div> </div>
<div class='form-row'> <div class='form-row'>
<label class="standard-label"><%= t '.visibility' %></label> <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> <span class="form-help deemphasize">(<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)</span>
</div> </div>
</fieldset> </fieldset>

6
app/views/traces/show.html.erb
View file

@ -22,10 +22,10 @@
<% if @trace.inserted? %> <% if @trace.inserted? %>
<tr> <tr>
<td><%= t '.points' %></td> <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> <tr>
<td><%= t '.start_coordinates' %></td> <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> </tr>
<% end %> <% end %>
<tr> <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"> <div class="buttons">
<% if current_user == @trace.user %> <% if current_user == @trace.user %>
<%= link_to t('.edit_trace'), edit_trace_path(@trace), :class => "button" %> <%= link_to t('.edit_trace'), edit_trace_path(@trace), :class => "button" %>