Improve user popups on friend/nearby mapper maps.

app/views/user/_map.html.erb

@@ -1,24 +1,5 @@
-<script type="text/javascript">
+<% friends = @user.friends.collect { |f| f.befriendee }.select { |f| !f.home_lat.nil? and !f.home_lon.nil? } %>
-  var nearest = [], friends = [];
+<% nearest = @user.nearby - friends %>
-  <% friends = @user.friends.collect { |f| f.befriendee } %>
-  <% friends.each do |friend| %>
-    <% if !friend.home_lat.nil? and !friend.home_lon.nil? %>
-      friends.push({
-        display_name : "<%= escape_javascript(friend.display_name) %>",
-        home_lat : <%= friend.home_lat %>,
-        home_lon : <%= friend.home_lon %>
-      });
-    <% end %>
-  <% end %>
-  <% nearest = @user.nearby - friends %>
-  <% nearest.each do |nearby| %>
-    nearest.push({
-      display_name : "<%= escape_javascript(nearby.display_name) %>",
-      home_lat : <%= nearby.home_lat %>,
-      home_lon : <%= nearby.home_lon %>
-    });
-  <% end %>
-</script>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>
   <% lon = h(params['lon'] || '-0.1') %>
@@ -56,24 +37,29 @@
     setMapCenter(centre, zoom);
 
     <% if marker %>
-    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null, "<%= t 'user.map.your location' %>");
+    marker = addMarkerToMap(
+      new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null,
+      '<%= escape_javascript(render :partial => "popup", :object => @user, :locals => { :type => "your location" }) %>'
+    );
     <% end %>
 
     var near_icon = OpenLayers.Marker.defaultIcon();
-    near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";;
+    near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";
-    var i = nearest.length;
+    <% nearest.each do |u| %>
-    while( i-- ) {
+      addMarkerToMap(new OpenLayers.LonLat(
-      var description = i18n('<%= t 'user.map.nearby mapper'%>', { nearby_user: '<a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>' });
+        <%= u.home_lon %>, <%= u.home_lat %>), near_icon.clone(),
-      var nearmarker = addMarkerToMap(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat), near_icon.clone(), description);
+        '<%= escape_javascript(render :partial => "popup", :object => u, :locals => { :type => "nearby mapper" }) %>'
-    }
+      );
+    <% end %>
 
     var friend_icon = OpenLayers.Marker.defaultIcon();
-    friend_icon.url = OpenLayers.Util.getImagesLocation() + "marker-blue.png";;
+    friend_icon.url = OpenLayers.Util.getImagesLocation() + "marker-blue.png";
-    var i = friends.length;
+    <% friends.each do |u| %>
-    while( i-- ) {
+      addMarkerToMap(new OpenLayers.LonLat(
-      var description = i18n('<%= t 'user.map.friend'%>', { friend_user: '<a href="/user/'+friends[i].display_name+'">'+friends[i].display_name+'</a>' });
+        <%= u.home_lon %>, <%= u.home_lat %>), friend_icon.clone(),
-      var friendmarker = addMarkerToMap(new OpenLayers.LonLat(friends[i].home_lon, friends[i].home_lat), friend_icon.clone(), description);
+        '<%= escape_javascript(render :partial => "popup", :object => u, :locals => { :type => "friend" }) %>'
-    }
+      );
+    <% end %>
 
     if (document.getElementById('updatehome')) {
       map.events.register("click", map, setHome);
@@ -94,12 +80,13 @@
         removeMarkerFromMap(marker);
       }
 
-      marker = addMarkerToMap(lonlat, null, "<%= t 'user.map.your location' %>");
+      marker = addMarkerToMap(
+        lonlat, null, 
+        '<%= escape_javascript(render :partial => "popup", :object => @user, :locals => { :type => "your location" }) %>'
+      );
     }
   }
 
   window.onload = init;
 // -->
 </script>
-
-

app/views/user/_popup.html.erb

@@ -0,0 +1,5 @@
+<div class="user_popup">
+  <%= user_thumbnail popup, :style => "float :left" %>
+  <p><%= t('user.popup.' + type) %></p>
+  <p><%= link_to popup.display_name, :controller => "user", :action => "view", :display_name => popup.display_name %></p>
+</div>

config/locales/en.yml

@@ -1450,10 +1450,10 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
-    map:
+    popup:
-      your location: Your location
+      your location: "Your location"
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
+      nearby mapper: "Nearby mapper"
-      friend: "Friend: [[friend_user]]"
+      friend: "Friend"
     account:
       title: "Edit account"
       my settings: My settings

config/openlayers.cfg

@@ -40,7 +40,7 @@ OpenLayers/Renderer/VML.js
 OpenLayers/Rule.js
 OpenLayers/Icon.js
 OpenLayers/Marker.js
-OpenLayers/Popup/AnchoredBuddle.js
+OpenLayers/Popup/FramedCloud.js
 OpenLayers/Projection.js
 OpenLayers/Console.js
 OpenLayers/Lang.js

public/javascripts/map.js

@@ -96,7 +96,8 @@ function addMarkerToMap(position, icon, description) {
    markers.addMarker(marker);
 
    if (description) {
-      marker.events.register("click", marker, function() { openMapPopup(marker, description) });
+      marker.events.register("mouseover", marker, function() { openMapPopup(marker, description) });
+      marker.events.register("mouseout", marker, function() { closeMapPopup() });
    }
 
    return marker;
@@ -169,10 +170,9 @@ function addBoxToMap(boxbounds) {
 function openMapPopup(marker, description) {
    closeMapPopup();
 
-   popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat, null,
+   popup = new OpenLayers.Popup.FramedCloud("popup", marker.lonlat, null,
-                                               description, marker.icon, true);
+                                            description, marker.icon, true);
    popup.setBackgroundColor("#E3FFC5");
-   popup.autoSize = true;
    map.addPopup(popup);
 
    return popup;

public/stylesheets/common.css

@@ -560,6 +560,17 @@ hr {
   display: inline !important;
 }
 
+/* Rules for user popups on maps */
+
+.user_popup p {
+  padding-top: 3px;
+  padding-bottom: 3px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-left: 55px;
+  margin-right: 2px;
+}
+
 /* Rules for message in/out box page */
 
 #messages {