diff options
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/settings.py b/settings.py index ddd06fc..8806929 100644 --- a/settings.py +++ b/settings.py @@ -25,7 +25,7 @@ STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' STATICFILES_DIRS = ( - os.path.join(ROOT_PATH, "chimere_example_static"), + os.path.join(ROOT_PATH, "saclay_static"), ) TINYMCE_URL = '' @@ -161,9 +161,9 @@ CHIMERE_MODIF_EMAIL = _(u"Hello, I would like to propose you a modification " u"about this item: ") CHIMERE_ROUTING_WARN_MESSAGE = "<h3 class='warn'>Attention</h3>"\ - "<p>Cet itineraire comporte des passages dangereux, nous vous conseillons"\ + "<p>Cet itinéraire comporte des passages dangereux, nous vous conseillons"\ " de modifier votre recherche, en ajoutant par exemple un ou des points "\ - "d'etape à votre parcours pour eviter les zones de danger.</p>" + "d'étape à votre parcours pour éviter les zones de danger.</p>" CHIMERE_CSV_ENCODING = 'ISO-8859-1' @@ -228,7 +228,7 @@ MIDDLEWARE_CLASSES = [ 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.middleware.doc.XViewMiddleware', + 'django.contrib.admindocs.middleware.XViewMiddleware', 'django.contrib.messages.middleware.MessageMiddleware' ] @@ -270,7 +270,6 @@ except ImportError: pass INSTALLED_APPS += [ - 'south', 'chimere', ] @@ -280,11 +279,11 @@ MOBILE_DOMAINS = [] # if you have specific domains for mobile access try: from local_settings import * -except ImportError, e: - print 'Unable to load local_settings.py:', e +except ImportError as e: + print('Unable to load local_settings.py:', e) if CHIMERE_SEARCH_ENGINE: - INSTALLED_APPS.insert(INSTALLED_APPS.index('south'), 'haystack') + INSTALLED_APPS.append('haystack') if 'LOGGING' not in globals(): global LOGGING @@ -368,17 +367,20 @@ if DEBUG_TOOLBAR: global DEBUG_TOOLBAR_CONFIG MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware'] INSTALLED_APPS += ['debug_toolbar'] - DEBUG_TOOLBAR_PANELS = ( - 'debug_toolbar.panels.version.VersionDebugPanel', - 'debug_toolbar.panels.timer.TimerDebugPanel', - 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', - 'debug_toolbar.panels.headers.HeaderDebugPanel', - 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', - 'debug_toolbar.panels.template.TemplateDebugPanel', - 'debug_toolbar.panels.sql.SQLDebugPanel', - 'debug_toolbar.panels.signals.SignalDebugPanel', - 'debug_toolbar.panels.logger.LoggingPanel', - ) + DEBUG_TOOLBAR_PANELS = [ + 'debug_toolbar.panels.versions.VersionsPanel', + 'debug_toolbar.panels.timer.TimerPanel', + 'debug_toolbar.panels.settings.SettingsPanel', + 'debug_toolbar.panels.headers.HeadersPanel', + 'debug_toolbar.panels.request.RequestPanel', + 'debug_toolbar.panels.sql.SQLPanel', + 'debug_toolbar.panels.staticfiles.StaticFilesPanel', + 'debug_toolbar.panels.templates.TemplatesPanel', + 'debug_toolbar.panels.cache.CachePanel', + 'debug_toolbar.panels.signals.SignalsPanel', + 'debug_toolbar.panels.logging.LoggingPanel', + 'debug_toolbar.panels.redirects.RedirectsPanel', + ] DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS': False} |