add contrib locale to make-locale-pack, various bugfixes

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 8ee4e43..ab74294 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -92,6 +92,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',
     'search.context_processors.search_form',
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',
     'search.context_processors.search_form',

+    "allauth.context_processors.allauth",
+    "allauth.account.context_processors.account",

 )
 
 MIDDLEWARE_CLASSES = [
 )
 
 MIDDLEWARE_CLASSES = [


@@ -106,6 +108,7 @@ MIDDLEWARE_CLASSES = [
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',

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

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


@@ -114,7 +117,13 @@ TEMPLATE_DIRS = [
     path.join(PROJECT_DIR, 'templates'),
 ]
 
     path.join(PROJECT_DIR, 'templates'),
 ]
 

-LOGIN_URL = '/uzytkownicy/zaloguj/'
+
+AUTHENTICATION_BACKENDS = [
+    'django.contrib.auth.backends.ModelBackend',
+    'allauth.account.auth_backends.AuthenticationBackend',
+]
+EMAIL_CONFIRMATION_DAYS = 2
+LOGIN_URL = '/uzytkownik/login/'

 
 LOGIN_REDIRECT_URL = '/'
 
 
 LOGIN_REDIRECT_URL = '/'
 


@@ -129,13 +138,23 @@ INSTALLED_APPS = [
     'pagination',
     'piston',
     'piwik.django',
     'pagination',
     'piston',
     'piwik.django',

-    'rosetta',
+    #'rosetta',

     'south',
     'sorl.thumbnail',
     'djcelery',
     'djkombu',
     #    'django_nose',
 
     'south',
     'sorl.thumbnail',
     'djcelery',
     'djkombu',
     #    'django_nose',
 

+    #allauth stuff
+    'emailconfirmation',
+    'uni_form',
+    'allauth',
+    'allauth.account',
+    'allauth.socialaccount',
+    'allauth.openid',
+    #'allauth.facebook',
+    #'allauth.twitter',
+

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


@@ -201,6 +220,7 @@ COMPRESS_CSS = {
             'css/catalogue.css',
             'css/sponsors.css',
             'css/logo.css',
             'css/catalogue.css',
             'css/sponsors.css',
             'css/logo.css',

+            'css/auth.css',

 
             'css/social/shelf_tags.css',
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 
             'css/social/shelf_tags.css',
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',


@@ -209,7 +229,7 @@ COMPRESS_CSS = {
     },
     'screen': {
         'source_filenames': ['css/screen.css'],
     },
     'screen': {
         'source_filenames': ['css/screen.css'],

-        'output_filename': ['css/screen.min?.css'],
+        'output_filename': 'css/screen.min?.css',

         'extra_context': {
             'media': 'screen and (min-width: 800px)',
         },
         'extra_context': {
             'media': 'screen and (min-width: 800px)',
         },


@@ -286,17 +306,6 @@ COMPRESS_VERSION = True
 COMPRESS_CSS_FILTERS = None
 
 THUMBNAIL_QUALITY = 95
 COMPRESS_CSS_FILTERS = None
 
 THUMBNAIL_QUALITY = 95

-THUMBNAIL_EXTENSION = 'png'
-
-THUMBNAIL_PROCESSORS = (
-    # Default processors
-    'sorl.thumbnail.processors.colorspace',
-    'sorl.thumbnail.processors.autocrop',
-    'sorl.thumbnail.processors.scale_and_crop',
-    'sorl.thumbnail.processors.filters',
-    # Custom processors
-    'sponsors.processors.add_padding',
-)

 
 TRANSLATION_REGISTRY = "wolnelektury.translation"
 
 
 TRANSLATION_REGISTRY = "wolnelektury.translation"
 


@@ -334,6 +343,10 @@ BROKER_VHOST = "/"
 
 CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
 
 
 CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
 

+LOCALE_PATHS = [
+    path.join(PROJECT_DIR, '../locale-contrib')
+]
+

 # Load localsettings, if they exist
 try:
     from localsettings import *
 # Load localsettings, if they exist
 try:
     from localsettings import *