diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-10 20:47:32 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-10 20:47:32 +0200 |
| commit | 32e867071cee00c6d5cfaa9a6e27cad2256cde32 (patch) | |
| tree | 305fbd2d5b8b05bb0366aa1290b34586bd03277c | |
| parent | 019ee28fd9e51bed25b5a5a52640d73fb151273e (diff) | |
| download | Chimère - projet de référence-32e867071cee00c6d5cfaa9a6e27cad2256cde32.tar.bz2 Chimère - projet de référence-32e867071cee00c6d5cfaa9a6e27cad2256cde32.zip | |
settings adaptation for v3
| -rw-r--r-- | local_settings.py.pip.sample | 18 | ||||
| -rw-r--r-- | local_settings.py.sample | 6 | ||||
| -rw-r--r-- | settings.py | 2 |
3 files changed, 14 insertions, 12 deletions
diff --git a/local_settings.py.pip.sample b/local_settings.py.pip.sample index e88acec..747427f 100644 --- a/local_settings.py.pip.sample +++ b/local_settings.py.pip.sample @@ -3,13 +3,12 @@ # rename this file to local_settings.py and overload settings in this file -import os ROOT_URLCONF = 'chimere_example_project.urls' STATIC_URL = '/static/' -CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL +CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL CHIMERE_OSM_USER = 'osm_user' CHIMERE_OSM_PASSWORD = 'osm_pass' @@ -33,10 +32,11 @@ DATABASES = { }, } -INSTALLED_APPS += ['django_extensions', - 'tinymce'] - -TINYMCE_URL = '%stiny_mce/' % STATIC_URL -JQUERY_JS_URLS = ('%sjquery/jquery.js' % STATIC_URL, - 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js') -JQUERY_CSS_URLS = ('https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css') +# if you want to use tinymce provide an URL or a relative path to find it +TINYMCE_URL = '' +JQUERY_JS_URLS = ( + '%sjquery/jquery.js' % STATIC_URL, + 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js') +JQUERY_CSS_URLS = ( + 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/' + 'base/jquery-ui.css',) diff --git a/local_settings.py.sample b/local_settings.py.sample index 0d3252d..33a4989 100644 --- a/local_settings.py.sample +++ b/local_settings.py.sample @@ -3,16 +3,18 @@ # rename this file to local_settings.py and overload settings in this file -import os ROOT_URLCONF = 'chimere_example_project.urls' STATIC_URL = '/static/' -CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL +CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL CHIMERE_OSM_USER = 'osm_user' CHIMERE_OSM_PASSWORD = 'osm_pass' +# if you want to use tinymce provide an URL or a relative path to find it +TINYMCE_URL = '' + # Make this string unique, and don't share it with anybody. SECRET_KEY = '' diff --git a/settings.py b/settings.py index 625dbab..5cad529 100644 --- a/settings.py +++ b/settings.py @@ -25,7 +25,7 @@ STATICFILES_DIRS = ( os.path.join(ROOT_PATH, "chimere_example_static"), ) -TINYMCE_URL = '/tinymce/' +TINYMCE_URL = '' JQUERY_JS_URLS = ('/javascript/jquery/jquery.js', '/javascript/jquery-ui/jquery-ui.js',) JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css', |