From be50abba51847fca6c3efb2ce30d1d0d6646c5bf Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Wed, 28 Jan 2015 15:42:24 -0300
Subject: [PATCH] search: google-maps is loaded only once

---
 app/views/search/_google_maps.html.erb | 7 +------
 app/views/search/search_page.html.erb  | 3 +++
 public/javascripts/search.js           | 2 +-
 public/stylesheets/application.css     | 1 +
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/search/_google_maps.html.erb b/app/views/search/_google_maps.html.erb
index 4d1c101..8970ccf 100644
--- a/app/views/search/_google_maps.html.erb
+++ b/app/views/search/_google_maps.html.erb
@@ -3,12 +3,7 @@
   <div id="map"></div>
 </div>
 
-<%= content_tag('script', '', :src => "http://maps.google.com/maps/api/js?sensor=true", :type => 'text/javascript') %>
-<%= javascript_include_tag('google_maps') %>
-
-<%
-  icon = default_or_themed_icon("/images/icons-map/enterprise.png")
-%>
+<% icon = default_or_themed_icon("/images/icons-map/enterprise.png") %>
 
 <script type='text/javascript'>
   mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
diff --git a/app/views/search/search_page.html.erb b/app/views/search/search_page.html.erb
index c098ca3..a60370b 100644
--- a/app/views/search/search_page.html.erb
+++ b/app/views/search/search_page.html.erb
@@ -10,3 +10,6 @@
 <% end %>
 
 <%= javascript_include_tag 'search' %>
+
+<%= content_tag('script', '', :src => "http://maps.google.com/maps/api/js?sensor=true", :type => 'text/javascript') %>
+<%= javascript_include_tag('google_maps') %>
diff --git a/public/javascripts/search.js b/public/javascripts/search.js
index ff691b7..1c42038 100644
--- a/public/javascripts/search.js
+++ b/public/javascripts/search.js
@@ -10,7 +10,7 @@
     return false;
   });
 
-  // Sorting
+  // Sorting and Views
   $('#search-filters select').change(function(){
     $('form.search_form').submit();
   });
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2c205d0..8b780cb 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1667,6 +1667,7 @@ a.button.disabled, input.disabled {
 }
 #map {
   height: 500px;
+  margin-top: 10px;
 }
 .map {
   clear: both;
--
libgit2 0.21.2