experimental pop-out map key

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 9f5088038393d6c5f0e705db94df12625e40d9e0..8615c59be460391468283d4c0439f5281388159d 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,11 +1,11 @@
 <% content_for :greeting do %>
 <% content_for :greeting do %>

-<% if !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>

 <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>
 <% end %>
 
 <% content_for :left_menu do %>
 <%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
 <% end %>
 <% end %>
 
 <% content_for :left_menu do %>

-<%= link_to "Map key", "http://wiki.openstreetmap.org/index.php/Map_Key" %>
+<%= link_to_function "Map key", "showKey();" %>

 <% end %>
 
 <%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 <% end %>
 
 <%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>


@@ -88,14 +88,14 @@
     map.setCenter(centre, zoom);
     <% end %>
 
     map.setCenter(centre, zoom);
     <% end %>
 

-    <% if marker %>
-    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
-    <% end %>
-

     <% if layers %>
     setMapLayers("<%= layers %>");
     <% end %>
 
     <% if layers %>
     setMapLayers("<%= layers %>");
     <% end %>
 

+    <% if marker %>
+    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    <% end %>
+

     map.events.register("moveend", map, updateLocation);
     updateLocation();
 
     map.events.register("moveend", map, updateLocation);
     updateLocation();