From: Harry Wood <github@harrywood.co.uk>
Date: Sat, 5 Mar 2022 01:41:02 +0000 (+0000)
Subject: Fix minor HTML tag mismatches
X-Git-Tag: live~1723^2~2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2ce44a2a856c3b6024000cb362dc875cfa6f4618

Fix minor HTML tag mismatches

Fix some HTML tag mismatches and other glitches. These are minor, and don't appear to cause browsers any problems, but for the sake of correctness:
* A closing td which should be a closing div.
* A closing h3 for a corresponding h6
* Two tables with `<thead>` tag and missing `<tr>` around the `<th>` headings.

test change for thead fix
---

diff --git a/app/views/oauth2_applications/index.html.erb b/app/views/oauth2_applications/index.html.erb
index 119bf5878..4ed849f98 100644
--- a/app/views/oauth2_applications/index.html.erb
+++ b/app/views/oauth2_applications/index.html.erb
@@ -7,10 +7,12 @@
 <% if @applications.length > 0 %>
   <table class="table table-borderless table-striped">
     <thead>
-      <th><%= t ".name" %></th>
-      <th><%= t ".permissions" %></th>
-      <th></th>
-      <th></th>
+      <tr>
+        <th><%= t ".name" %></th>
+        <th><%= t ".permissions" %></th>
+        <th></th>
+        <th></th>
+      </tr>
     </thead>
     <tbody>
       <%= render :partial => "application", :collection => @applications %>
diff --git a/app/views/oauth2_applications/show.html.erb b/app/views/oauth2_applications/show.html.erb
index 296705811..8d9c8516d 100644
--- a/app/views/oauth2_applications/show.html.erb
+++ b/app/views/oauth2_applications/show.html.erb
@@ -48,4 +48,4 @@
 <div>
   <%= link_to t(".edit"), edit_oauth_application_path(@application), :class => "btn btn-outline-primary" %>
   <%= link_to t(".delete"), oauth_application_path(@application), { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %>
-</td>
+</div>
diff --git a/app/views/oauth2_authorized_applications/index.html.erb b/app/views/oauth2_authorized_applications/index.html.erb
index b9599a919..2d3ad00bd 100644
--- a/app/views/oauth2_authorized_applications/index.html.erb
+++ b/app/views/oauth2_authorized_applications/index.html.erb
@@ -7,9 +7,11 @@
 <% if @applications.length > 0 %>
   <table class="table table-borderless table-striped">
     <thead>
-      <th><%= t ".application" %></th>
-      <th><%= t ".permissions" %></th>
-      <th></th>
+      <tr>
+        <th><%= t ".application" %></th>
+        <th><%= t ".permissions" %></th>
+        <th></th>
+      </tr>
     </thead>
     <tbody>
       <%= render :partial => "application", :collection => @applications %>
diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index e6c65a992..c82893e9d 100644
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -16,7 +16,7 @@
             <a href='<%= t ".#{site}.url" %>'>
               <%= t ".#{site}.title" %>
             </a>
-          </h3>
+          </h6>
           <p class='card-text'><%= t ".#{site}.description" %></p>
         </div>
         <div class="card-footer">
diff --git a/test/controllers/oauth2_applications_controller_test.rb b/test/controllers/oauth2_applications_controller_test.rb
index 149b6ee35..1b6eaabfe 100644
--- a/test/controllers/oauth2_applications_controller_test.rb
+++ b/test/controllers/oauth2_applications_controller_test.rb
@@ -51,7 +51,7 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest
     get oauth_applications_path
     assert_response :success
     assert_template "oauth2_applications/index"
-    assert_select "tr", 2
+    assert_select "tbody tr", 2
   end
 
   def test_new
diff --git a/test/controllers/oauth2_authorized_applications_controller_test.rb b/test/controllers/oauth2_authorized_applications_controller_test.rb
index 45a60efcb..347d3e40e 100644
--- a/test/controllers/oauth2_authorized_applications_controller_test.rb
+++ b/test/controllers/oauth2_authorized_applications_controller_test.rb
@@ -33,7 +33,7 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe
     get oauth_authorized_applications_path
     assert_response :success
     assert_template "oauth2_authorized_applications/index"
-    assert_select "tr", 2
+    assert_select "tbody tr", 2
   end
 
   def test_destroy
@@ -58,6 +58,6 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe
     get oauth_authorized_applications_path
     assert_response :success
     assert_template "oauth2_authorized_applications/index"
-    assert_select "tr", 1
+    assert_select "tbody tr", 1
   end
 end