X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c3e2e6462f293596aef5d5de18b0a173edc046c7..b676aa76c52519b4bfd477e233933dbefe0014f9:/app/views/layouts/_search.html.erb

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index fb4f79eb6..3f3513d3a 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,26 +1,56 @@
 <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' %>
-    <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') } %>
+  <form method="GET" action="<%= search_path %>" class="search_form px-1 py-2">
+    <div class="form-row mx-0">
+      <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" %>
+          </div>
+          <div class="input-group-append">
+            <%= submit_tag t("site.search.submit_text"), :class => "btn btn-sm btn-primary", :data => { :disable_with => false } %>
+          </div>
+        </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") %>
+      </div>
     </div>
   </form>
 
-  <form method="GET" action="<%= directions_path %>" class="directions_form">
-    <div width="100%" align="right" style="height:30px"><%= link_to tag('span', { :class => "icon close"}), root_path, { :title => t('site.search.close_directions_title') } %></div>
+  <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="line">
-      <%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %>
-      <span class="force_width"><%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %></span>
+    <div class="form-row 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">
+        <%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :autocomplete => "on", :class => "form-control form-control-sm" %>
+      </div>
     </div>
-    <div class="line">
-      <%= image_tag "marker-red.png"  , :class => 'routing_marker', :id => 'marker_to'  , :draggable => 'true' %>
-      <span class="force_width"><%= text_field_tag "route_to"  , params[:to]  , :placeholder => t('site.search.to') %></span>
+    <div class="form-row 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">
+        <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control form-control-sm" %>
+      </div>
     </div>
-    <select class='routing_engines' name='routing_engines'></select>
-    <div width="100%" align="right"><%= submit_tag t('site.search.submit_text') %></div>
-    <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
+    <div class="form-row m-1">
+      <div class="col offset-1">
+        <select class="routing_engines form-control form-control-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 class="form-row m-1">
+      <div class="col offset-1">
+        <a class="reverse_directions"><%= t("site.search.reverse_directions_text") %></a>
+      </div>
+    </div>
+
+    <div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>
   </form>
 </div>