diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-05 18:10:05 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-05 18:10:05 +0200 |
| commit | 4268fe123c1450b01aa64b29f8c8a68a9ffba5d9 (patch) | |
| tree | 099baae1a0522c3cc25d3d20a24dd8380f8413b3 /settings.py | |
| parent | f98128ac47b0640d559432e61e5bffa83c02dd00 (diff) | |
| parent | 2c46821d582846bd86cfe0d08a6b110cf765bc11 (diff) | |
| download | Chimère-4268fe123c1450b01aa64b29f8c8a68a9ffba5d9.tar.bz2 Chimère-4268fe123c1450b01aa64b29f8c8a68a9ffba5d9.zip | |
Merge branch 'v2.9'
Conflicts:
chimere/static/chimere/js/jquery.chimere.js
chimere/templates/chimere/blocks/head_chimere.html
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/settings.py b/settings.py index a65a1b1..39e7ceb 100644 --- a/settings.py +++ b/settings.py @@ -345,16 +345,6 @@ if 'CHIMERE_SHARE_NETWORKS' not in globals(): STATIC_URL + 'chimere/img/twitter.png'), ) -if 'MAP_CSS_URLS' not in globals(): - global MAP_CSS_URLS - MAP_CSS_URLS = [STATIC_URL + "ol3/ol.css"] - -if 'MAP_JS_URLS' not in globals(): - global MAP_JS_URLS - if DEBUG: - MAP_JS_URLS = [STATIC_URL + "ol3/ol-debug.js"] - else: - MAP_JS_URLS = [STATIC_URL + "ol3/ol.js"] if 'OSM_MOBILE_JS_URLS' not in globals(): global OSM_MOBILE_URLS OSM_JS_MOBILE_URLS = [ |