Social sign-in: avoid re-authorization in `users_controller#create`

[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 55ce54219eab18da9719f06686bf59aec44c9af4..da9aa1c9e4ab89b4f6d3bc31cd54f03783925513 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,7 +1,65 @@
-<%= form_tag search_path, :class => "search_form" do %>
-  <%= submit_tag t('site.search.submit_text') %>
-  <div class='query_wrapper'>
-    <input type="text" name="query" value="<%= params[:query] %>" placeholder="<%= t('site.search.search') %>" autofocus>
-    <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
-  </div>
-<% end %>
+<div class="search_forms">
+  <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", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm z-0", :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 text-primary link-body-emphasis link-opacity-100-hover", :title => t("site.search.where_am_i_title") %>
+          </div>
+          <%= submit_tag t("site.search.submit_text"), :class => "btn btn-sm btn-primary", :data => { :disable_with => false } %>
+        </div>
+      </div>
+      <div class="col-auto">
+        <%= link_to directions_path, :class => "btn btn-sm btn-primary px-1 switch_link", :title => t("site.search.get_directions_title") do %>
+          <svg width="28" height="20" 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 bg-body-secondary pb-3">
+    <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="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">
+        <%= 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="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">
+        <%= 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="row gx-2 m-1">
+      <div class="col offset-1">
+        <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 class="row gx-2 m-1">
+      <div class="col offset-1">
+        <button class="btn btn-sm btn-link reverse_directions"><%= t("site.search.reverse_directions_text") %></button>
+      </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>