From: Andy Allan Date: Wed, 6 Mar 2019 09:59:55 +0000 (+0100) Subject: Whitespace fixes for browse erb files X-Git-Tag: live~2635^2~9 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3c410bcd7e7934dc8c7e1cd8c0ab974f22730527 Whitespace fixes for browse erb files --- diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 17a5f1f40..3b3030abf 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -26,7 +26,7 @@ <% if @type == "node" and common_details.visible? %>
<%= t 'browse.location' %> - <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :anchor => "map=18/#{common_details.lat}/#{common_details.lon}"}) %> + <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), { :controller => 'site', :action => 'index', :anchor => "map=18/#{common_details.lat}/#{common_details.lon}" }) %>
<% end %> diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb index 1b26a89b6..391462d92 100644 --- a/app/views/browse/_containing_relation.html.erb +++ b/app/views/browse/_containing_relation.html.erb @@ -5,4 +5,5 @@ else raw t '.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role) end -%> + %> + diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb index e187da6ca..e7c4817b0 100644 --- a/app/views/browse/_relation.html.erb +++ b/app/views/browse/_relation.html.erb @@ -11,7 +11,7 @@ <%= render :partial => "common_details", :object => relation %> <% unless relation.containing_relation_members.empty? %> -

<%= t'browse.part_of' %>

+

<%= t 'browse.part_of' %>

<% end %> diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb index cedc6f5e9..5b6b5c365 100644 --- a/app/views/browse/_relation_member.html.erb +++ b/app/views/browse/_relation_member.html.erb @@ -3,10 +3,12 @@ linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) type_str = t '.type.' + relation_member.member_type.downcase %> -
  • <%= +
  • + <%= if relation_member.member_role.blank? raw t '.entry', :type => type_str, :name => linked_name else raw t '.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role) end - %>
  • + %> + diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index 4f331b5e9..7099f015a 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -11,7 +11,7 @@ <%= render :partial => "common_details", :object => way %> <% unless way.containing_relation_members.empty? %> -

    <%= t'browse.part_of' %>

    +

    <%= t 'browse.part_of' %>

    @@ -25,7 +25,7 @@ <%= link_to printable_name(wn.node), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) %> <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> <% if related_ways.size > 0 then %> - (<%= raw t '.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) + (<%= raw t '.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w)) }.to_sentence %>) <% end %> <% end %> diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 1328461d7..1d09cbedf 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -36,8 +36,9 @@
  • <%= t(".commented_by", - :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at), - :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> + :when => friendly_date(comment.created_at), + :exact_time => l(comment.created_at), + :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> <% if current_user and current_user.moderator? %> — <%= t('javascripts.changesets.show.hide_comment') %> <% end %> @@ -48,8 +49,9 @@
  • <%= t(".hidden_commented_by", - :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at), - :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> + :when => friendly_date(comment.created_at), + :exact_time => l(comment.created_at), + :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> — <%= t('javascripts.changesets.show.unhide_comment') %> <%= comment.body.to_html %> @@ -109,7 +111,7 @@ <% unless @nodes.empty? %>

    <%= type_and_paginated_count('node', @node_pages) %> - <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> + <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page" } %>

      <% @nodes.each do |node| %>