Disallow link on book tags to avoid confusion.

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

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index f2314a9..caec10b 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -2,14 +2,14 @@
 # Django settings for wolnelektury project.
 from os import path
 
 # 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 = (
 
 
 TEMPLATE_CONTEXT_PROCESSORS = (


@@ -20,12 +20,12 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'wolnelektury_core.context_processors.extra_settings',
     'search.context_processors.search_form',
     '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.account.context_processors.account",

+    "allauth.socialaccount.context_processors.socialaccount",

 )
 
 MIDDLEWARE_CLASSES = [
 )
 
 MIDDLEWARE_CLASSES = [

-    'django.middleware.cache.UpdateCacheMiddleware',

     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',


@@ -36,8 +36,8 @@ MIDDLEWARE_CLASSES = [
     'piwik.django.middleware.PiwikMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'piwik.django.middleware.PiwikMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',

-    'django.middleware.cache.FetchFromCacheMiddleware',

     'django.contrib.messages.middleware.MessageMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',

+    'fnpdjango.middleware.SetRemoteAddrFromXRealIP',

 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'


@@ -63,6 +63,9 @@ INSTALLED_APPS_OUR = [
     'picture',
     'social',
     'waiter',
     'picture',
     'social',
     'waiter',

+    'search',
+    'oai',
+    'libraries',

     ]
 
 INSTALLED_APPS_CONTRIB = [
     ]
 
 INSTALLED_APPS_CONTRIB = [


@@ -84,17 +87,16 @@ INSTALLED_APPS_CONTRIB = [
     'djcelery',
     'djkombu',
     'honeypot',
     'djcelery',
     'djkombu',
     'honeypot',

-    #    'django_nose',
+    #'django_nose',

 
     #allauth stuff
 
     #allauth stuff

-    'emailconfirmation',

     'uni_form',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
     'uni_form',
     'allauth',
     'allauth.account',
     'allauth.socialaccount',

-    'allauth.openid',
-    #'allauth.facebook',
-    #'allauth.twitter',
+    'allauth.socialaccount.providers.openid',
+    'allauth.socialaccount.providers.facebook',
+    #'allauth.socialaccount.providers.twitter',

 
     # included
     'modeltranslation',
 
     # included
     'modeltranslation',


@@ -104,7 +106,6 @@ INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB
 
 # Load localsettings, if they exist
 try:
 
 # Load localsettings, if they exist
 try:

-    from localsettings import *
+    from wolnelektury.localsettings import *

 except ImportError:
     pass
 except ImportError:
     pass

-