From 1e4f68ac63df8d71ff8455353e0fba9c0b1fa77b Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Thu, 28 Feb 2013 19:01:58 +0000
Subject: [PATCH] Small fixes

---
 app/controllers/public/search_controller.rb | 2 +-
 app/views/search/_google_maps.rhtml         | 4 ++--
 app/views/search/search_page.html.erb       | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index ca3ad8e..e8e3f2e 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -90,7 +90,7 @@ class SearchController < PublicController
     month = (params[:month] ? params[:month].to_i : Date.today.month)
     day = (params[:day] ? params[:day].to_i : Date.today.day)
     date = build_date(params[:year], params[:month], params[:day])
-    date_range = (date - 1.month)..(date + 1.month).at_end_of_month
+    date_range = (date - 1.month).at_beginning_of_month..(date + 1.month).at_end_of_month
 
     @selected_day = nil
     @events_of_the_day = []
diff --git a/app/views/search/_google_maps.rhtml b/app/views/search/_google_maps.rhtml
index b9aaae1..4d1c101 100644
--- a/app/views/search/_google_maps.rhtml
+++ b/app/views/search/_google_maps.rhtml
@@ -13,8 +13,8 @@
 <script type='text/javascript'>
   mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
 
-  <% @searches.each do |name,results| %>
-    <% results.each do |item| %>
+  <% @searches.each do |name,search| %>
+    <% search[:results].each do |item| %>
       <% if item.lat && item.lng %>
         mapPutMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, '<%= icon %>',
           '<%= url_for(:controller => :map_balloon, :action => name.to_s.singularize, :id => item.id) %>');
diff --git a/app/views/search/search_page.html.erb b/app/views/search/search_page.html.erb
index e09d636..252e05a 100644
--- a/app/views/search/search_page.html.erb
+++ b/app/views/search/search_page.html.erb
@@ -1,10 +1,11 @@
 <%= search_page_title( @titles[@asset], @category ) %>
 
+<%= render :partial => 'search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
 <%= render :partial => 'results_header' %>
 
 <%= display_results(@asset) %>
 <% if params[:display] != 'map' %>
-  <%= pagination_links @searches[@asset] %>
+  <%= pagination_links @searches[@asset][:results] %>
 <% end %>
 
 <div style="clear: both"></div>
--
libgit2 0.21.2