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

[rails.git] / app / views / geocoder / results.html.erb

diff --git a/app/views/geocoder/results.html.erb b/app/views/geocoder/results.html.erb
index 7fd21775ec81264df6393a9f4f614824770e3f8a..05d7d5d637e8e1dee29c2832a99d5de21b52c834 100644 (file)
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -1,26 +1,23 @@
 <% if @results.empty? %>
-  <p class="search_results_entry inner12"><%= t 'geocoder.results.no_results' %></p>
+  <ul class="list-group list-group-flush">
+    <li class="list-group-item">
+      <%= t ".no_results" %>
+    </li>
+  </ul>
 <% else %>
-  <ul class='results-list'>
-  <% @results.each do |result| %>
-    <li><p class="inner12 search_results_entry"><%= result_to_html(result) %></p></li>
-  <% end %>
-</ul>
+  <ul class='results-list list-group list-group-flush'>
+    <% @results.each do |result| %>
+      <li class="list-group-item list-group-item-action search_results_entry"><%= result_to_html(result) %></li>
+    <% end %>
+  </ul>
   <% if @more_params %>
-    <div id="search_more_<%= @more_params.hash %>">
-      <div class="inner12 search_results_entry">
-        <%= link_to t('geocoder.results.more_results'), "#", :class => "button" %>
+    <div class="search_more text-center my-3">
+      <%= link_to t(".more_results"), url_for(@more_params), :class => "btn btn-primary" %>
+      <div class="text-center loader">
+        <div class="spinner-border" role="status">
+          <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
+        </div>
       </div>
-      <%= image_tag "searching.gif", :class => "search_searching" %>
     </div>
-    <script type="text/javascript">
-      $("#search_more_<%= @more_params.hash %> .search_searching").hide();
-
-      $("#search_more_<%= @more_params.hash %> a").click(function () {
-        $("#search_more_<%= @more_params.hash %> .search_results_entry").hide();
-        $("#search_more_<%= @more_params.hash %> .search_searching").show();
-        $("#search_more_<%= @more_params.hash %>").load("<%= raw url_for(@more_params) %>");
-      });
-    </script>
   <% end %>
 <% end %>