switch thumbnail system from homegrown to sorl-thumbnail

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index 857cc071d7db1dfd27e2cc0f0581dc6c762c3d95..2e72faa735b15ba42fd3a820bcdaa8e99b22cf65 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -7,7 +7,7 @@ import django.conf.global_settings as DEFAULT_SETTINGS
 
 DEBUG = True  # Turn off for production
 TEMPLATE_DEBUG = DEBUG
-DEBUG_TOOLBAR = True
+DEBUG_TOOLBAR = False
 
 PROJECT_DIR = os.path.normpath(os.path.dirname(os.path.dirname(__file__)))
 ADMINS = (
@@ -43,10 +43,11 @@ TIME_ZONE = 'Europe/Brussels'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'fr-be'
 
 LANGUAGES = (
   ('fr', u'Français'),
+  ('en', u'English'),
 )
 
 SITE_ID = 1
@@ -55,6 +56,8 @@ SITE_ID = 1
 # to load the internationalization machinery.
 USE_I18N = True
 
+LOCALE_PATHS = (os.path.join(PROJECT_DIR, 'panikweb', 'locale'),)
+
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media')
@@ -101,15 +104,17 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
+    'django.middleware.cache.UpdateCacheMiddleware',
+    #'django.middleware.gzip.GZipMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'fiber.middleware.ObfuscateEmailAddressMiddleware',
-    'fiber.middleware.AdminPageMiddleware',
     #'request.middleware.RequestMiddleware',
+    'panikweb.middleware.StripPiwikCookieMiddleware',
+    'django.middleware.cache.FetchFromCacheMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
@@ -134,17 +139,21 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'south',
+    'haystack',
     'taggit',
     'panikweb_templates',
     'panikweb.paniktags',
     'mptt',
     'compressor',
-    'fiber',
+    'sorl.thumbnail',
     'jquery',
     'ckeditor',
     'emissions',
     'newsletter',
+    'nonstop',
+    'combo.data',
+    'combo.public',
+    'panikombo',
 )
 
 CKEDITOR_UPLOAD_PATH = os.path.join(MEDIA_ROOT, 'uploads')
@@ -153,7 +162,7 @@ CKEDITOR_UPLOAD_PREFIX = '/media/uploads/'
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
-        'URL': 'http://127.0.0.1:8983/solr/panik'
+        'URL': 'http://127.0.0.1:8985/solr/panik'
     },
 }
 
@@ -161,6 +170,68 @@ FIBER_TEMPLATE_CHOICES = (
     ('tpl-default.html', 'Default template'),
 )
 
+ENABLE_PIWIK = False
+
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+    },
+}
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'filters': {
+        'require_debug_false': {
+            '()': 'django.utils.log.RequireDebugFalse'
+        }
+    },
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'filters': ['require_debug_false'],
+            'class': 'django.utils.log.AdminEmailHandler'
+        }
+    },
+    'loggers': {
+        'django.request': {
+            'handlers': ['mail_admins'],
+            'level': 'ERROR',
+            'propagate': True,
+        },
+    }
+}
+
+STATSD_CLIENT = 'django_statsd.clients.null'
+
+RAVEN_CONFIG = None
+
+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.sql.SQLDebugPanel',
+    'debug_toolbar.panels.template.TemplateDebugPanel',
+    'debug_toolbar.panels.signals.SignalDebugPanel',
+    'debug_toolbar.panels.logger.LoggingPanel',
+)
+
+COMBO_PUBLIC_TEMPLATES = {
+    'standard': {
+        'name': 'Standard',
+        'template': 'combo/page_template.html',
+        'placeholders': {
+            'content': {
+                'name': 'Content',
+            },
+        }
+    },
+}
+
+LANGUAGE_COOKIE_NAME = 'panikweb_language'
+
 try:
     from local_settings import *
 except ImportError, e:
@@ -173,8 +244,24 @@ if DEBUG and DEBUG_TOOLBAR:
     INSTALLED_APPS += (
         'debug_toolbar',
     )
-    DEBUG_TOOLBAR_CONFIG = {
-        'INTERCEPT_REDIRECTS': False,
-    }
 
+    if 'template_timings_panel.panels.TemplateTimings.TemplateTimings' in DEBUG_TOOLBAR_PANELS:
+        INSTALLED_APPS += ('template_timings_panel',)
 
+if ENABLE_PIWIK is False:
+    MIDDLEWARE_CLASSES = tuple([x for x in MIDDLEWARE_CLASSES \
+                                if x != 'panikweb.middleware.StripPiwikCookieMiddleware'])
+
+if STATSD_CLIENT != 'django_statsd.clients.null':
+    MIDDLEWARE_CLASSES = (
+            'django_statsd.middleware.GraphiteRequestTimingMiddleware',
+            'django_statsd.middleware.GraphiteMiddleware',
+    ) + MIDDLEWARE_CLASSES
+    INSTALLED_APPS += (
+        'django_statsd',
+    )
+
+if RAVEN_CONFIG:
+    INSTALLED_APPS += (
+        'raven.contrib.django.raven_compat',
+    )