erblint: use hash rocket syntax

diff --git a/.erb-lint.yml b/.erb-lint.yml
index 29057feb246052d4a2d8f5b4b70d360a6c16e479..09e737b917eb69902c79f13801c557628750f824 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -43,8 +43,6 @@ linters:
         Enabled: false # TODO
       Rails/LinkToBlank:
         Enabled: false # TODO
         Enabled: false # TODO
       Rails/LinkToBlank:
         Enabled: false # TODO

-      Style/HashSyntax:
-        Enabled: false # TODO

       Style/SymbolProc:
         Enabled: false # TODO
       Style/Not:
       Style/SymbolProc:
         Enabled: false # TODO
       Style/Not:

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index 5cb99f2f16eb9ad2ecfd4bea804286673208d9cd..08adfde53d5e143b9b2d4e3e3d599712a7967a73 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -15,7 +15,7 @@
 </div>
 <br/>
 <div class="comment">
 </div>
 <br/>
 <div class="comment">

-  <%= form_for @new_comment, url: issue_comments_path(@issue) do |f| %>
+  <%= form_for @new_comment, :url => issue_comments_path(@issue) do |f| %>

   <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>
   <%= label_tag :reassign, t('.reassign_param') %> <%= check_box_tag :reassign, true %>
   <br/>
   <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>
   <%= label_tag :reassign, t('.reassign_param') %> <%= check_box_tag :reassign, true %>
   <br/>

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 9590632315f23ac3ca25976a91927abbed7f7d84..26833553fce17f7deb29b0c2e41aba8e99dc098b 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -6,7 +6,7 @@
 <p><%= t ".search_guidance" %></p>
 <%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => 'category_dropdown' } %>
 <%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => 'category_dropdown' } %>
 <p><%= t ".search_guidance" %></p>
 <%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => 'category_dropdown' } %>
 <%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => 'category_dropdown' } %>

-<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %>
+<%= text_field_tag :search_by_user, params[:search_by_user], :placeholder => t(".reported_user") %>

 <%= select_tag :last_updated_by, options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => 'category_dropdown' } %>
 <%= submit_tag t(".search"), :name => nil %>
 <% end %>
 <%= select_tag :last_updated_by, options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => 'category_dropdown' } %>
 <%= submit_tag t(".search"), :name => nil %>
 <% end %>

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index e8cfafb45cfa1d0f406aebeab86ebdfe5d57a710..3af1c402d6d139a71cbbe686c2ceb6f5a32ad459 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -27,14 +27,14 @@
     <% if @read_reports.present? %>
     <div class="read-reports">
       <h4><%= t ".read_reports" %></h4>
     <% if @read_reports.present? %>
     <div class="read-reports">
       <h4><%= t ".read_reports" %></h4>

-      <%= render 'reports', reports: @read_reports %>
+      <%= render 'reports', :reports => @read_reports %>

     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
     <div class="unread-reports">
       <h4><%= t ".new_reports" %></h4>
     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
     <div class="unread-reports">
       <h4><%= t ".new_reports" %></h4>

-      <%= render 'reports', reports: @unread_reports %>
+      <%= render 'reports', :reports => @unread_reports %>

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


@@ -59,4 +59,4 @@
 </div>
 
 <h3><%= t ".comments_on_this_issue" %></h3>
 </div>
 
 <h3><%= t ".comments_on_this_issue" %></h3>

-<%= render 'comments', comments: @comments %>
+<%= render 'comments', :comments => @comments %>

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 36614fd56b5a854b41957a73fdd0cb20e22c248c..115a6bac7d5e25fedd0487ede74fe5e2f0922746 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,7 +1,7 @@
 <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') } %>
 <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') } %>

-    <%= submit_tag t('site.search.submit_text'), :class => 'float', :data => { disable_with: false } %>
+    <%= 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') } %>
     <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') } %>


@@ -21,7 +21,7 @@
     </div>
     <div class="line">
       <select class="routing_engines" name="routing_engines"></select>
     </div>
     <div class="line">
       <select class="routing_engines" name="routing_engines"></select>

-      <%= submit_tag t('site.search.submit_text'), :class => "routing_go", :data => { disable_with: false } %>
+      <%= submit_tag t('site.search.submit_text'), :class => "routing_go", :data => { :disable_with => false } %>

     </div>
     <div class="line">
       <a class="reverse_directions"><%= t('site.search.reverse_directions_text') %></a>
     </div>
     <div class="line">
       <a class="reverse_directions"><%= t('site.search.reverse_directions_text') %></a>

diff --git a/app/views/layouts/notifier.html.erb b/app/views/layouts/notifier.html.erb
index 883f1b385acaeaa73fab4a3bebcd8723ebe16532..21b4e35ceb95a65cfb7910968ccaf6093a822461 100644 (file)
--- a/app/views/layouts/notifier.html.erb
+++ b/app/views/layouts/notifier.html.erb
@@ -12,7 +12,7 @@
             <tr>
               <td style="width: 30px; padding: 10px 10px 10px 0px">
                 <a href="<%= @root_url %>" target="_blank">
             <tr>
               <td style="width: 30px; padding: 10px 10px 10px 0px">
                 <a href="<%= @root_url %>" target="_blank">

-                  <%= image_tag attachments["logo.png"].url, alt: "OpenStreetMap", title: "OpenStreetMap", height: "30", width: "30", border: "0" %>
+                  <%= image_tag attachments["logo.png"].url, :alt => "OpenStreetMap", :title => "OpenStreetMap", :height => "30", :width => "30", :border => "0" %>

                 </a>
               </td>
               <%# the "width: 100%" here looks wrong, but I couldn't find a better way of making Outlook give this cell full width %>
                 </a>
               </td>
               <%# the "width: 100%" here looks wrong, but I couldn't find a better way of making Outlook give this cell full width %>

diff --git a/app/views/notifier/_message_body.html.erb b/app/views/notifier/_message_body.html.erb
index b3b0eb687d5b44277e6cd8d76d2e4134e2575562..29bd3e06372f2177af38f13e53da47f8b5c33f95 100644 (file)
--- a/app/views/notifier/_message_body.html.erb
+++ b/app/views/notifier/_message_body.html.erb
@@ -4,11 +4,11 @@
       <%= link_to(
             image_tag(
               attachments["avatar.png"].url,
       <%= link_to(
             image_tag(
               attachments["avatar.png"].url,

-              alt: @author,
-              title: @author,
-              width: 50,
-              height: 50,
-              border: 0
+              :alt => @author,
+              :title => @author,
+              :width => 50,
+              :height => 50,
+              :border => 0

             ),
             user_url(@author),
             :target => "_blank"
             ),
             user_url(@author),
             :target => "_blank"

diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index fb338b4979c2bd46376e2f96b7d5c315930ceb58..1d83a3a5932ce8ec399b80c4b7cb7e2b83fb38c8 100644 (file)
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -32,7 +32,7 @@
     </div>
 
     <div class='form-row'>
     </div>
 
     <div class='form-row'>

-      <%= text_area :report, :details, :cols => 20, :rows => 5, placeholder: t('.details') %>
+      <%= text_area :report, :details, :cols => 20, :rows => 5, :placeholder => t('.details') %>

     </div>
 
     <div class='buttons'>
     </div>
 
     <div class='buttons'>