Merge branch 'master' into staging

* master: Fix tileservers on fullpage
cyclestreets · Jul 25, 2017 · dd2c622 · dd2c622
2 parents efa7491 + 9ef2ea8
commit dd2c622
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -77,6 +77,10 @@
         - if flash[type]
           .flash{class: type}
             = flash[type]
+    - tile_servers = [ { name: SiteConfig.first.tile_server1_name, url: SiteConfig.first.tile_server1_url },
+      { name: SiteConfig.first.tile_server2_name, url: SiteConfig.first.tile_server2_url },
+      { name: SiteConfig.first.tile_server3_name, url: SiteConfig.first.tile_server3_url } ]
+    #map-tiles{ "data-tileservers" => tile_servers.to_json }
     - if @full_page
       #page-full
         .wrapper-full
@@ -90,10 +94,6 @@
               = image_tag "spinner.gif"
               = t(".loading")
             .inner
-              - tile_servers = [ { name: SiteConfig.first.tile_server1_name, url: SiteConfig.first.tile_server1_url },
-                { name: SiteConfig.first.tile_server2_name, url: SiteConfig.first.tile_server2_url },
-                { name: SiteConfig.first.tile_server3_name, url: SiteConfig.first.tile_server3_url } ]
-              #map-tiles{ "data-tileservers" => tile_servers.to_json }
     - if @site_config.ga_account_id
       :javascript
         var _gaq = _gaq || [];