Preparation for anon edit change

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 5488ba40d5cd85d233dde442e5c31cfc3f9dc35d..625f17a109f62f0de68689338e8a63e9fd8dabfa 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,6 +1,16 @@
-<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<% content_for :greeting do %>
+<% 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 %>

 
 

-<div id="map"></div> 
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'key' %>
+<%= render :partial => 'search' %>
+
+<div id="map">
+<div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
+</div> 

 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>
 
 <% if params['mlon'] and params['mlat'] %>
 <% marker = true %>


@@ -78,20 +88,24 @@
     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();
 
     handleResize();
   }
 
     map.events.register("moveend", map, updateLocation);
     updateLocation();
 
     handleResize();
   }
 

+  function getPosition() {
+    return mercatorToLonLat(map.getCenter());
+  }
+

   function setPosition(lat, lon, zoom) {
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 
   function setPosition(lat, lon, zoom) {
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 


@@ -100,7 +114,7 @@
     if (marker)
       removeMarkerFromMap(marker);
 
     if (marker)
       removeMarkerFromMap(marker);
 

-    marker = addMarkerToMap(centre);
+    marker = addMarkerToMap(centre, getArrowIcon());

   }
 
   function updateLocation() {
   }
 
   function updateLocation() {


@@ -125,14 +139,14 @@
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();
   function resizeMap() {
     var centre = map.getCenter();
     var zoom = map.getZoom();

-    var search_results_width = $("search_results").offsetWidth;
+    var sidebar_width = $("sidebar").offsetWidth;

 
 

-    if (search_results_width > 0) {
-      search_results_width = search_results_width + 5
+    if (sidebar_width > 0) {
+      sidebar_width = sidebar_width + 5

     }
 
     }
 

-    $("map").style.left = (search_results_width) + "px";
-    $("map").style.width = ($("content").offsetWidth - search_results_width) + "px";
+    $("map").style.left = (sidebar_width) + "px";
+    $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";

     $("map").style.height = ($("content").offsetHeight - 2) + "px";
 
     map.setCenter(centre, zoom);
     $("map").style.height = ($("content").offsetHeight - 2) + "px";
 
     map.setCenter(centre, zoom);