Port to Leaflet

app/views/layouts/_head.html.erb

@@ -5,7 +5,13 @@
   <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %>
   <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %>
   <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
-  <!--[if IE]><%= stylesheet_link_tag "large-#{dir}", :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
+  <%= stylesheet_link_tag "leaflet" %>
+  <%= stylesheet_link_tag "leaflet.draw" %>
+  <!--[if IE]>
+    <%= stylesheet_link_tag "leaflet.ie" %>
+    <%= stylesheet_link_tag "leaflet.draw.ie" %>
+    <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>
+  <![endif]--> <!-- IE is totally broken with CSS media queries -->
   <%= favicon_link_tag "favicon.ico" %>
   <%= favicon_link_tag "osm_logo.png", :rel => "apple-touch-icon", :type => "image/png" %>
   <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %>

app/views/user/_contact.html.erb

@@ -3,7 +3,7 @@
      user_data = {
        :lon => contact.home_lon,
        :lat => contact.home_lat,
-       :icon => type == "friend" ? "marker-blue.png" : "marker-green.png",
+       :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
        :description => render(:partial => "popup", :object => contact, :locals => {:type => type})
      }
   %>

app/views/user/view.html.erb

@@ -118,7 +118,7 @@
       user_data = {
         :lon => @user.home_lon,
         :lat => @user.home_lat,
-        :icon => "marker.png",
+        :icon => image_path("marker-red.png"),
         :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
       }
     %>