fix thumbnail issues + some cleanup

[redakcja.git] / redakcja / settings / common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 2989c1b..52752cd 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -5,7 +5,6 @@ import os.path
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 
 DEBUG = False
-TEMPLATE_DEBUG = DEBUG
 
 MAINTENANCE_MODE = False
 
@@ -26,8 +25,8 @@ TIME_ZONE = 'Europe/Warsaw'
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en'
 
-#import locale
-#locale.setlocale(locale.LC_ALL, '')
+# import locale
+# locale.setlocale(locale.LC_ALL, '')
 
 SITE_ID = 1
 
@@ -61,21 +60,25 @@ STATIC_URL = '/media/static/'
 
 SESSION_COOKIE_NAME = "redakcja_sessionid"
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "redakcja.context_processors.settings", # this is instead of media
-    'django.core.context_processors.csrf',
-    "django.core.context_processors.request",
-)
-
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(PROJECT_ROOT, 'templates'),
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.debug",
+                "django.template.context_processors.i18n",
+                "redakcja.context_processors.settings",  # this is instead of media
+                'django.template.context_processors.csrf',
+                "django.template.context_processors.request",
+            ],
+        },
+    },
+]
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
@@ -85,25 +88,21 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.locale.LocaleMiddleware',
 
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    #'django_cas.middleware.CASMiddleware',
+    # 'django_cas.middleware.CASMiddleware',
 
     'django.contrib.admindocs.middleware.XViewMiddleware',
-    'pagination.middleware.PaginationMiddleware',
-    #'maintenancemode.middleware.MaintenanceModeMiddleware',
+    'fnp_django_pagination.middleware.PaginationMiddleware',
+    # 'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
 )
 
-#AUTHENTICATION_BACKENDS = (
-#    'django.contrib.auth.backends.ModelBackend',
-#    'fnpdjango.auth_backends.AttrCASBackend',
-#)
+# AUTHENTICATION_BACKENDS = (
+#     'django.contrib.auth.backends.ModelBackend',
+#     'fnpdjango.auth_backends.AttrCASBackend',
+# )
 
 ROOT_URLCONF = 'redakcja.urls'
 
-TEMPLATE_DIRS = (
-    PROJECT_ROOT + '/templates',
-)
-
 FIREPYTHON_LOGGER_NAME = "fnp"
 
 INSTALLED_APPS = (
@@ -116,25 +115,29 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.flatpages',
-    #'django.contrib.comments',
+    # 'django.contrib.comments',
 
-    #'south',
+    # 'south',
     'sorl.thumbnail',
-    'pagination',
-    #'gravatar',
-    #'kombu.transport.django',
+    'fnp_django_pagination',
+    # 'gravatar',
+    # 'kombu.transport.django',
     'fileupload',
     'pipeline',
+    'modeltranslation',
+    'constance',
+    'constance.backends.database',
 
     'catalogue',
-    'cover',
+    # 'cover',
     'dvcs',
     'organizations',
     'wiki',
-    #'toolbar',
-    #'apiclient',
+    # 'toolbar',
+    # 'apiclient',
     'email_mangler',
     'build',
+    'attachments',
 
     'django_forms_bootstrap',
     'forms_builder.forms',
@@ -143,16 +146,16 @@ INSTALLED_APPS = (
 
 LOGIN_REDIRECT_URL = '/'
 
-#CAS_USER_ATTRS_MAP = {
-#    'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}
+# CAS_USER_ATTRS_MAP = {
+#     'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}
 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 
 IMAGE_DIR = 'images/'
 
 
-#import djcelery
-#djcelery.setup_loader()
+# import djcelery
+# djcelery.setup_loader()
 
 BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
 BROKER_HOST = "localhost"
@@ -168,9 +171,7 @@ FORMS_BUILDER_EDITABLE_SLUGS = True
 FORMS_BUILDER_LABEL_MAX_LENGTH = 2048
 
 
-
 try:
     from redakcja.settings.compress import *
 except ImportError:
     pass
-