Permalink
Browse files

Merge branch 'master' into staging

* master:
  Fix tileservers on fullpage
  • Loading branch information...
nikolai-b committed Jul 25, 2017
2 parents efa7491 + 9ef2ea8 commit dd2c62224cfeaf6a4da7f7bd2b717fa4b9e2fb86
Showing with 4 additions and 4 deletions.
  1. +4 −4 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 || [];

0 comments on commit dd2c622

Please sign in to comment.