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

erblint: Add or remove curly braces around hash parameters as required

Browse source
This commit is contained in:
Andy Allan 2019-03-27 10:30:48 +01:00
parent 040c0184a4
commit 74b91c0e3e
25 changed files with 53 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.erb-lint.yml
View file

@ -27,8 +27,6 @@ linters:
Enabled: false
Style/StringLiterals:
Enabled: false # TODO
Style/BracesAroundHashParameters:
Enabled: false # TODO
Rails/DynamicFindBy:
Enabled: false # TODO
Style/AndOr:

2
app/views/browse/_common_details.html.erb
View file

@ -26,7 +26,7 @@
<% if @type == "node" and common_details.visible? %>
<div class="details geo">
<%= 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}") %>
</div>
<% end %>

2
app/views/browse/_node.html.erb
View file

@ -14,7 +14,7 @@
<h4><%= t 'browse.part_of' %></h4>
<ul>
<% node.ways.uniq.each do |way| %>
<li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, { :class => link_class('way', way), :title => link_title(way) } %></li>
<% end %>
<%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
</ul>

2
app/views/browse/_relation_member.html.erb
View file

@ -1,6 +1,6 @@
<%
member_class = link_class(relation_member.member_type.downcase, relation_member.member)
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)
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
%>
<li class="<%= member_class %>">

4
app/views/browse/_way.html.erb
View file

@ -22,10 +22,10 @@
<ul>
<% way.way_nodes.each do |wn| %>
<li>
<%= 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) %>
<%= 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 %>
</li>
<% end %>

6
app/views/browse/changeset.html.erb
View file

@ -91,7 +91,7 @@
</h4>
<ul>
<% @ways.each do |way| %>
<li><%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<li><%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class('way', way), :title => link_title(way) } %></li>
<% end %>
</ul>
<% end %>
@ -103,7 +103,7 @@
</h4>
<ul>
<% @relations.each do |relation| %>
<li><%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
<li><%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class('relation', relation), :title => link_title(relation) } %></li>
<% end %>
</ul>
<% end %>
@ -115,7 +115,7 @@
</h4>
<ul>
<% @nodes.each do |node| %>
<li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node), :rel => link_follow(node) %></li>
<li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class('node', node), :title => link_title(node), :rel => link_follow(node) } %></li>
<% end %>
</ul>
<% end %>

4
app/views/diary_entries/comments.html.erb
View file

