diff --git a/app/controllers/public/map_balloon_controller.rb b/app/controllers/public/map_balloon_controller.rb
new file mode 100644
index 0000000..69e95cf
--- /dev/null
+++ b/app/controllers/public/map_balloon_controller.rb
@@ -0,0 +1,28 @@
+class MapBalloonController < PublicController
+
+  before_filter :profile, :only => [:person, :enterprise, :community]
+
+  def product
+    @product = Product.find(params[:id])
+    render :action => 'product', :layout => false
+  end
+
+  def person
+    render :action => 'profile', :layout => false
+  end
+
+  def enterprise
+    render :action => 'profile', :layout => false
+  end
+
+  def community
+    render :action => 'profile', :layout => false
+  end
+
+  protected
+
+  def profile
+    @profile = Profile.find(params[:id])
+  end
+
+end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 15dc0b0..f0def29 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -33,62 +33,6 @@ module SearchHelper
     content_tag('div', data[:toggle] + (render :partial => data[:partial]), :class => "map-or-list-search-results #{data[:class]}")
   end
 
-  def display_item_map_info(item)
-    if item.kind_of?(Profile)
-      display_profile_info(item)
-    elsif item.kind_of?(Product)
-      display_product_info(item)
-    end
-  end
-  
-  def display_profile_info(profile)
-    data = ''
-    unless profile.contact_email.nil?
-      data << content_tag('strong', _('E-Mail: ')) + profile.contact_email + '<br/>'
-    end
-    unless profile.contact_phone.nil?
-      data << content_tag('strong', _('Phone(s): ')) + profile.contact_phone + '<br/>'
-    end
-    unless profile.region.nil?
-      data << content_tag('strong', _('Location: ')) + profile.region.name + '<br/>'
-    end
-    unless profile.address.nil?
-      data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
-    end
-    unless profile.products.empty?
-      data << content_tag('strong', _('Products/Services: ')) + profile.products.map{|i| link_to(i.name, :controller => 'manage_products', :profile => profile.identifier, :action => 'show', :id => i.id)}.join(', ') + '<br/>'
-    end
-    if profile.respond_to?(:distance) and !profile.distance.nil?
-      data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
-    end
-    content_tag('table',
-      content_tag('tr',
-        content_tag('td', content_tag('div', profile_image(profile, :thumb), :class => 'profile-info-picture')) +
-        content_tag('td', content_tag('strong', link_to(profile.name, url_for(profile.url))) + '<br/>' + data
-        )
-      ),
-      :class => 'profile-info'
-    )
-  end
-
-  def display_product_info(product)
-    data = ''
-    unless product.price.nil?
-      data << content_tag('strong', _('Price: ')) + product.price + '<br/>'
-    end
-    unless product.enterprise.nil?
-      data << content_tag('strong', _('Provider: ')) + link_to_profile(product.enterprise.name, product.enterprise.identifier)
-    end
-    unless product.product_category.nil?
-      data << content_tag('strong', _('Category: ')) + link_to(product.product_category.name, :controller => 'search', :action => 'assets', :asset => 'products', :product_category => product.product_category.id)
-    end
-    content_tag('table',
-      content_tag('tr',
-        content_tag('td', content_tag('div', image_tag(product.image ? product.image.public_filename(:thumb) : '/images/icons-app/product-default-pic-portrait.png'), :class => 'profile-info-picture')) +
-        content_tag('td', content_tag('strong', link_to(product.name, :controller => 'catalog', :profile => product.enterprise.identifier, :id => product.id)) + '<br/>' + data)
-        ), :class => 'profile-info')
-  end
-
   def product_categories_menu(asset, product_category, object_ids = nil)
     cats = ProductCategory.menu_categories(@product_category, environment)
     cats += cats.select { |c| c.children_count > 0 }.map(&:children).flatten
