summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-04-03 16:34:43 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-04-03 16:34:43 +0200
commit5140a7ad602e246f8bf2449220ef5bc9d64436d6 (patch)
tree32df2c6af292ec5c88492e6dce3e9b2ced4b59d3
parent31f9b9de92dfe30cb2902727e32927a596a41d11 (diff)
downloadChimère - projet de référence-5140a7ad602e246f8bf2449220ef5bc9d64436d6.tar.bz2
Chimère - projet de référence-5140a7ad602e246f8bf2449220ef5bc9d64436d6.zip
Allow conditions for CSS urls.
-rw-r--r--settings.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/settings.py b/settings.py
index 2e5ad40..391c6e5 100644
--- a/settings.py
+++ b/settings.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')
]
}