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

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

diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index 9f19be48a7922f955f2e9618497abd27c828c075..53e87b3fd6b68712b68d3bd73051978fd9d59220 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -3,8 +3,15 @@
 <%= render "sidebar_header", :title => t("site.sidebar.search_results") %>
 
 <% @sources.each do |source| %>
 <%= render "sidebar_header", :title => t("site.sidebar.search_results") %>
 
 <% @sources.each do |source| %>

-  <h4 class="inner12"><%= t(".title.#{source}_html") %></h4>
-  <div class="search_results_entry" data-href="<%= url_for @params.merge(:action => "search_#{source}") %>">
-    <%= image_tag "searching.gif", :class => "loader" %>
+  <h4>
+    <%= t(".title.results_from_html", :results_link => link_to(t(".title.#{source[:name]}"),
+                                                               t(".title.#{source[:name]}_url").to_s + source[:parameters].to_s)) %>
+  </h4>
+  <div class="search_results_entry mx-n3" data-href="<%= url_for @params.merge(:action => "search_#{source[:name]}") %>">
+    <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 %>
   </div>
 <% end %>