Do HTML class and JS variable setting ASAP.

7 files changed, 23 insertions, 12 deletions

diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index a474ddb38..7f81a020c 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -1,14 +1,15 @@
 [% USE date %][% USE Math %]
 [% SET start = c.config.ADMIN_BASE_URL IF admin %]
 
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-<meta name="cobrand" content="[% c.cobrand.moniker %]">
+<meta http-equiv="content-type" content="text/html; charset=utf-8"
+    id="js-meta-data" data-page="[% page %]"
+    data-cobrand="[% c.cobrand.moniker %]">
 
 <!--[if (lt IE 9)]>
     <script src="[% version('/js/html5shiv.js') %]""></script>
 <![endif]-->
 <script src="[% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+<script src="[% version('/cobrands/fixmystreet/header.js') %]"></script>
 <script type="text/javascript" src="[% start %]/js/translation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script>
 
 <script type="text/javascript" src="[% version('/jslib/jquery-1.7.2.min.js') %]"></script>
diff --git a/templates/web/base/maps/google.html b/templates/web/base/maps/google.html
index 86ca51fab..456e47bfd 100644
--- a/templates/web/base/maps/google.html
+++ b/templates/web/base/maps/google.html
@@ -15,7 +15,6 @@
 <script type="text/javascript">
 var fixmystreet = fixmystreet || {};
 $.extend(fixmystreet, {
-    'page': '[% page %]',
     'area': [ [% map.area.join(',') %] ],
     'all_pins': '[% all_pins %]',
     'latitude': [% map.latitude %],
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index 37059910e..3c00c479c 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -8,7 +8,6 @@
 <script type="text/javascript">
 var fixmystreet = fixmystreet || {};
 $.extend(fixmystreet, {
-    'page': '[% page %]',
     'area': [ [% map.area.join(',') %] ],
     'all_pins': '[% all_pins %]',
     'latitude': [% map.latitude %],
diff --git a/templates/web/seesomething/index.html b/templates/web/seesomething/index.html
index dfd982e85..40780fba4 100644
--- a/templates/web/seesomething/index.html
+++ b/templates/web/seesomething/index.html
@@ -7,7 +7,6 @@
 <script type="text/javascript">
 var fixmystreet = fixmystreet || {};
 $.extend(fixmystreet, {
-    'page': '',
     'latitude': 52.505241,
     'longitude': -1.815285,
     'zoom': 3,
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 490057135..09d387506 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -182,9 +182,6 @@ fixmystreet.resize_to = {
 fixmystreet.set_up = fixmystreet.set_up || {};
 $.extend(fixmystreet.set_up, {
   basics: function() {
-    // Add a class to the whole page saying JavaScript is enabled (for CSS and so on)
-    $('html').removeClass('no-js').addClass('js');
-
     // Preload the new report pin
     if ( typeof fixmystreet !== 'undefined' && typeof fixmystreet.pin_prefix !== 'undefined' ) {
         document.createElement('img').src = fixmystreet.pin_prefix + 'pin-green.png';
@@ -547,7 +544,7 @@ $.extend(fixmystreet.set_up, {
   map_controls: function() {
     //add permalink on desktop, force hide on mobile
     //add links container (if its not there)
-    if (window.cobrand != 'zurich') {
+    if (fixmystreet.cobrand != 'zurich') {
         if ($('#sub_map_links').length === 0) {
             $('<p id="sub_map_links" />').insertAfter($('#map'));
         }
@@ -1017,7 +1014,6 @@ fixmystreet.display = {
 
 
 $(function() {
-    window.cobrand = $('meta[name="cobrand"]').attr('content');
     fixmystreet.original = {
         'title': document.title,
         'page': fixmystreet.page
diff --git a/web/cobrands/fixmystreet/header.js b/web/cobrands/fixmystreet/header.js
new file mode 100644
index 000000000..493facc7d
--- /dev/null
+++ b/web/cobrands/fixmystreet/header.js
@@ -0,0 +1,17 @@
+var fixmystreet = fixmystreet || {};
+
+(function(D){
+    var E = D.documentElement;
+    E.className = E.className.replace(/\bno-js\b/, 'js');
+    var iel8 = E.className.indexOf('iel8') > -1;
+    var type = Modernizr.mq('(min-width: 48em)') || iel8 ? 'desktop' : 'mobile';
+    var meta = D.getElementById('js-meta-data');
+    fixmystreet.page = meta.getAttribute('data-page');
+    fixmystreet.cobrand = meta.getAttribute('data-cobrand');
+    if (type == 'mobile') {
+        E.className += ' mobile';
+        if (fixmystreet.page == 'around') {
+            E.className += ' mobile-reporting-map only-map';
+        }
+    }
+})(document);
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 992037a2f..f110dec26 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -744,7 +744,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
         var lonlat = fixmystreet.map.getLonLatFromViewPortPx(e.xy);
         fixmystreet.display.begin_report(lonlat);
 
-        if ( typeof ga !== 'undefined' && window.cobrand == 'fixmystreet' ) {
+        if ( typeof ga !== 'undefined' && fixmystreet.cobrand == 'fixmystreet' ) {
             ga('send', 'pageview', { 'page': '/map_click' } );
         }
     }