diff --git a/app/views/map_balloon/product.rhtml b/app/views/map_balloon/product.rhtml
new file mode 100644
index 0000000..c3a2f1e
--- /dev/null
+++ b/app/views/map_balloon/product.rhtml
@@ -0,0 +1,3 @@
+<div id="balloon">
+  <%= render :partial => 'search/product', :locals => {:product => @product} %>
+</div>
diff --git a/app/views/map_balloon/profile.rhtml b/app/views/map_balloon/profile.rhtml
new file mode 100644
index 0000000..97be683
--- /dev/null
+++ b/app/views/map_balloon/profile.rhtml
@@ -0,0 +1,28 @@
+<div id="balloon">
+  <table class='profile-info'>
+    <tr>
+      <td><div class='profile-info-picture'><%= profile_image(@profile, :thumb) %></div></td>
+      <td>
+        <strong><%= link_to(@profile.name, url_for(@profile.url)) %></strong><br/>
+        <% unless @profile.contact_email.nil? %>
+          <strong><%= _('E-Mail: ') + @profile.contact_email %></strong><br/>
+        <% end %>
+        <% unless @profile.contact_phone.nil? %>
+          <strong><%= _('Phone(s): ') + @profile.contact_phone %></strong><br/>
+        <% end %>
+        <% unless @profile.region.nil? %>
+          <strong><%= _('Location: ') + @profile.region.name %></strong><br/>
+        <% end %>
+        <% unless @profile.address.nil? %>
+          <strong><%= _('Address: ') + @profile.address %></strong><br/>
+        <% end %>
+        <% unless @profile.products.empty? %>
+          <strong><%= _('Products/Services: ') + @profile.products.map{|i| link_to(i.name, :controller => 'manage_products', :profile => @profile.identifier, :action => 'show', :id => i.id)}.join(', ') %></strong><br/>
+        <% end %>
+        <% if @profile.respond_to?(:distance) and !@profile.distance.nil? %>
+          <strong><%= _('Distance: ') + "%.2f%" % @profile.distance %></strong><br/>
+        <% end %>
+      </td>
+    </tr>
+  </table>
+</div>
diff --git a/app/views/search/_google_maps.rhtml b/app/views/search/_google_maps.rhtml
index ea27e49..d2a7ff0 100644
--- a/app/views/search/_google_maps.rhtml
+++ b/app/views/search/_google_maps.rhtml
@@ -1,72 +1,34 @@
-<%= content_tag('script', '', :src => GoogleMaps.api_url(environment.default_hostname), :type => 'text/javascript') %>
-
-
+<br style="clear: both;"/>
 <div style='text-align: center;'>
   <div id="map"></div>
 </div>
 
-<script type='text/javascript'>
-var points = {};
-   
-function putMarker(lat, lng, title, summary) {
-  var point_str = lat + ":" + lng;
-   
-  if (points[point_str]) {
-    lng += (Math.random() - 0.5) * 0.02;
-    lat += (Math.random() - 0.5) * 0.02;
-  } else {
-    points[point_str] = true;
-  }
-     
-  var point = new GLatLng(lat, lng);
-  var options = { 'title' : title, 'icon' : icon };
-  var marker = new GMarker(point, options);
-  map.addOverlay(marker);
-  GEvent.addListener(marker, 'click', function() {
-    map.openInfoWindowHtml(point, summary);
-  });
-  bounds.extend(point);
-}
-
-window.unload = function() {
-  GUnload();
-};
-
-if (GBrowserIsCompatible()) {
-  var map = new GMap2(document.getElementById("map"));
-
-  new GKeyboardHandler(map);
-  map.addControl(new GLargeMapControl());
-  map.addControl(new GMapTypeControl());
-
-  centerPoint = new GLatLng(-15.0, -50.1419);
-  map.setCenter(centerPoint, <%= GoogleMaps.initial_zoom.to_json %>);
-  var bounds = new GLatLngBounds();
-
-  var baseIcon = new GIcon();
-      baseIcon.iconSize=new GSize(32,32);
-      baseIcon.shadowSize=new GSize(36,32);
-      baseIcon.iconAnchor=new GPoint(16,32);
-      baseIcon.infoWindowAnchor=new GPoint(16,0);
-  <%
-    icon = default_or_themed_icon("/images/icons-map/enterprise.png")
-    icon_shadow = default_or_themed_icon("/images/icons-map/enterprise_shadow.png")
-  %>
-  var icon = new GIcon(baseIcon, "<%= icon %>", null, "<%= icon_shadow %>");
+<%= content_tag('script', '', :src => GoogleMaps.api_url(environment.default_hostname), :type => 'text/javascript') %>
+<%= javascript_include_tag('google_maps') %>
 
 <%
-  @results.each do |name,results|
-    results.each do |item|
-      if item.lat && item.lng
-      %>
-        putMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>, <%= display_item_map_info(item).to_json %>);
-      <%
-      end
-    end
-  end
+  icon = default_or_themed_icon("/images/icons-map/enterprise.png")
+  icon_shadow = default_or_themed_icon("/images/icons-map/enterprise_shadow.png")
 %>
