diff options
| -rw-r--r-- | web/cobrands/barnet/layout.scss | 4 | ||||
| -rw-r--r-- | web/cobrands/barnet/position_map.js | 13 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss index 943efd80e..d30243060 100644 --- a/web/cobrands/barnet/layout.scss +++ b/web/cobrands/barnet/layout.scss @@ -232,3 +232,7 @@ ol.big-numbers > li::before { } } + +#map_box { + border: 1px solid black; +} diff --git a/web/cobrands/barnet/position_map.js b/web/cobrands/barnet/position_map.js index 08ad60a85..e994b71e0 100644 --- a/web/cobrands/barnet/position_map.js +++ b/web/cobrands/barnet/position_map.js @@ -1,14 +1,13 @@ function position_map_box() { - var map_pos = 'absolute', map_height = '100%'; - if ($('html').hasClass('ie6')) { - map_pos = 'absolute'; - map_height = $('.wrapper').height(); + var map_pos = 'absolute', map_height = $('.wrapper').height(); + if ( !$('html').hasClass('ie6') && map_height < 677 ) { + map_height = '677px'; } $('#map_box').prependTo('.wrapper').css({ zIndex: 0, position: map_pos, - top: 0, left: $('.wrapper').left, - right: 0, bottom: $('.wrapper').bottom, - width: '900px', height: map_height, + top: 1, left: $('.wrapper').left, + right: 0, bottom: $('.wrapper').bottom + 1, + width: '898px', height: map_height, margin: 0 }); } diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 1574754c9..a215e923e 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -466,6 +466,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { // e.xy is relative to top left of map, which might not be top left of page e.xy.x += bo.left; e.xy.y += bo.top; + + // 24 and 64 is the width and height of the marker pin if (e.xy.y <= o.top || (e.xy.x >= o.left && e.xy.x <= o.left + w + 24 && e.xy.y >= o.top && e.xy.y <= o.top + h + 64)) { // top of the page, pin hidden by header; // or underneath where the new sidebar will appear |