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

[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 42a1a306e150fa42884a04688af72ccaa76ee97a..13144d568eda6306a3f0345278669f9c2fa3f6a0 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -1,7 +1,12 @@
-<h2><%= t('site.sidebar.search_results') %></h2>
+<% 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| %>
-  <h4 class="inner12"><%= raw(t "geocoder.search.title.#{source}") %></h4>
-  <div class="search_results_entry" data-href="<%= url_for params.merge(:action => "search_#{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" %>
   </div>
 <% end %>