diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js index a581aaf5..6b87b28c 100644 --- a/src/c3nav/site/static/site/js/c3nav.js +++ b/src/c3nav/site/static/site/js/c3nav.js @@ -95,8 +95,6 @@ c3nav = { continue_init: function() { c3nav.init_map(); - c3nav._primary_color = $('.leaflet-control-attribution a:not(:hover)').css('color'); - $('.locationinput').data('location', null); var $main = $('main'), @@ -106,6 +104,8 @@ c3nav = { c3nav.last_site_update = JSON.parse($main.attr('data-last-site-update')); c3nav.new_site_update = false; + c3nav._primary_color = $main.attr('data-primary-color') || L.polyline([0, 0]).options.color; + c3nav.ssids = $main.is('[data-ssids]') ? JSON.parse($main.attr('data-ssids')) : null; history.replaceState(state, window.location.path); diff --git a/src/c3nav/site/templates/site/map.html b/src/c3nav/site/templates/site/map.html index d6841423..99fafa9b 100644 --- a/src/c3nav/site/templates/site/map.html +++ b/src/c3nav/site/templates/site/map.html @@ -4,7 +4,7 @@ {% load i18n %} {% block content %} -
+
{% if not request.mobileclient %}
{% if not embed %} diff --git a/src/c3nav/site/views.py b/src/c3nav/site/views.py index bc7a9528..227856a8 100644 --- a/src/c3nav/site/views.py +++ b/src/c3nav/site/views.py @@ -119,12 +119,14 @@ def map_index(request, mode=None, slug=None, slug2=None, details=None, options=N if not initial_bounds: initial_bounds = tuple(chain(*Source.max_bounds())) + print ctx = { 'bounds': json.dumps(Source.max_bounds(), separators=(',', ':')), 'levels': json.dumps(tuple((level.pk, level.short_label) for level in levels.values()), separators=(',', ':')), 'state': json.dumps(state, separators=(',', ':'), cls=DjangoJSONEncoder), 'tile_cache_server': settings.TILE_CACHE_SERVER, 'initial_level': settings.INITIAL_LEVEL, + 'primary_color': settings.PRIMARY_COLOR, 'initial_bounds': json.dumps(initial_bounds, separators=(',', ':')) if initial_bounds else None, 'last_site_update': json.dumps(SiteUpdate.last_update()), 'ssids': json.dumps(settings.WIFI_SSIDS, separators=(',', ':')) if settings.WIFI_SSIDS else None,