X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f43bad97b17e376293c0a72e9c1726733fc285fa..88e2c2cae610d479e1b2f82a3d0f19c00e5fb97d:/wolnelektury/settings.py?ds=sidebyside diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index f69ba2e2e..3f842e7a9 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -47,6 +47,8 @@ LANGUAGES = tuple(sorted([ ('ru', u'русский'), ('es', u'español'), ('uk', u'українська'), + ('jp', u'日本語'), + ('it', u'italiano'), ], key=lambda x: x[0])) @@ -90,6 +92,8 @@ TEMPLATE_CONTEXT_PROCESSORS = ( '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 = [ @@ -104,6 +108,7 @@ MIDDLEWARE_CLASSES = [ 'maintenancemode.middleware.MaintenanceModeMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.cache.FetchFromCacheMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', ] ROOT_URLCONF = 'wolnelektury.urls' @@ -112,7 +117,13 @@ TEMPLATE_DIRS = [ 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 = '/' @@ -134,6 +145,16 @@ INSTALLED_APPS = [ 'djkombu', # 'django_nose', + #allauth stuff + 'emailconfirmation', + 'uni_form', + 'allauth', + 'allauth.account', + 'allauth.socialaccount', + 'allauth.openid', + #'allauth.facebook', + #'allauth.twitter', + # included 'compress', 'modeltranslation', @@ -198,19 +219,38 @@ COMPRESS_CSS = { 'css/book_box.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', ], 'output_filename': 'css/all.min?.css', }, + 'screen': { + 'source_filenames': ['css/screen.css'], + 'output_filename': 'css/screen.min?.css', + 'extra_context': { + 'media': 'screen and (min-width: 800px)', + }, + }, + 'ie': { + 'source_filenames': [ + 'css/ie.css', + ], + 'output_filename': 'css/ie.min?.css', + }, 'book': { - 'source_filenames': ('css/master.book.css',), + 'source_filenames': [ + 'css/logo.css', + 'css/master.book.css', + ], 'output_filename': 'css/book.min?.css', }, 'player': { 'source_filenames': [ 'jplayer/jplayer.blue.monday.css', + 'css/player.css', ], 'output_filename': 'css/player.min?.css', }, @@ -266,17 +306,6 @@ COMPRESS_VERSION = True 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" @@ -314,6 +343,10 @@ BROKER_VHOST = "/" CELERY_EAGER_PROPAGATES_EXCEPTIONS = True +LOCALE_PATHS = [ + path.join(PROJECT_DIR, '../locale-contrib') +] + # Load localsettings, if they exist try: from localsettings import *