erblint: use consistent spacing in HTML tags

diff --git a/.erb-lint.yml b/.erb-lint.yml
index ed5fe48af5dac678e35c66a8070c22f5772b6c5b..c78bcd178af4db1f68fcd306c7dbc853908e7e1b 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -3,7 +3,7 @@ linters:
   SelfClosingTag:
     enabled: false
   SpaceInHtmlTag:
-    enabled: false # TODO
+    enabled: true
   Rubocop:
     enabled: true
     rubocop_config:

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 0ec89da9dae330b257c4b1fc15adb81c08bb88df..d52a4742613f2e224f1bea067fb07d0513108eda 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -74,7 +74,7 @@
       <form action="#">
         <textarea class="comment" name="text" cols="40" rows="5"></textarea>
         <div class="buttons clearfix">
-          <input type="submit" name="comment" value="<%= t("javascripts.changesets.show.comment") %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/>
+          <input type="submit" name="comment" value="<%= t("javascripts.changesets.show.comment") %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" />
         </div>
       </form>
     <% else %>

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 75d85ae0488b5f11c497a162cb1fd6c7c9456ec6..c7989d789a8991e82aba1af6745dac89d77ce373 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -14,7 +14,7 @@
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
     <%= note_event("open", @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
-      <br/>
+      <br />
       <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
     <% end %>
   </div>

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index ba42ae23c2f997afc8386a75cf891b42711e8642..4e5dc994de946c43a5882510dd0486096d33b9e5 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <div <% if @user %> id="userinformation"<% end %> >
+  <div <% if @user %> id="userinformation"<% end %>>
     <% if @user %>
       <%= user_image @user %>
     <% end %>

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 57bd967b4bc56dd11d17784668e77ad15fb20ef8..0216aa44729363f100497eceb095d7a4cb45399d 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <div id="userinformation" >
+  <div id="userinformation">
     <%= user_image @entry.user %>
     <h2><%= link_to t(".user_title", :user => h(@entry.user.display_name)), :action => :index %></h2>
     <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index 89f3098a84641f81cb03bcc78f23a7f1c7aae082..13f5bb1925d83c9321266df2a1722bcd718162e9 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -4,7 +4,7 @@
       <div style="float:left">
         <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
       </div>
-      <b> <%= link_to comment.user.display_name, user_path(comment.user) %> </b> <br/>
+      <b> <%= link_to comment.user.display_name, user_path(comment.user) %> </b> <br />
       <%= comment.body %>
     </div>
     <span class="deemphasize">
@@ -13,13 +13,13 @@
     <hr>
   <% end %>
 </div>
-<br/>
+<br />
 <div class="comment">
   <%= 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/>
-  <br/>
+  <br />
+  <br />
   <%= submit_tag "Submit" %>
   <% end %>
 </div>

diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 427cbe9091a5b06c78a091b10c126a15bd34d246..1a43a73c7372d21333f78c48b453cf3fb3cf2efb 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -4,13 +4,13 @@
       <%= link_to user_thumbnail(report.user), user_path(report.user) %>
     </div>
     <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user)) %>
-    <br/>
+    <br />
     <span class="deemphasize">
       <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
     </span>
-    <br/>
+    <br />
     <%= report.details %>
-    <br/>
+    <br />
   </div>
   <hr>
 <% end %>

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 135f2ae9e272773a1b3e53b0cdd0eab1b2c8133b..87d3b03d016728eaa5c9718baccab46d4bbd8ddd 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -10,13 +10,13 @@
 <%= 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 %>
-<br/>
+<br />
 
 <% if @issues.length == 0 %>
   <p><%= t ".issues_not_found" %></p>
 <% end %>
 
-<br/>
+<br />
 
 <table class="issues-list">
   <thead>

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index add65c65a1560ed77cecec1ffed9afed43e7f183..3e2f5ef488e34202519d9fe760e6191c14f12216 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -37,7 +37,7 @@
       <%= render "reports", :reports => @unread_reports %>
     </div>
     <% end %>
-    <br/>
+    <br />
   </div>
 
   <% if @issue.reported_user %>

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 96f8d42a382b60b30406d95043993e8cd19682ff..a9d127835ebb097fd3de77735416e8c7c10502ba 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,6 +1,6 @@
 <%= content_tag :head, :data => application_data do %>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-  <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0" />
   <%= javascript_include_tag "html5shiv" unless browser.html5? %>
   <%= javascript_include_tag "es5" unless browser.es5? %>
   <%= javascript_include_tag "es6" unless browser.es6? %>

diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index c607d2ed4541e568d1ec1843740089b00f2653bf..f152049ef51737d42d7a56ffeacf1bca6e05a7ac 100644 (file)
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -25,7 +25,7 @@
       <% Report.categories_for(@report.issue.reportable).each do |c| %>
         <li>
           <%= radio_button :report, :category, c, :required => true %>
-          <%= label_tag "report_category_#{c}", t(".categories.#{@report.issue.reportable.class.name.underscore}.#{c}_label") %> <br/>
+          <%= label_tag "report_category_#{c}", t(".categories.#{@report.issue.reportable.class.name.underscore}.#{c}_label") %> <br />
         </li>
       <% end %>
       </ul>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 7bd4273a3d424c6101f6400b426dd8b224d70226..4af1a0ff3f813c7ec249bc8932a072901487516a 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -11,10 +11,10 @@
   <div class='export_area_inputs'>
     <div class='export_boxy'>
       <%= text_field_tag("maxlat", nil, :size => 10, :class => "export_bound") %>
-      <br/>
+      <br />
       <%= text_field_tag("minlon", nil, :size => 10, :class => "export_bound") %>
       <%= text_field_tag("maxlon", nil, :size => 10, :class => "export_bound") %>
-      <br/><br/>
+      <br /><br />
       <%= text_field_tag("minlat", nil, :size => 10, :class => "export_bound") %>
       </div>
     <a id='drag_box' href="#"><%= t ".manually_select" %></a>

diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
index 89643c48c1b88cbee4a09b14b892debaab98d13d..b0839ad563573efb82b541a885c8f52ce4419196 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -149,7 +149,7 @@
   <fieldset class="form-divider">
     <div class='form-row location clearfix'>
     <label class="standard-label"><%= t ".home location" %></label>
-    <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %>class="nohome"<% end %> >
+    <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>>
       <p class="message form-help deemphasize"><%= t ".no home location" %></p>
         <div class='form-column'>
           <label class="standard-label secondary"><%= t ".latitude" %></label>