X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f0884a34c078ae955c0466fbcdddadfab9dca33..6c4b028232f5ad687c0def013b8de6a2b4013b4f:/app/views/layouts/_search.html.erb?ds=sidebyside

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 065190bd5..36e1a7a92 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,29 +1,82 @@
+<% search_query = if params[:query]
+                    params[:query]
+                  elsif params[:lat] && params[:lon]
+                    "#{params[:lat]}, #{params[:lon]}"
+                  end %>
+
 <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 bg-body-secondary px-1 py-2">
+    <div class="row gx-2 mx-0">
+      <div class="col">
+        <div class="input-group flex-nowrap">
+          <%= text_field_tag "query", search_query, :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control z-0 py-1 px-2", :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 top-0 bottom-0 m-1 btn btn-outline-primary border-0 p-1 bg-transparent text-primary link-body-emphasis link-opacity-100-hover", :title => t("site.search.where_am_i_title") %>
+          </div>
+          <%= button_tag :class => "btn btn-primary p-1", :title => t("site.search.submit_text") do %>
+            <svg width="24" height="20">
+              <circle cx="13" cy="7" r="6.5" fill="#fff8" stroke="#fff" />
+              <path d="M9.75 12.629 A6.5 6.5 0 0 1 7.371 10.25" fill="none" stroke="#fff" stroke-width="1.5" />
+              <line x1="1" y1="19" x2="1.5" y2="18.5" stroke="#fff8" stroke-width="2" />
+              <line x1="1.5" y1="18.5" x2="6" y2="14" stroke="#fff" stroke-width="2.5" />
+              <line x1="6" y1="14" x2="6.5" y2="13.5" stroke="#fff8" stroke-width="2" />
+              <line x1="6.5" y1="13.5" x2="8.5" y2="11.5" stroke="#fff" stroke-width="1.5" />
+            </svg>
+          <% end %>
+        </div>
+      </div>
+      <div class="col-auto">
+        <%= link_to directions_path, :class => "btn btn-primary p-1 switch_link", :title => t("site.search.get_directions_title") do %>
+          <svg width="28" height="24" viewBox="0 -2 28 24" class="align-bottom">
+            <path d="M11.5 9.5 v-3h3v-1l-5 -5l-5 5v1h3v6" fill="none" stroke="#fff8" />
+            <path d="M7.5 19.5h4v-5a1 1 0 0 1 1 -1h5v3h1l5 -5l-5 -5h-1v3h-6a4 4 0 0 0 -4 4z" fill="#fff8" stroke="#fff" />
+          </svg>
+        <% end %>
+      </div>
     </div>
   </form>
 
-  <form method="GET" action="<%= directions_path %>" class="directions_form">
-    <div style="width:100%; text-align:right; height:30px;"><%= link_to tag('span', { :class => "icon close"}), root_path, { :title => t('site.search.close_directions_title'), :class => "directions_close" } %></div>
+  <form method="GET" action="<%= directions_path %>" class="directions_form bg-body-secondary pb-2">
+    <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="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>
-    <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>
-    <div class="line">
-      <select class="routing_engines" name="routing_engines"></select>
-      <%= submit_tag t('site.search.submit_text'), :class => "routing_go" %>
+    <div class="d-flex flex-column mx-2 gap-1">
+      <div class="d-flex gap-1 align-items-center">
+        <div class="d-flex flex-column gap-1 flex-grow-1">
+          <div class="d-flex gap-2 align-items-center">
+            <div class="routing_marker_column flex-shrink-0">
+              <%= image_tag "marker-green.png", :class => "img-fluid", :data => { :type => "from" }, :draggable => "true" %>
+            </div>
+            <%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %>
+          </div>
+          <div class="d-flex gap-2 align-items-center">
+            <div class="routing_marker_column flex-shrink-0">
+              <%= image_tag "marker-red.png", :class => "img-fluid", :data => { :type => "to" }, :draggable => "true" %>
+            </div>
+            <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %>
+          </div>
+        </div>
+        <div>
+          <button type="button" class="reverse_directions btn btn-outline-secondary border-0 p-2" title="<%= t("site.search.reverse_directions_text") %>">
+            <svg class="d-block" width="20" height="20" viewBox="-10 -10 20 20" fill="none" stroke="currentColor" stroke-width="2">
+              <path d="m-4 -2 0 10 m-4 -4 4 4 4 -4" />
+              <path d="m4 2 0 -10 m4 4 -4 -4 -4 4" />
+            </svg>
+          </button>
+        </div>
+      </div>
+      <div class="d-flex gap-2 align-items-center">
+        <div class="routing_marker_column flex-shrink-0"></div>
+        <select class="routing_engines form-select py-1 px-2" name="routing_engines"></select>
+        <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-primary py-1 px-2", :data => { :disable_with => false } %>
+      </div>
     </div>
 
-    <div class="loader_copy" style="display:none;"><div class="loader"><%= image_tag "searching.gif", :style => "vertical-align: middle;" %></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>