diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-12-09 16:50:03 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-12-09 16:50:03 +0000 |
| commit | 93180a49cb9f56cd92c97ea1e22cf5cc9dd7194a (patch) | |
| tree | 6901912029abbba1332a04f5b310dfb31bee7c99 | |
| parent | e21a1886027956c45daed48edda7035719bcdf13 (diff) | |
Load OpenLayers stylesheet directly, not via JS.
This lets us version and cache-bust it as necessary, plus let
browser decide how to load it, we're always going to need it.
| -rw-r--r-- | templates/web/base/common_header_tags.html | 2 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index f34dea212..7c0ac4973 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -1,5 +1,7 @@ [% SET start = c.config.ADMIN_BASE_URL IF admin %] +<link rel="stylesheet" href="[% version('/js/OpenLayers/theme/default/style.css') %]"> + <meta http-equiv="content-type" content="text/html; charset=utf-8" id="js-meta-data" data-page="[% page %]" data-cobrand="[% c.cobrand.moniker %]"> diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 3de8e4d1f..a3cefa7da 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -606,6 +606,7 @@ var fixmystreet = fixmystreet || {}; // Create the basics of the map fixmystreet.map = new OpenLayers.Map( "map", OpenLayers.Util.extend({ + theme: null, controls: fixmystreet.controls, displayProjection: new OpenLayers.Projection("EPSG:4326") }, fixmystreet.map_options) |