form for #cojaczytam

[wolnelektury.git] / src / wolnelektury / settings / __init__.py

diff --git a/src/wolnelektury/settings/__init__.py b/src/wolnelektury/settings/__init__.py
index 6b0c171..b57ca55 100644 (file)
--- a/src/wolnelektury/settings/__init__.py
+++ b/src/wolnelektury/settings/__init__.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Django settings for wolnelektury project.
 # -*- coding: utf-8 -*-
 # Django settings for wolnelektury project.

-from os import path
-

 from .basic import *
 from .auth import *
 from .cache import *
 from .basic import *
 from .auth import *
 from .cache import *


@@ -10,18 +8,9 @@ from .contrib import *
 from .custom import *
 from .locale import *
 from .static import *
 from .custom import *
 from .locale import *
 from .static import *

+from .paths import *

 
 
 
 

-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.contrib.auth.context_processors.auth',
-    'django.core.context_processors.debug',
-    'django.core.context_processors.i18n',
-    'django.core.context_processors.media',
-    'django.core.context_processors.request',
-    'wolnelektury.context_processors.extra_settings',
-    'search.context_processors.search_form',
-)
-

 MIDDLEWARE_CLASSES = [
     'django.middleware.csrf.CsrfViewMiddleware',
     'ssify.middleware.SsiMiddleware',
 MIDDLEWARE_CLASSES = [
     'django.middleware.csrf.CsrfViewMiddleware',
     'ssify.middleware.SsiMiddleware',


@@ -31,7 +20,7 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.admindocs.middleware.XViewMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.admindocs.middleware.XViewMiddleware',

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

     'ssify.middleware.LocaleMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'ssify.middleware.LocaleMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',


@@ -68,7 +57,11 @@ INSTALLED_APPS_OUR = [
     'funding',
     'polls',
     'libraries',
     'funding',
     'polls',
     'libraries',

-    ]
+    'newsletter',
+    'contact',
+    'isbn',
+    'paypal',
+]

 
 GETPAID_BACKENDS = (
     'getpaid.backends.payu',
 
 GETPAID_BACKENDS = (
     'getpaid.backends.payu',


@@ -86,7 +79,7 @@ INSTALLED_APPS_CONTRIB = [
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.staticfiles',

-    'pagination',
+    'fnp_django_pagination',

     'pipeline',
     'piston',
     'piwik',
     'pipeline',
     'piston',
     'piwik',


@@ -98,15 +91,21 @@ INSTALLED_APPS_CONTRIB = [
     'getpaid.backends.payu',
     'ssify',
     'django_extensions',
     'getpaid.backends.payu',
     'ssify',
     'django_extensions',

+    'raven.contrib.django.raven_compat',
+
+    'migdal',
+    'django_comments',
+    'django_comments_xtd',

 
 

-    #allauth stuff
+    # allauth stuff

     'uni_form',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
     'allauth.socialaccount.providers.openid',
     'allauth.socialaccount.providers.facebook',
     'uni_form',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
     'allauth.socialaccount.providers.openid',
     'allauth.socialaccount.providers.facebook',

-    #'allauth.socialaccount.providers.twitter',
+    'allauth.socialaccount.providers.google',
+    # 'allauth.socialaccount.providers.twitter',

     ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB
     ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB