Download as
Browse Code »

Commit 9296f29daf6bcc17624b7250b1a578456618c9d4

Authored by AntonioTerceiro
1 parent cbfac6a3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem265: actually displaying items in map 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1927 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 33 additions and 18 deletions   Show diff stats
app/helpers/search_helper.rb
  Diff comments   View file @9296f29
@@ -16,13 +16,20 @@ module SearchHelper @@ -16,13 +16,20 @@ module SearchHelper
16 end 16 end
17 17
18 def display_results 18 def display_results
19 - partial = 19 + data =
20 if params[:display] == 'map' 20 if params[:display] == 'map'
21 - 'google_maps' 21 + {
  22 + :partial => 'google_maps',
  23 + :toggle => link_to(_('Display in list'), params.merge(:display => 'list'))
  24 + }
22 else 25 else
23 - 'display_results' 26 + {
  27 + :partial => 'display_results',
  28 + :toggle => link_to(_('Display in map'), params.merge(:display => 'map'))
  29 + }
24 end 30 end
25 - render :partial => partial 31 +
  32 + data[:toggle] + (render :partial => data[:partial])
26 end 33 end
27 34
28 end 35 end
app/views/search/_display_results.rhtml
  Diff comments   View file @9296f29
1 -<div style='float: left;'>  
2 - <%= link_to _('Display in map'), :display => 'map' %>  
3 -</div>  
4 -  
5 <div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>"> 1 <div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>">
6 2
7 <% 3 <%
app/views/search/_google_maps.rhtml
  Diff comments   View file @9296f29
1 -<div style='float: left;'>  
2 - <%= link_to _('Display in list'), :display => 'list' %>  
3 -</div>  
4 -  
5 <%= content_tag('script', '', :src => GoogleMaps.api_url, :type => 'text/javascript') %> 1 <%= content_tag('script', '', :src => GoogleMaps.api_url, :type => 'text/javascript') %>
6 2
7 3
@@ -10,14 +6,30 @@ @@ -10,14 +6,30 @@
10 </div> 6 </div>
11 7
12 <script type='text/javascript'> 8 <script type='text/javascript'>
13 -if (GBrowserIsCompatible()) {  
14 - var map = new GMap2(document.getElementById("map"));  
15 - map.setCenter(new GLatLng(-15.0, -50.1419), 4);  
16 9
17 - point = new GLatLng(-15, -40);  
18 - marker = new GMarker(point); 10 +function putMarker(lat, lng, title) {
  11 + var point = new GLatLng(lat, lng);
  12 + var options = { 'title' : title };
  13 + var marker = new GMarker(point, options);
19 map.addOverlay(marker); 14 map.addOverlay(marker);
20 - GEvent.addListener(marker, 'click', function() { marker.openInfoWindow("teste") }); 15 + GEvent.addListener(marker, 'click', function() {
  16 + map.openInfoWindowHtml(point, title);
  17 + });
  18 +}
21 19
  20 +if (GBrowserIsCompatible()) {
  21 + var map = new GMap2(document.getElementById("map"));
  22 + map.setCenter(new GLatLng(-15.0, -50.1419), 4);
  23 +<%
  24 + @results.each do |name,results|
  25 + results.each do |item|
  26 + if item.lat && item.lng
  27 + %>
  28 + putMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>);
  29 + <%
  30 + end
  31 + end
  32 + end
  33 +%>
22 } 34 }
23 </script> 35 </script>