X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e0e33e24cf53aa1b65e08bcabcc674529d09741a..e091de9b221b7817f301cd1500b01fd22a79c2f6:/wolnelektury/settings.py?ds=sidebyside

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 48d96e056..5704f43c2 100644
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -24,18 +24,6 @@ DATABASES = {
     }
 }
 
-DATABASES['default'] = {
-    'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-    'NAME': 'mkoziej_wl', # Or path to database file if using sqlite3.
-    'USER': 'mkoziej',                      # Not used with sqlite3.
-    'PASSWORD': 'pelolpe',                  # Not used with sqlite3.
-}
-
-DATABASE_OPTIONS = {
-   "init_command": "SET storage_engine=INNODB DEFAULT CHARSET=utf8",
-}
-
-
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -59,6 +47,8 @@ LANGUAGES = tuple(sorted([
     ('ru', u'русский'),
     ('es', u'español'),
     ('uk', u'українська'),
+#    ('jp', u'日本語'),
+#    ('it', u'italiano'),
 ], key=lambda x: x[0]))
 
 
@@ -102,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 = [
@@ -116,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'
@@ -124,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 = '/'
 
@@ -139,13 +138,23 @@ INSTALLED_APPS = [
     'pagination',
     'piston',
     'piwik.django',
-    'rosetta',
+    #'rosetta',
     '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',
@@ -202,6 +211,7 @@ COMPRESS_CSS = {
             'css/jquery.countdown.css', 
 
             'css/base.css',
+            'css/cite.css',
             'css/header.css',
             'css/main_page.css',
             'css/dialogs.css',
@@ -209,18 +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',
     },
@@ -250,8 +280,6 @@ COMPRESS_JS = {
             'js/pdcounter.js',
 
             'js/search.js',
-
-            'js/jquery.labelify.js',
             ),
         'output_filename': 'js/base?.min.js',
     },
@@ -278,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"
 
@@ -310,7 +327,7 @@ ALL_PDF_ZIP = 'wolnelektury_pl_pdf'
 ALL_MOBI_ZIP = 'wolnelektury_pl_mobi'
 
 CATALOGUE_DEFAULT_LANGUAGE = 'pol'
-PUBLISH_PLAN_FEED = 'http://redakcja.wolnelektury.pl/documents/track/editor-proofreading/'
+PUBLISH_PLAN_FEED = 'http://redakcja.wolnelektury.pl/documents/track/editor-proofreading/?published=false'
 
 PAGINATION_INVALID_PAGE_RAISES_404 = True
 
@@ -326,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 *