X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5913c54d19b8f6775633176032161d49f9b2f1aa..56145861cf5fa01c5fbb429d40242e0a16189ed1:/src/redakcja/settings/common.py

diff --git a/src/redakcja/settings/common.py b/src/redakcja/settings/common.py
index 6c53d446..fd870ab8 100644
--- a/src/redakcja/settings/common.py
+++ b/src/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
 
@@ -54,21 +53,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',
+        'APP_DIRS': True,
+        'DIRS': [
+            PROJECT_ROOT + '/templates',
+        ],
+        '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',
@@ -80,7 +83,7 @@ MIDDLEWARE_CLASSES = (
     'django_cas.middleware.CASMiddleware',
 
     'django.contrib.admindocs.middleware.XViewMiddleware',
-    'pagination.middleware.PaginationMiddleware',
+    'fnp_django_pagination.middleware.PaginationMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
 )
 
@@ -91,10 +94,6 @@ AUTHENTICATION_BACKENDS = (
 
 ROOT_URLCONF = 'redakcja.urls'
 
-TEMPLATE_DIRS = (
-    PROJECT_ROOT + '/templates',
-)
-
 FIREPYTHON_LOGGER_NAME = "fnp"
 
 INSTALLED_APPS = (
@@ -106,12 +105,10 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'django.contrib.comments',
     'raven.contrib.django.raven_compat',
 
-    'south',
     'sorl.thumbnail',
-    'pagination',
+    'fnp_django_pagination',
     'django_gravatar',
     'fileupload',
     'kombu.transport.django',
@@ -133,8 +130,6 @@ LOGIN_REDIRECT_URL = '/documents/user'
 CAS_USER_ATTRS_MAP = {
     'email': 'email', 'firstname': 'first_name', 'lastname': 'last_name'}
 
-# REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
-
 IMAGE_DIR = 'images/'