-}
 
-  map.setZoom(map.getBoundsZoomLevel(bounds));
-  map.setCenter(bounds.getCenter());
+<script type='text/javascript'>
+  mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
+
+  mapBaseIcon = new GIcon();
+  mapBaseIcon.iconSize=new GSize(32,32);
+  mapBaseIcon.shadowSize=new GSize(36,32);
+  mapBaseIcon.iconAnchor=new GPoint(16,32);
+  mapBaseIcon.infoWindowAnchor=new GPoint(16,0);
+  icon = new GIcon(mapBaseIcon, "<%= icon %>", null, "<%= icon_shadow %>");
+
+  <% @results.each do |name,results| %>
+    <% 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) %>');
+      <% end %>
+    <% end %>
+  <% end %>
+
+  mapCenter();
 </script>
diff --git a/app/views/search/_product.rhtml b/app/views/search/_product.rhtml
index c2841e7..bac132f 100644
--- a/app/views/search/_product.rhtml
+++ b/app/views/search/_product.rhtml
@@ -45,5 +45,5 @@
     <div><%= property[:name] + ': ' + instance_eval(&property[:content]) %></div>
   <% end %>
 
-  <hr size=1>
+  <br /><br />
 </li>
diff --git a/config/routes.rb b/config/routes.rb
index 34ee42b..440d00b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -80,6 +80,9 @@ ActionController::Routing::Routes.draw do |map|
   # contact
   map.contact 'contact/:profile/:action/:id', :controller => 'contact', :action => 'index', :id => /.*/, :profile => /#{Noosfero.identifier_format}/
 
+  # map balloon
+  map.contact 'map_balloon/:action/:id', :controller => 'map_balloon', :id => /.*/
+
   # chat
   map.chat 'chat/:action/:id', :controller => 'chat'
   map.chat 'chat/:action', :controller => 'chat'
diff --git a/public/javascripts/google_maps.js b/public/javascripts/google_maps.js
new file mode 100644
index 0000000..797ea87
--- /dev/null
+++ b/public/javascripts/google_maps.js
@@ -0,0 +1,58 @@
+var map;
+var mapPoints = {};
+var mapBounds;
+var mapDefaultIcon = new GIcon(G_DEFAULT_ICON);
+   
+function mapPutMarker(lat, lng, title, _icon, url) {
+  var point_str = lat + ":" + lng;
+
+  var icon = _icon == null ? mapDefaultIcon : _icon;
+   
+  if (mapPoints[point_str]) {
+    lng += (Math.random() - 0.5) * 0.02;
+    lat += (Math.random() - 0.5) * 0.02;
+  } else {
+    mapPoints[point_str] = true;
+  }
+     
+  var point = new GLatLng(lat, lng);
+  var options = { 'title' : title, 'icon' : icon };
+  var marker = new GMarker(point, options);
+  map.addOverlay(marker);
+
+  GEvent.addListener(marker, 'click', function() {
+    if (url) {
+      jQuery.ajax({url: url,
+        success: function(data) {
+          map.openInfoWindowHtml(point, jQuery(data).html());
+        }
+      });
+    }
+  });
+  mapBounds.extend(point);
+
+  return marker;
+}
+
+window.unload = function() {
+  GUnload();
+};
+
+function mapLoad(initial_zoom) {
+  if (GBrowserIsCompatible()) {
+    map = new GMap2(document.getElementById("map"));
+
+    new GKeyboardHandler(map);
+    map.addControl(new GLargeMapControl());
+    map.addControl(new GMapTypeControl());
+
+    centerPoint = new GLatLng(-15.0, -50.1419);
+    map.setCenter(centerPoint, initial_zoom);
+    mapBounds = new GLatLngBounds();
+  }
+}
+
+function mapCenter(latlng) {
+  map.setZoom(map.getBoundsZoomLevel(mapBounds));
+  map.setCenter(latlng ? latlng : mapBounds.getCenter());
+}
--
libgit2 0.21.2