Merge remote-tracking branch 'upstream/pull/4304'

[rails.git] / app / views / layouts / _search.html.erb

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 57b7b763867dcb2bab4389ebcf5bfe1e0668d638..397fdb8289b16fe3b4249d47ae787c4806685af3 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,27 +1,25 @@
 <div class="search_forms">
   <form method="GET" action="<%= search_path %>" class="search_form px-1 py-2">
 <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="col">
         <div class="input-group flex-nowrap">

-          <div class='query_wrapper position-relative flex-grow-1'>
-            <%= link_to t("site.search.where_am_i"), "#", :class => "describe_location position-absolute", :title => t("site.search.where_am_i_title") %>
-            <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
-          </div>
-          <div class="input-group-append">
-            <%= submit_tag t("site.search.submit_text"), :class => "btn btn-sm btn-primary", :data => { :disable_with => false } %>
+          <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
+          <div class="input-group-text border-start-0 p-0 position-relative">
+            <%= button_tag t("site.search.where_am_i"), :type => "button", :class => "describe_location position-absolute end-0 me-1 btn btn-sm btn-outline-primary border-0 bg-transparent", :title => t("site.search.where_am_i_title") %>

           </div>
           </div>

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

         </div>
       </div>
       <div class="col-auto">
         </div>
       </div>
       <div class="col-auto">

-        <%= link_to image_tag("directions.png", :width => "20", :height => "20"), directions_path, :class => "btn btn-sm btn-primary switch_link", :title => t("site.search.get_directions_title") %>
+        <%= link_to image_tag("directions.png", :width => "20", :height => "20", :class => "align-bottom"), directions_path, :class => "btn btn-sm btn-primary switch_link", :title => t("site.search.get_directions_title") %>

       </div>
     </div>
   </form>
 
   <form method="GET" action="<%= directions_path %>" class="directions_form pb-3">
       </div>
     </div>
   </form>
 
   <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="d-flex flex-row-reverse px-3 py-3"><button type="button" class="btn-close" aria-label="<%= t("javascripts.close") %>"></button></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>
       <div class="col-1">
         <%= image_tag "marker-green.png", :class => "routing_marker mx-auto d-block", :data => { :type => "from" }, :draggable => "true" %>
       </div>


@@ -29,7 +27,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>
         <%= 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>
       <div class="col-1">
         <%= image_tag "marker-red.png", :class => "routing_marker mx-auto d-block", :data => { :type => "to" }, :draggable => "true" %>
       </div>


@@ -37,20 +35,26 @@
         <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
       </div>
     </div>
         <%= 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">
       <div class="col offset-1">

-        <select class="routing_engines form-control form-control-sm" name="routing_engines"></select>
+        <select class="routing_engines form-select form-select-sm" name="routing_engines"></select>

       </div>
       <div class="col-auto">
         <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-sm btn-primary", :data => { :disable_with => false } %>
       </div>
     </div>
       </div>
       <div class="col-auto">
         <%= 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">
       <div class="col offset-1">

-        <a class="reverse_directions"><%= t("site.search.reverse_directions_text") %></a>
+        <button class="btn btn-sm btn-link reverse_directions"><%= t("site.search.reverse_directions_text") %></button>

       </div>
     </div>
 
       </div>
     </div>
 

-    <div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>
+    <div class="loader_copy d-none">
+      <div class="text-center loader">
+        <div class="spinner-border" role="status">
+          <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
+        </div>
+      </div>
+    </div>

   </form>
 </div>
   </form>
 </div>