diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-03 16:30:13 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-03 16:30:13 +0200 |
commit | e3dd113da11a69f2107e6ac7fc5998626a23a2cc (patch) | |
tree | 3da0560ae689b607f4e34d3bc57387af1f41f643 /chimere/settings.sample.py | |
parent | a204849cb48d8acdaebeac484235c3a91fba00e6 (diff) | |
download | Chimère-e3dd113da11a69f2107e6ac7fc5998626a23a2cc.tar.bz2 Chimère-e3dd113da11a69f2107e6ac7fc5998626a23a2cc.zip |
First work on Leaflet script
* manage markers from a GeoJson source with custom icon
Diffstat (limited to 'chimere/settings.sample.py')
-rw-r--r-- | chimere/settings.sample.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chimere/settings.sample.py b/chimere/settings.sample.py index 2e5ad40..391c6e5 100644 --- a/chimere/settings.sample.py +++ b/chimere/settings.sample.py @@ -290,7 +290,8 @@ if 'MAP_JS_URLS' not in globals(): STATIC_URL + "openlayers/OpenLayers.js", STATIC_URL + "openlayers/SimplePanZoom.js", "http://www.openstreetmap.org/openlayers/OpenStreetMap.js", - STATIC_URL + "chimere/js/jquery.chimere-ol.js"], + STATIC_URL + "chimere/js/jquery.chimere-ol.js" + ], 'leaflet':[ STATIC_URL + "leaflet/leaflet.js", STATIC_URL + "chimere/js/jquery.chimere-leaflet.js" @@ -299,11 +300,13 @@ if 'MAP_JS_URLS' not in globals(): if 'MAP_CSS_URLS' not in globals(): global MAP_CSS_URLS + # key: [(url, condition)] MAP_CSS_URLS = { - 'openlayers':["http://www.openlayers.org/api/theme/default/style.css"], + 'openlayers':[("http://www.openlayers.org/api/theme/default/style.css", + None)], 'leaflet':[ - STATIC_URL + "leaflet/leaflet.css", - STATIC_URL + "leaflet/leaflet.ie.css" + (STATIC_URL + "leaflet/leaflet.css", None), + (STATIC_URL + "leaflet/leaflet.ie.css", 'lte IE 8') ] } |