X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8d1372958ce4a205f11fcdd44cf6e9cac8429a69..0e9ce396fab5cdfc2f1806bae43f05de77cb1e21:/wolnelektury/settings/__init__.py

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index d8e55374c..58fbc4225 100644
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -2,14 +2,14 @@
 # Django settings for wolnelektury project.
 from os import path
 
-from settings.basic import *
-from settings.auth import *
-from settings.cache import *
-from settings.celery import *
-from settings.contrib import *
-from settings.custom import *
-from settings.locale import *
-from settings.static import *
+from .basic import *
+from .auth import *
+from .cache import *
+from .celery import *
+from .contrib import *
+from .custom import *
+from .locale import *
+from .static import *
 
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -20,25 +20,23 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'wolnelektury_core.context_processors.extra_settings',
     'search.context_processors.search_form',
-    "allauth.context_processors.allauth",
+
     "allauth.account.context_processors.account",
+    "allauth.socialaccount.context_processors.socialaccount",
 )
 
 MIDDLEWARE_CLASSES = [
-    'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.doc.XViewMiddleware',
+    'django.contrib.admindocs.middleware.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'django.middleware.locale.LocaleMiddleware',
-    'piwik.django.middleware.PiwikMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
-    'django.middleware.cache.FetchFromCacheMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'realip_middleware.SetRemoteAddrFromXRealIP',
+    'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
@@ -67,9 +65,18 @@ INSTALLED_APPS_OUR = [
     'search',
     'oai',
     'funding',
+    'polls',
+    'libraries',
     ]
 
+GETPAID_BACKENDS = (
+    'getpaid.backends.payu',
+)
+
 INSTALLED_APPS_CONTRIB = [
+    # Should be before django.contrib.admin
+    'modeltranslation',
+
     # external
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -81,34 +88,31 @@ INSTALLED_APPS_CONTRIB = [
     'pagination',
     'pipeline',
     'piston',
-    'piwik.django',
+    'piwik',
     #'rosetta',
-    'south',
+    #'south',
     'sorl.thumbnail',
-    'djcelery',
-    'djkombu',
+    'kombu.transport.django',
     'honeypot',
     #'django_nose',
+    'fnpdjango',
+    'getpaid',
+    'getpaid.backends.payu',
 
     #allauth stuff
-    'emailconfirmation',
     'uni_form',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
-    'allauth.openid',
-    #'allauth.facebook',
-    #'allauth.twitter',
-
-    # included
-    'modeltranslation',
+    'allauth.socialaccount.providers.openid',
+    'allauth.socialaccount.providers.facebook',
+    #'allauth.socialaccount.providers.twitter',
     ]
 
 INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB
 
 # Load localsettings, if they exist
 try:
-    from localsettings import *
+    from wolnelektury.localsettings import *
 except ImportError:
     pass
-