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

[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 7bc8fcd76c29cf24f41ade92e8484e6f0a4901b6..13144d568eda6306a3f0345278669f9c2fa3f6a0 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -1,9 +1,12 @@
+<% set_title(@params[:query]) %>
+
+<h2>
+    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= t("site.sidebar.search_results") %>
+</h2>
 <% @sources.each do |source| %>
-  <p class="search_results_heading"><%= raw(t "geocoder.search.title.#{source}") %></p>
-  <div class="search_results_entry" id="<%= "search_#{source}" %>">
-    <%= image_tag "searching.gif", :class => "search_searching" %>
+  <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" %>
   </div>
-  <script type="text/javascript">
-    $("#search_<%= source %>").load("<%= raw url_for :action => "search_#{source}", :query => @query, :minlat => params[:minlat], :minlon => params[:minlon], :maxlat => params[:maxlat], :maxlon => params[:maxlon] %>");
-  </script>
 <% end %>