Merge remote-tracking branch 'upstream/pull/2991' into master

[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 b4bbdc267f40e4bd2f3983ef07f4b2b0f3b18822..e05aa29ad842dbdde324e04baa792d1be65bf514 100644 (file)
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -1,17 +1,19 @@
 <% 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"><%=
-        link_to_function(t('geocoder.results.more_results')) do |page|
-          page.replace_html "search_more_#{@more_params.hash}", image_tag("searching.gif", :class => "search_searching")
-          page << remote_function(:update => "search_more_#{@more_params.hash}", :url => raw(url_for(@more_params)))
-        end
-      %></p>
+    <div class="search_more text-center">
+      <%= link_to t(".more_results"), url_for(@more_params), :class => "btn btn-primary" %>
+      <div class="loader"><%= image_tag "searching.gif" %></div>
     </div>
   <% end %>
 <% end %>