diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-27 15:30:04 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-27 15:30:04 +0200 |
| commit | 52425fe3d25211a6b59cd2460cc88716903e710d (patch) | |
| tree | 4d2a4abfd58c1a1d8a16532a4306ea0b1020c015 /settings.py | |
| parent | e4f6086e527a3b159e7a21c376dc23e0368bfbab (diff) | |
| parent | 179b5f1cce257bae1a2f6e82a2b81beeb142236e (diff) | |
| download | Chimère - projet Saclay-52425fe3d25211a6b59cd2460cc88716903e710d.tar.bz2 Chimère - projet Saclay-52425fe3d25211a6b59cd2460cc88716903e710d.zip | |
Merge branch 'master' into saclay
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/settings.py b/settings.py index b86c620..f84e7db 100644 --- a/settings.py +++ b/settings.py @@ -23,10 +23,8 @@ STATIC_ROOT = ROOT_PATH + 'static/' TINYMCE_URL = '/tinymce/' EXTRA_CSS = [] -JQUERY_JS_URLS = ('/javascript/jquery/jquery.js', - '/javascript/jquery-ui/jquery-ui.js',) -JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css', - '/javascript/jquery-ui-themes/base/jquery.ui.all.css') +JQUERY_JS_URLS = [] +JQUERY_CSS_URLS = [] OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"] @@ -293,6 +291,15 @@ except ImportError, e: if DJANGO_EXTENSIONS: INSTALLED_APPS.append('django_extensions') +if not JQUERY_JS_URLS: + JQUERY_JS_URLS = (STATIC_URL + 'jquery/jquery.min.js', + STATIC_URL + 'jquery-ui/jquery-ui.min.js') + +if not JQUERY_CSS_URLS: + JQUERY_CSS_URLS = (STATIC_URL + 'jquery-ui/smoothness/jquery-ui.css', + STATIC_URL + 'jquery-ui/base/jquery.ui.all.css') + + LOGGING['handlers']['logfile']['filename'] = LOGFILENAME if 'CHIMERE_SHARE_NETWORKS' not in globals(): |