diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-27 15:25:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-27 15:29:18 +0200 |
| commit | 179b5f1cce257bae1a2f6e82a2b81beeb142236e (patch) | |
| tree | d94edbdda9ed9d59821993611f3f2032e89e7e88 /settings.py | |
| parent | 8c36740618708b8bfb513db29d4b9b0c72c6e100 (diff) | |
| download | Chimère - projet Saclay-179b5f1cce257bae1a2f6e82a2b81beeb142236e.tar.bz2 Chimère - projet Saclay-179b5f1cce257bae1a2f6e82a2b81beeb142236e.zip | |
Add embeded version of JQuery
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 f636283..371edc1 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"] @@ -294,6 +292,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(): |