X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/89e976c6e57c9aa8afae00437aaf4399ea5fc58f..1bbe59b6a77030c362f9991083aa7c06799b272d:/app/views/site/index.rhtml?ds=sidebyside

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 403f552d1..d6a0fe8a3 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -2,21 +2,20 @@
 
 <div id="geocoder">
   <%= start_form_tag :controller => 'geocoder', :action => 'search' %>
-  <%= text_field 'query', 'postcode'%>
+  <%= text_field 'query', 'postcode' %>
   <%= text_field 'query', 'place_name'%>
   <%= submit_tag 'Search' %>
   <%= end_form_tag %>
 
   <div id="geocoder-attribution">
     Geolocation provided by <a href="http://npemap.org.uk/">npemap.org.uk</a>,
-    <a href="http://geocoder.us/">geocoder.us</a>, <a href="http://geocoder.ca/">geocoder.ca</a>
-    and <a href="http://www.geonames.org/">geonames.org</a>
+    <a href="http://geocoder.us/">geocoder.us</a>, <a href="http://geocoder.ca/">geocoder.ca</a> and <a href="http://www.geonames.org/">geonames.org</a>
   </div>
   <div id="postcode-helper">
-    eg: SW15 6JH, 95472 or H2L4C1
+    Enter a postcode or zip code, eg: SW15 6JH, 95472 
   </div>
   <div id="placename-helper">
-    eg:Essen
+    Enter a place-name, eg:Essen
   </div>
 </div>
 
@@ -70,7 +69,7 @@
 <script type="text/javascript">
   <!--
   var map, layer, markers;
-
+  var ie6 = ! ( window.addEventListener || window.XMLHttpRequest );
 
   function init(){
 
@@ -107,8 +106,71 @@
         var zoom = map.getZoom();
         updatelinks(lon_deg,lat_deg,zoom);
         });
+    document.getElementById( 'map_OpenLayers_ViewPort' ).style.position = 'absolute';
+    if( ie6 ) {
+      handleResize();
+    }
   }        
 
-init();
+  function getStyle( el, property ) {
+    var style;
+    if( el.currentStyle ) {
+        style = el.currentStyle[property];
+    } else if( window.getComputedStyle ) {
+        style = document.defaultView.getComputedStyle(el,null).getPropertyValue(property);
+    } else {
+        style = el.style[property];
+    }
+    return style;
+  }
+  
+  function handleResize() {
+    var el = document.getElementById( 'map' );
+    var left = getStyle( el, 'left' );
+    var top = getStyle( el, 'top' );
+    var bottom = getStyle( el, 'bottom' );
+    var right = getStyle( el, 'right' );
+    var width = el.old_width;
+    if( ! width ) {
+        width = getStyle( el, 'width' );
+    }
+    var height = el.old_height;
+    if( ! height ) {
+        height = getStyle( el, 'height' );
+    }
+    var pwidth, pheight;
+    if( el.offsetParent.nodeName == 'BODY' || el.offsetParent.nodeName == 'HTML' ) {
+      if( typeof( window.innerWidth ) == 'number' ) {
+          pwidth = window.innerWidth;
+          height = window.innerHeight;
+      } else if( document.documentElement &&
+          ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
+          pwidth = document.documentElement.clientWidth;
+          pheight = document.documentElement.clientHeight;
+      } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
+          pwidth = document.body.clientWidth;
+          pheight = document.body.clientHeight;
+      }
+    } else {
+      pwidth = el.offsetParent.offsetWidth;
+      pheight = el.offsetParent.offsetHeight;
+    }
+    if( left != 'auto' && right != 'auto' && width == 'auto' ) {
+      el.old_width = width;
+      var new_width = (pwidth - el.offsetLeft - parseInt( right ) );
+      el.style.width = new_width + 'px';
+    }
+    if( top != 'auto' && bottom != 'auto' && height == 'auto' ) {
+      el.old_height = height;
+      var new_height = (pheight - el.offsetTop - parseInt( bottom ) );
+      el.style.height = new_height + 'px';
+    }
+    map.updateSize();
+  }
+
+if( ie6 ) {
+  window.onresize = handleResize;
+}
+window.onload = init;
 // -->
 </script>