X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6706ca3c5020577c22f69a6590dd6ff4e065c8a4..d29a319ab0c9d692eb8a24f2d243282386d41346:/app/views/site/index.rhtml?ds=sidebyside

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 5488ba40d..1d8444221 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,4 +1,12 @@
-<%= 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 %>
+
+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'key' %>
+<%= render :partial => 'search' %>
 
 <div id="map"></div> 
 
@@ -78,20 +86,24 @@
     map.setCenter(centre, zoom);
     <% end %>
 
-    <% if marker %>
-    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
-    <% 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();
   }
 
+  function getPosition() {
+    return mercatorToLonLat(map.getCenter());
+  }
+
   function setPosition(lat, lon, zoom) {
     var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
 
@@ -100,7 +112,7 @@
     if (marker)
       removeMarkerFromMap(marker);
 
-    marker = addMarkerToMap(centre);
+    marker = addMarkerToMap(centre, getArrowIcon());
   }
 
   function updateLocation() {
@@ -125,14 +137,14 @@
   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);