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

[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 8d5b762c6464bc13af89849f1cfcb4f0fcd98934..8502227de49c60a0d5ca4a97ad80ab159ee43292 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -1,10 +1,10 @@
-<h2>
-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= t('site.sidebar.search_results') %>
-</h2>
+<% set_title(@params[:query]) %>
+
+<%= render "sidebar_header", :title => t("site.sidebar.search_results") %>
+
 <% @sources.each do |source| %>
-  <h4 class="inner12"><%= raw(t ".title.#{source}") %></h4>
-  <div class="search_results_entry" data-href="<%= url_for @params.merge(:action => "search_#{source}") %>">
+  <h4><%= t(".title.#{source}_html") %></h4>
+  <div class="search_results_entry mx-n3" data-href="<%= url_for @params.merge(:action => "search_#{source}") %>">
     <%= image_tag "searching.gif", :class => "loader" %>
   </div>
 <% end %>