reorganize top menu

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

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index c32b6ad..cad0951 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -5,12 +5,11 @@ import os.path
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 
 DEBUG = False
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
 
 DEBUG = False

-TEMPLATE_DEBUG = DEBUG

 
 MAINTENANCE_MODE = False
 
 ADMINS = (
 
 MAINTENANCE_MODE = False
 
 ADMINS = (

-    (u'Radek Czajka', 'radoslaw.czajka@nowoczesnapolska.org.pl'),
+    (u'Jan Szejko', 'jan.szejko@nowoczesnapolska.org.pl'),

 )
 
 MANAGERS = ADMINS
 )
 
 MANAGERS = ADMINS


@@ -61,21 +60,25 @@ STATIC_URL = '/media/static/'
 
 SESSION_COOKIE_NAME = "redakcja_sessionid"
 
 
 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',
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',


@@ -88,7 +91,7 @@ MIDDLEWARE_CLASSES = (
     # 'django_cas.middleware.CASMiddleware',
 
     'django.contrib.admindocs.middleware.XViewMiddleware',
     # 'django_cas.middleware.CASMiddleware',
 
     'django.contrib.admindocs.middleware.XViewMiddleware',

-    'pagination.middleware.PaginationMiddleware',
+    'fnp_django_pagination.middleware.PaginationMiddleware',

     # 'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
 )
     # 'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
 )


@@ -100,10 +103,6 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'redakcja.urls'
 
 
 ROOT_URLCONF = 'redakcja.urls'
 

-TEMPLATE_DIRS = (
-    PROJECT_ROOT + '/templates',
-)
-

 FIREPYTHON_LOGGER_NAME = "fnp"
 
 INSTALLED_APPS = (
 FIREPYTHON_LOGGER_NAME = "fnp"
 
 INSTALLED_APPS = (


@@ -120,12 +119,14 @@ INSTALLED_APPS = (
 
     # 'south',
     'sorl.thumbnail',
 
     # 'south',
     'sorl.thumbnail',

-    'pagination',
+    'fnp_django_pagination',

     # 'gravatar',
     # 'kombu.transport.django',
     'fileupload',
     'pipeline',
     'modeltranslation',
     # 'gravatar',
     # 'kombu.transport.django',
     'fileupload',
     'pipeline',
     'modeltranslation',

+    'constance',
+    'constance.backends.database',

 
     'catalogue',
     # 'cover',
 
     'catalogue',
     # 'cover',