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 052b8822e1326797209fcbee5c3bd3dea19dcbc0..05d7d5d637e8e1dee29c2832a99d5de21b52c834 100644 (file)
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -1,15 +1,23 @@
 <% if @results.empty? %>
 <% if @results.empty? %>

-  <p class="search_results_entry inner12"><%= t '.no_results' %></p>
+  <ul class="list-group list-group-flush">
+    <li class="list-group-item">
+      <%= t ".no_results" %>
+    </li>
+  </ul>

 <% else %>
 <% else %>

-  <ul class='results-list'>
+  <ul class='results-list list-group list-group-flush'>

     <% @results.each do |result| %>
     <% @results.each do |result| %>

-      <li><p class="inner12 search_results_entry clearfix"><%= result_to_html(result) %></p></li>
+      <li class="list-group-item list-group-item-action search_results_entry"><%= result_to_html(result) %></li>

     <% end %>
   </ul>
   <% if @more_params %>
     <% end %>
   </ul>
   <% if @more_params %>

-    <div class="search_more">
-      <%= link_to t('.more_results'), url_for(@more_params), :class => "button load_more" %>
-      <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
+    <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 %>
     </div>
   <% end %>
 <% end %>