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

[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 694d0eadb2f82d8347f6490a79d0bdef23245359..fc213831895d264edb840b95475f65a3077a3929 100644 (file)
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -1,21 +1,23 @@
 <% if @results.empty? %>
-  <p class="search_results_entry"><%= t 'geocoder.results.no_results' %></p>
+  <ul class="list-group list-group-flush">
+    <li class="list-group-item">
+      <%= t ".no_results" %>
+    </li>
+  </ul>
 <% else %>
-  <% @results.each do |result| %>
-    <p class="search_results_entry"><%= result_to_html(result) %></p>
-  <% end %>
+  <ul class='results-list list-group list-group-flush'>
+    <% @results.each do |result| %>
+      <li class="list-group-item search_results_entry"><%= result_to_html(result) %></li>
+    <% end %>
+  </ul>
   <% if @more_params %>
-    <div id="search_more_<%= @more_params.hash %>">
-      <p class="search_results_entry"><%=
-        startSpinner = update_page do |page|
-                         page.replace_html "search_more_#{@more_params.hash}", image_tag("searching.gif", :class => "search_searching")
-                       end
-
-        link_to_remote t('geocoder.results.more_results'),
-          :update => "search_more_#{@more_params.hash}",
-          :before => startSpinner,
-          :url => @more_params
-        %></p>
+    <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>
     </div>
   <% end %>
 <% end %>