Changes for Bromley map display.

5 files changed, 49 insertions, 32 deletions

diff --git a/web/cobrands/bromley/bromley.scss b/web/cobrands/bromley/bromley.scss
index 409bc1152..054315fbd 100644
--- a/web/cobrands/bromley/bromley.scss
+++ b/web/cobrands/bromley/bromley.scss
@@ -75,7 +75,7 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
 .main-menu li { list-style-type: none; }
 #search input { display: inline; margin: 0; @include border-radius(0em); }
 #search input.button { font-weight: normal; text-transform: none; }
-#bromley-footer { margin: 1em 0 0; }
+#bromley-footer { margin: 2em 0 0; }
 #bromley-footer .footer-nav li { list-style-type: none; }
 #bromley-footer p { margin: 0; }
 
diff --git a/web/cobrands/bromley/fixmystreet.js b/web/cobrands/bromley/fixmystreet.js
index b87ad3b81..e507daf91 100644
--- a/web/cobrands/bromley/fixmystreet.js
+++ b/web/cobrands/bromley/fixmystreet.js
@@ -106,7 +106,7 @@ $(function(){
             }
             if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') {
                 // Immediately go full screen map if on around page
-                $('#site-header').hide();
+                // $('#site-header').hide();
                 $('#map_box').prependTo('.wrapper').css({
                     position: 'absolute',
                     top: 0, left: 0, right: 0, bottom: 0,
@@ -127,31 +127,32 @@ $(function(){
             });
         } else {
             // Make map full screen on non-mobile sizes.
-            //$html.removeClass('mobile');
-            //var map_pos = 'fixed', map_height = '100%';
+            $html.removeClass('mobile');
+            var map_pos = 'fixed', map_height = '100%';
             //if ($html.hasClass('ie6')) {
-            //    map_pos = 'absolute';
-            //    map_height = $(window).height();
+                map_pos = 'absolute';
+                map_height = $(window).height();
             //}
-            //$('#map_box').prependTo('.wrapper').css({
-            //    zIndex: 0, position: map_pos,
-            //    top: 0, left: 0, right: 0, bottom: 0,
-            //    width: '100%', height: map_height,
-            //    margin: 0
-            //});
-            //if (typeof fixmystreet !== 'undefined') {
-            //    fixmystreet.state_map = 'full';
-            //}
-            //if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') {
-            //    // Remove full-screen-ness
-            //    $('#site-header').show();
-            //    $('#fms_pan_zoom').css({ top: '4.75em !important' });
-            //    $('.big-green-banner')
-            //        .removeClass('mobile-map-banner')
-            //        .prependTo('#side')
-            //        .text('Click map to report a problem');
-            //}
-            //$('span.report-a-problem-btn').css({ cursor:'' }).off('.reportBtn');
+            $('#map_box').prependTo('.wrapper').css({
+                zIndex: 0, position: map_pos,
+                top: 0, left: 0, right: 0, bottom: 0,
+                width: '100%', height: map_height,
+                margin: 0
+            });
+            $('#bromley-footer').hide();
+            if (typeof fixmystreet !== 'undefined') {
+                fixmystreet.state_map = 'full';
+            }
+            if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') {
+                // Remove full-screen-ness
+                // $('#site-header').show();
+                $('#fms_pan_zoom').css({ top: '4.75em !important' });
+                $('.big-green-banner')
+                    .removeClass('mobile-map-banner')
+                    .prependTo('#side')
+                    .text('Click map to report a problem');
+            }
+            $('span.report-a-problem-btn').css({ cursor:'' }).off('.reportBtn');
         }
         last_type = type;
     });
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index 556d46321..4dbdd8bab 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -1,6 +1,10 @@
 @import "_colours";
 @import "../fixmystreet/_layout";
 
+.wrapper {
+    position: relative;
+}
+
 body {
     background: #fff;
 }
@@ -38,8 +42,7 @@ body.frontpage .table-cell .content {
     }
 }
 
-// White background, so no shadow needed (unless map goes full screen, so
-// JavaScript should put it in at that point? Or just put it on all map pages?
+// White background, so no shadow needed.
 .content {
     @include box-shadow(none);
 }
@@ -48,9 +51,22 @@ body.frontpage .table-cell .content {
         border: none;
     }
 }
+// Except on map pages
+body.mappage .content {
+    @include box-shadow(0px 0px 6px 1px #000);
+}
+.ie6, .ie7, .ie8  {
+    body.mappage .content {
+        border: solid 1px #666;
+    }
+}
+
+#map_box {
+    border-top: solid 1px #666;
+}
 
 // Perhaps fix map location (should be in central?)
 .ie6 #map_box {
-    right: -32em;
+    right: -30em;
 }
 
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index b3d00cd48..db348c2a4 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -1338,7 +1338,7 @@ table.nicetable {
 
 // this is a bit of a hack to get some differentation between desk and mobile
 .desk-only {
-  display:none !important;
+  display:none;
 }
 
 // hide anything with this class if js is working
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 37aab4653..5fb65ee72 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -3,10 +3,10 @@
 
 //hacks for desk/mob only stuff
 .desk-only {
-  display:block !important;
+    display: block;
 }
 .mob-only {
-  display:none !important;
+    display: none;
 }
 
 body {
@@ -211,7 +211,7 @@ h1 {
 .ie6, .ie7, .ie8  {
   .content {
     // If no box-shadow, just want a boring black border to stand it out from the map.
-    border: 1px solid black;
+    border: 1px solid #666;
     //take off margins so we line up properly
     margin: 0;
   }