From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 11 May 2022 14:31:50 +0000 (+0100)
Subject: Bootstrap 5: Remove use of form-row class
X-Git-Tag: live~1116^2~14
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2080696fe689c08faa238a73cda4366f71750423

Bootstrap 5: Remove use of form-row class

This has been replaced by simple `row` class in v5. We can also use the
gx-N classes here, which tighten up the horizontal gutter sizes for
space-constrained forms.
---

diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index 2017bee0a..cd53d294d 100644
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -18,7 +18,7 @@
 
   <fieldset class="form-group">
     <label for="user_auth_provider"><%= t(".external auth") %></label>
-    <div class="form-row">
+    <div class="row">
       <%= f.select(:auth_provider, Auth.providers, :hide_label => true, :wrapper => { :class => "col-auto mb-0" }) %>
       <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }) %>
     </div>
diff --git a/app/views/diary_entries/_form.html.erb b/app/views/diary_entries/_form.html.erb
index f72abc19e..7c6c12e6a 100644
--- a/app/views/diary_entries/_form.html.erb
+++ b/app/views/diary_entries/_form.html.erb
@@ -7,7 +7,7 @@
 
   <%= tag.div "", :id => "map", :class => "border border-grey rounded", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
 
-  <div class="form-row">
+  <div class="row">
     <%= f.text_field :latitude, :wrapper_class => "col-sm-4", :id => "latitude" %>
     <%= f.text_field :longitude, :wrapper_class => "col-sm-4", :id => "longitude" %>
     <div class="col-sm-4">
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 4f9d3dbd6..9222aafff 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -5,7 +5,7 @@
 <p><%= t ".search_guidance" %></p>
 
 <%= form_tag(issues_path, :method => :get) do %>
-  <div class="form-row">
+  <div class="row gx-1">
     <div class="form-group col-md-auto">
       <%= select_tag :status,
                      options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]),
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 57b7b7638..38a926760 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,6 +1,6 @@
 <div class="search_forms">
   <form method="GET" action="<%= search_path %>" class="search_form px-1 py-2">
-    <div class="form-row mx-0">
+    <div class="row gx-2 mx-0">
       <div class="col">
         <div class="input-group flex-nowrap">
           <div class='query_wrapper position-relative flex-grow-1'>
@@ -21,7 +21,7 @@
   <form method="GET" action="<%= directions_path %>" class="directions_form pb-3">
     <div class="clearfix px-3 py-3"><span class="icon close"></span></div>
 
-    <div class="form-row m-1">
+    <div class="row gx-2 m-1">
       <div class="col-1">
         <%= image_tag "marker-green.png", :class => "routing_marker mx-auto d-block", :data => { :type => "from" }, :draggable => "true" %>
       </div>
@@ -29,7 +29,7 @@
         <%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
       </div>
     </div>
-    <div class="form-row m-1">
+    <div class="row gx-2 m-1">
       <div class="col-1">
         <%= image_tag "marker-red.png", :class => "routing_marker mx-auto d-block", :data => { :type => "to" }, :draggable => "true" %>
       </div>
@@ -37,7 +37,7 @@
         <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
       </div>
     </div>
-    <div class="form-row m-1">
+    <div class="row gx-2 m-1">
       <div class="col offset-1">
         <select class="routing_engines form-control form-control-sm" name="routing_engines"></select>
       </div>
@@ -45,7 +45,7 @@
         <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-sm btn-primary", :data => { :disable_with => false } %>
       </div>
     </div>
-    <div class="form-row m-1">
+    <div class="row gx-2 m-1">
       <div class="col offset-1">
         <a class="reverse_directions"><%= t("site.search.reverse_directions_text") %></a>
       </div>
diff --git a/app/views/profiles/edit.html.erb b/app/views/profiles/edit.html.erb
index c57f98a04..a6fa35220 100644
--- a/app/views/profiles/edit.html.erb
+++ b/app/views/profiles/edit.html.erb
@@ -11,7 +11,7 @@
 
   <fieldset class="form-group">
     <%= f.label t(".image") %>
-    <div class="form-row">
+    <div class="row">
       <div class="col-sm-2">
         <%= user_image current_user %>
       </div>
@@ -44,7 +44,7 @@
     <legend><%= t ".home location" -%></legend>
     <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>>
       <p class="message text-muted"><%= t ".no home location" %></p>
-      <div class="form-row">
+      <div class="row">
         <%= f.text_field :home_lat, :wrapper_class => "col-sm-4", :id => "home_lat" %>
         <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>
       </div>
diff --git a/app/views/shared/_richtext_field.html.erb b/app/views/shared/_richtext_field.html.erb
index cfe6f9827..22b3db542 100644
--- a/app/views/shared/_richtext_field.html.erb
+++ b/app/views/shared/_richtext_field.html.erb
@@ -1,4 +1,4 @@
-<div id="<%= id %>_container" class="form-row richtext_container">
+<div id="<%= id %>_container" class="row richtext_container">
   <div id="<%= id %>_content" class="col-sm-8 mb-3 mb-sm-0 richtext_content">
     <%= builder.text_area(attribute, options.merge(:wrapper => false, "data-preview-url" => preview_url(:type => type))) %>
     <div id="<%= id %>_preview" class="richtext_preview richtext text-break"></div>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index a94d4a812..201597f4e 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -27,7 +27,7 @@
 
       <fieldset class="form-group" id="auth_field">
         <label for="user_auth_provider"><%= t(".external auth") %></label>
-        <div class="form-row">
+        <div class="row">
           <%= f.select(:auth_provider, Auth.providers, :default => "", :hide_label => true, :wrapper => { :class => "col-auto mb-0" }, :tabindex => 4) %>
           <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }, :tabindex => 5) %>
         </div>
diff --git a/test/controllers/profiles_controller_test.rb b/test/controllers/profiles_controller_test.rb
index 38e73a03f..737779455 100644
--- a/test/controllers/profiles_controller_test.rb
+++ b/test/controllers/profiles_controller_test.rb
@@ -39,7 +39,7 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest
     assert_template :show
     assert_select ".notice", /^Profile updated./
     get edit_profile_path
-    assert_select "form > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked][value=?]", "keep"
+    assert_select "form > fieldset.form-group > div > div.col-sm-10 > div.form-check > input[name=avatar_action][checked][value=?]", "keep"
 
     # Changing to a gravatar image should work
     put profile_path, :params => { :avatar_action => "gravatar", :user => { :description => user.description } }
@@ -50,7 +50,7 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest
     assert_template :show
     assert_select ".notice", /^Profile updated./
     get edit_profile_path
-    assert_select "form > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked][value=?]", "gravatar"
+    assert_select "form > fieldset.form-group > div > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked][value=?]", "gravatar"
 
     # Removing the image should work
     put profile_path, :params => { :avatar_action => "delete", :user => { :description => user.description } }
@@ -61,7 +61,7 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest
     assert_template :show
     assert_select ".notice", /^Profile updated./
     get edit_profile_path
-    assert_select "form > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked]", false
-    assert_select "form > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked]", false
+    assert_select "form > fieldset.form-group > div > div.col-sm-10 > div.form-check > input[name=avatar_action][checked]", false
+    assert_select "form > fieldset.form-group > div > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked]", false
   end
 end