@ -19,6 +19,6 @@
</table>
<div class='secondary-actions clearfix'>
<span><%= link_to t('.older_comments'), { :page => @comment_pages.current.next } if @comment_pages.current.next %>
<%= link_to t('.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></span>
<span><%= link_to t('.older_comments'), :page => @comment_pages.current.next if @comment_pages.current.next %>
<%= link_to t('.newer_comments'), :page => @comment_pages.current.previous if @comment_pages.current.previous %></span>
</div>

4
app/views/diary_entries/index.html.erb
View file

@ -13,13 +13,13 @@
<% if @user %>
<% if @user == current_user %>
<div>
<li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, { :title => t('.new_title') } %></li>
<li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, :title => t('.new_title') %></li>
</div>
<% end %>
<% else %>
<% if current_user %>
<div>
<li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, { :title => t('.new_title') } %></li>
<li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, :title => t('.new_title') %></li>
</div>
<% end %>
<% end %>

18
app/views/layouts/_head.html.erb
View file

@ -18,18 +18,18 @@
<%= favicon_link_tag "favicon-96x96.png", :rel => "icon", :sizes => "96x96", :type => "image/png" %>
<%= favicon_link_tag "android-chrome-192x192.png", :rel => "icon", :sizes => "192x192", :type => "image/png" %>
<%= favicon_link_tag "favicon-16x16.png", :rel => "icon", :sizes => "16x16", :type => "image/png" %>
<%= tag("link", { :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f" }) %>
<%= tag("link", { :rel => "manifest", :href => asset_path("manifest.json") }) %>
<%= tag("meta", { :name => "msapplication-config", :content => asset_path("browserconfig.xml") }) %>
<%= tag("meta", { :name => "msapplication-TileColor", :content => "#00a300" }) %>
<%= tag("meta", { :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png") }) %>
<%= tag("meta", { :name => "theme-color", :content => "#ffffff" }) %>
<%= tag("link", :rel => "mask-icon", :href => asset_path("tab-icon.svg"), :color => "#7ebc6f") %>
<%= tag("link", :rel => "manifest", :href => asset_path("manifest.json")) %>
<%= tag("meta", :name => "msapplication-config", :content => asset_path("browserconfig.xml")) %>
<%= tag("meta", :name => "msapplication-TileColor", :content => "#00a300") %>
<%= tag("meta", :name => "msapplication-TileImage", :content => image_path("mstile-144x144.png")) %>
<%= tag("meta", :name => "theme-color", :content => "#ffffff") %>
<%= canonical_tag %>
<% if Settings.key?(:publisher_url) -%>
<%= tag("link", { :rel => "publisher", :href => Settings.publisher_url }) %>
<%= tag("link", :rel => "publisher", :href => Settings.publisher_url) %>
<% end -%>
<%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") }) %>
<%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
<%= tag("link", :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml")) %>
<%= tag("meta", :name => "description", :content => "OpenStreetMap is the free wiki world map.") %>
<%= opengraph_tags(@title) %>
<% if flash[:piwik_goal] -%>
<%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %>

4
app/views/layouts/_search.html.erb
View file

@ -1,10 +1,10 @@
<div class="search_forms">
<form method="GET" action="<%= search_path %>" class="search_form">
<%= link_to image_tag('directions.png', :class => 'button'), directions_path, { :class => "button switch_link", :title => t('site.search.get_directions_title') } %>
<%= link_to image_tag('directions.png', :class => 'button'), directions_path, :class => "button switch_link", :title => t('site.search.get_directions_title') %>
<%= submit_tag t('site.search.submit_text'), :class => 'float', :data => { :disable_with => false } %>
<div class='query_wrapper'>
<%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :class => 'overflow' %>
<%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
<%= link_to t('site.search.where_am_i'), '#', :class => "describe_location", :title => t('site.search.where_am_i_title') %>
</div>
</form>

6
app/views/messages/_message_summary.html.erb
View file

@ -2,7 +2,7 @@
<td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), user_path(message_summary.sender) %></td>
<td class="inbox-subject"><%= link_to h(message_summary.title), message_path(message_summary) %></td>
<td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>
<td class="inbox-mark-unread"><%= button_to t('.unread_button'), message_mark_path(message_summary, :mark => 'unread'), { :remote => true } %></td>
<td class="inbox-mark-read"><%= button_to t('.read_button'), message_mark_path(message_summary, :mark => 'read'), { :remote => true } %></td>
<td class="inbox-destroy"><%= button_to t('.destroy_button'), message_path(message_summary, :referer => request.fullpath), { :method => :delete, :remote => true } %></td>
<td class="inbox-mark-unread"><%= button_to t('.unread_button'), message_mark_path(message_summary, :mark => 'unread'), :remote => true %></td>
<td class="inbox-mark-read"><%= button_to t('.read_button'), message_mark_path(message_summary, :mark => 'read'), :remote => true %></td>
<td class="inbox-destroy"><%= button_to t('.destroy_button'), message_path(message_summary, :referer => request.fullpath), :method => :delete, :remote => true %></td>
</tr>

2
app/views/messages/_sent_message_summary.html.erb
View file

@ -2,5 +2,5 @@
<td class="inbox-sender"><%= link_to h(sent_message_summary.recipient.display_name), user_path(sent_message_summary.recipient) %></td>
<td class="inbox-subject"><%= link_to h(sent_message_summary.title), message_path(sent_message_summary) %></td>
<td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
<td class="inbox-destroy"><%= button_to t('.destroy_button'), message_path(sent_message_summary, :referer => request.fullpath), { :method => :delete, :remote => true } %></td>
<td class="inbox-destroy"><%= button_to t('.destroy_button'), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true %></td>
</tr>

4
app/views/notes/_notes_paging_nav.html.erb
View file

@ -1,7 +1,7 @@
<p>
<% if @page > 1 %>
<%= link_to t('changesets.changeset_paging_nav.previous'), @params.merge({ :page => @page - 1 }) %>
<%= link_to t('changesets.changeset_paging_nav.previous'), @params.merge(:page => @page - 1) %>
<% else %>
<%= t('changesets.changeset_paging_nav.previous') %>
<% end %>
@ -11,7 +11,7 @@
<% if @notes.size < @page_size %>
<%= t('changesets.changeset_paging_nav.next') %>
<% else %>
<%= link_to t('changesets.changeset_paging_nav.next'), @params.merge({ :page => @page + 1 }) %>
<%= link_to t('changesets.changeset_paging_nav.next'), @params.merge(:page => @page + 1) %>
<% end %>
</p>

2
app/views/site/edit.html.erb
View file

@ -5,7 +5,7 @@
<p><%= t 'layouts.osm_read_only' %></p>
<% elsif !current_user.data_public? %>
<p><%= t '.not_public' %></p>
<p><%= raw t '.not_public_description', :user_page => (link_to t('.user_page_link'), { :controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public' }) %></p>
<p><%= raw t '.not_public_description', :user_page => (link_to t('.user_page_link'), :controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public') %></p>
<p><%= raw t 'site.edit.anon_edits', :link => link_to(t('.anon_edits_link_text'), t('.anon_edits_link')) %></p>
<% else %>
<%= render :partial => preferred_editor %>

2
app/views/site/export.html.erb
View file

@ -5,7 +5,7 @@
<%= t '.title' %>
</h2>
<%= form_tag({ :controller => "export", :action => "finish" }, :class => "export_form") do %>
<%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %>
<%= hidden_field_tag 'format', 'osm' %>
<div class='export_area_inputs'>

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

@ -9,7 +9,7 @@
<% end %>
<% end %>
</td>
<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 %>"> ...
<% if trace.inserted %>
(<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %>)

4
app/views/traces/_trace_paging_nav.html.erb
View file

@ -2,7 +2,7 @@
<% if @traces.size > 1 %>
<% if @page > 1 %>
<%= link_to t('.newer'), @params.merge({ :page => @page - 1 }) %>
<%= link_to t('.newer'), @params.merge(:page => @page - 1) %>
<% else %>
<%= t('.newer') %>
<% end %>
@ -12,7 +12,7 @@
<% if @traces.size < @page_size %>
<%= t('.older') %>
<% else %>
<%= link_to t('.older'), @params.merge({ :page => @page + 1 }) %>
<%= link_to t('.older'), @params.merge(:page => @page + 1) %>
<% end %>
<% end %>
</p>

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

@ -40,7 +40,7 @@
<td><%= t '.tags' %></td>
<td>
<% unless @trace.tags.empty? %>
<%= raw(@trace.tags.collect { |tag| link_to tag.tag, { :controller => 'traces', :action => 'index', :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 %>
@ -59,6 +59,6 @@
<% if current_user == @trace.user %>
<%= link_to t('.edit_trace'), edit_trace_path(@trace), :class => "button" %>
<% end %>
<%= button_to t('.delete_trace'), { :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 %>

4
app/views/user_blocks/_blocks.html.erb
View file

@ -20,7 +20,7 @@
<ul class='secondary-actions'>
<% if @user_blocks_pages.current_page.number > 1 -%>
<li><%= link_to t('.previous'), @params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %></li>
<li><%= link_to t('.previous'), @params.merge(:page => @user_blocks_pages.current_page.number - 1) %></li>
<% else -%>
<li><%= t('.previous') %></li>
<% end -%>
@ -28,7 +28,7 @@
<li><%= t('.showing_page', :page => @user_blocks_pages.current_page.number) %></li>
<% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>
<li><%= link_to t('.next'), @params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %></li>
<li><%= link_to t('.next'), @params.merge(:page => @user_blocks_pages.current_page.number + 1) %></li>
<% else -%>
<li><%= t('.next') %></li>
<% end -%>

2
app/views/user_blocks/show.html.erb
View file

@ -14,7 +14,7 @@
<li><%= link_to t('.edit'), edit_user_block_path(@user_block) %></li>
<% end %>
<% if current_user and current_user.moderator? %>
<li><%= link_to(t('.revoke'), { :controller => 'user_blocks', :action => 'revoke', :id => @user_block.id }) %></li>
<li><%= link_to(t('.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => @user_block.id) %></li>
<% end %>
<% end %>
<li><%= link_to t('.back'), user_blocks_path %></li>

4
app/views/users/account.html.erb
View file

@ -36,12 +36,12 @@
<fieldset>
<div class="form-row">
<label class="standard-label"><%= t 'users.new.password' %></label>
<%= f.password_field :pass_crypt, { :value => '', :autocomplete => :off } %>
<%= f.password_field :pass_crypt, :value => '', :autocomplete => :off %>
</div>
<div class="form-row">
<label class="standard-label"><%= t 'users.new.confirm password' %></label>
<%= f.password_field :pass_crypt_confirmation, { :value => '', :autocomplete => :off } %>
<%= f.password_field :pass_crypt_confirmation, :value => '', :autocomplete => :off %>
</div>
</fieldset>

4
app/views/users/login.html.erb
View file

@ -44,7 +44,7 @@
<% end %>
<%= form_tag(auth_path(:provider => "openid"), { :id => "openid_login_form" }) do %>
<%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
<div id="loginForm" class="standard-form">
<fieldset class='form-divider'>
@ -76,7 +76,7 @@
<div id='login_openid_url' class='form-row'>
<label for='openid_url' class="standard-label"><%= raw t '.openid', :logo => openid_logo %></label>
<%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %>
<%= text_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %>
<%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url") %>
<span class="minorNote">(<a href="<%= t 'users.account.openid.link' %>" target="_new"><%= t 'users.account.openid.link text' %></a>)</span>
</div>

2
app/views/users/lost_password.html.erb
View file

@ -7,7 +7,7 @@
<%= form_tag :action => 'lost_password' do %>
<div class="standard-form">
<label class="standard-label"><%= t '.email address' %></label>
<%= text_field('user', 'email', { :tabindex => 1 }) %>
<%= text_field('user', 'email', :tabindex => 1) %>
<%= submit_tag t('.new password button'), :tabindex => 2 %>
</div>
<% end %>

14
app/views/users/new.html.erb
View file

@ -16,14 +16,14 @@
<label for="email" class="standard-label">
<%= t '.email address' %>
</label>
<%= f.email_field(:email, { :tabindex => 1 }) %>
<%= f.email_field(:email, :tabindex => 1) %>
<%= f.error_message_on(:email) %>
</div>
<div class="form-row">
<label for="email_confirmation" class="standard-label">
<%= t '.confirm email address' %>
</label>
<%= f.email_field(:email_confirmation, { :tabindex => 2 }) %>
<%= f.email_field(:email_confirmation, :tabindex => 2) %>
<%= f.error_message_on(:email_confirmation) %>
</div>
<span class="form-help deemphasize"><%= raw(t '.not displayed publicly') %></span>
@ -34,7 +34,7 @@
<label for="display_name" class="standard-label">
<%= t '.display name' %>
</label>
<%= f.text_field(:display_name, { :tabindex => 3 }) %>
<%= f.text_field(:display_name, :tabindex => 3) %>
<%= f.error_message_on(:display_name) %>
</div>
<span class="form-help deemphasize"><%= t '.display name description' %></span>
@ -45,8 +45,8 @@
<label for="openid_url" class="standard-label">
<%= raw t '.external auth' %>
</label>
<%= f.select(:auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %>
<%= f.text_field(:auth_uid, { :tabindex => 5 }) %>
<%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
<%= f.text_field(:auth_uid, :tabindex => 5) %>
<%= f.error_message_on(:auth_uid) %>
</div>
<span class="form-help deemphasize"><%= t '.auth no password' %></span>
@ -57,14 +57,14 @@
<label for='user[pass_crypt]' class="standard-label">
<%= t '.password' %>
</label>
<%= f.password_field(:pass_crypt, { :tabindex => 6 }) %>
<%= f.password_field(:pass_crypt, :tabindex => 6) %>
<%= f.error_message_on(:pass_crypt) %>
</div>
<div class="form-row">
<label class="standard-label">
<%= t '.confirm password' %>
</label>
<%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %>
<%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>
<%= f.error_message_on(:pass_crypt_confirmation) %>
</div>
</fieldset>

4
app/views/users/reset_password.html.erb
View file

@ -9,11 +9,11 @@
<div class="standard-form">
<fieldset>
<label class="standard-label"><%= t '.password' %></label>
<%= password_field(:user, :pass_crypt, { :value => '', :tabindex => 4 }) %>
<%= password_field(:user, :pass_crypt, :value => '', :tabindex => 4) %>
</fieldset>
<fieldset>
<label class="standard-label"><%= t '.confirm password' %></label>
<%= password_field(:user, :pass_crypt_confirmation, { :value => '', :tabindex => 5 }) %>
<%= password_field(:user, :pass_crypt_confirmation, :value => '', :tabindex => 5) %>
</fieldset>
<%= submit_tag t('.reset'), :tabindex => 6 %>
</div>