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

[rails.git] / app / views / browse / query.html.erb

diff --git a/app/views/browse/query.html.erb b/app/views/browse/query.html.erb
index 62ab94efd7987ebc1e6ad2fb5018dd55e3d22034..25b0cac141851a6bb837059a0638708365019f4b 100644 (file)
--- a/app/views/browse/query.html.erb
+++ b/app/views/browse/query.html.erb
@@ -1,22 +1,31 @@
-<% set_title(t "browse.query.title") %>
+<% set_title(t(".title")) %>
 
-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= t "browse.query.title" %>
-</h2>
+<%= render "sidebar_header", :title => t(".title") %>
 
-<div class="browse-section query-intro">
-  <p><%= t("browse.query.introduction") %></p>
+<div>
+  <p><%= t(".introduction") %></p>
 </div>
 
-<div id="query-nearby" class="browse-section query-results">
-  <h4><%= t("browse.query.nearby") %></h4>
-  <%= image_tag "searching.gif", :class => "loader" %>
-  <ul class="results-list"></ul>
+<div id="query-nearby" class="query-results">
+  <h3><%= t(".nearby") %></h3>
+  <div class="text-center loader">
+    <div class="spinner-border" role="status">
+      <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
+    </div>
+  </div>
+  <div class="mx-n3">
+    <ul class="query-results-list list-group list-group-flush"></ul>
+  </div>
 </div>
 
-<div id="query-isin" class="browse-section query-results">
-  <h4><%= t("browse.query.enclosing") %></h4>
-  <%= image_tag "searching.gif", :class => "loader" %>
-  <ul class="results-list"></ul>
+<div id="query-isin" class="query-results">
+  <h3><%= t(".enclosing") %></h3>
+  <div class="text-center loader">
+    <div class="spinner-border" role="status">
+      <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
+    </div>
+  </div>
+  <div class="mx-n3">
+    <ul class="query-results-list list-group list-group-flush"></ul>
+  </div>
 </div>