X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/cdf0ea700156d13cd27a670d9363d92ebaffa93f..afdd9bc42c8e08e0e2fbade6b9c934a3d65f4885:/wolnelektury/settings.py?ds=inline

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index ca0678455..fe2572904 100644
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -111,7 +111,7 @@ TEMPLATE_DIRS = [
     path.join(PROJECT_DIR, 'templates'),
 ]
 
-LOGIN_URL = '/uzytkownicy/login/'
+LOGIN_URL = '/uzytkownicy/zaloguj/'
 
 LOGIN_REDIRECT_URL = '/'
 
@@ -138,6 +138,7 @@ INSTALLED_APPS = [
     'modeltranslation',
 
     # our
+    'ajaxable',
     'api',
     'catalogue',
     'chunks',
@@ -148,23 +149,35 @@ INSTALLED_APPS = [
     'newtagging',
     'opds',
     'pdcounter',
+    'reporting',
     'sponsors',
     'stats',
     'suggest',
+    'picture',
     'search',
-
-    #
-    'django_nose',
 ]
 
 #CACHE_BACKEND = 'locmem:///?max_entries=3000'
-CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
+#CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
 CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True
 
 # CSS and JavaScript file groups
 COMPRESS_CSS = {
     'all': {
-        'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/jquery.countdown.css', 'css/master.plain.css', 'css/sponsors.css', 'css/facelist_2-0.css',),
+        #'source_filenames': ('css/master.css', 'css/jquery.autocomplete.css', 'css/master.plain.css', 'css/facelist_2-0.css',),
+        'source_filenames': [
+            'css/jquery.countdown.css', 
+
+            'css/base.css',
+            'css/header.css',
+            'css/main_page.css',
+            'css/dialogs.css',
+            'css/book_box.css',
+            'css/catalogue.css',
+            'css/sponsors.css',
+            
+            'css/ui-lightness/jquery-ui-1.8.16.custom.css',
+        ],
         'output_filename': 'css/all.min?.css',
     },
     'book': {
@@ -178,29 +191,40 @@ COMPRESS_CSS = {
 }
 
 COMPRESS_JS = {
-    'jquery': {
-        'source_filenames': ('js/jquery.js',),
-        'output_filename': 'js/jquery.min.js',
-    },
-    'all': {
-        'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js',
+    'base': {
+        'source_filenames': (
+            'js/jquery.cycle.min.js',
+            'js/jquery.jqmodal.js',
+            'js/jquery.form.js',
             'js/jquery.countdown.js', 'js/jquery.countdown-pl.js',
             'js/jquery.countdown-de.js', 'js/jquery.countdown-uk.js',
             'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js',
             'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js',
-            'js/jquery.cycle.min.js',
-            'js/jquery.jqmodal.js', 'js/jquery.labelify.js', 'js/catalogue.js',
+
+            'js/jquery-ui-1.8.16.custom.min.js',
+
+            'js/locale.js',
+            'js/dialogs.js',
+            'js/sponsors.js',
+            'js/pdcounter.js',
+
+            'js/search.js',
+
+            #~ 'js/jquery.autocomplete.js',
+            #~ 'js/jquery.labelify.js', 'js/catalogue.js',
             ),
-        'output_filename': 'js/all?.min.js',
-    },
-    'book': {
-        'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
-        'output_filename': 'js/book?.min.js',
+        'output_filename': 'js/base?.min.js',
     },
-    'book_ie': {
-        'source_filenames': ('js/ierange-m2.js',),
-        'output_filename': 'js/book_ie?.min.js',
-    }
+    #~ 'book': {
+        #~ 'source_filenames': ('js/jquery.eventdelegation.js', 'js/jquery.scrollto.js', 'js/jquery.highlightfade.js', 'js/book.js',),
+        #~ 'source_filenames': [],
+        #~ 'output_filename': 'js/book?.min.js',
+    #~ },
+    #~ 'book_ie': {
+        #~ 'source_filenames': ('js/ierange-m2.js',),
+        #~ 'source_filenames': [],
+        #~ 'output_filename': 'js/book_ie?.min.js',
+    #~ }
 
 }
 
@@ -229,9 +253,9 @@ API_WAIT = 10
 # limit number of filtering tags
 MAX_TAG_LIST = 6
 
-NO_BUILD_EPUB = True
+NO_BUILD_EPUB = False
 NO_BUILD_TXT = False
-NO_BUILD_PDF = True
+NO_BUILD_PDF = False
 NO_BUILD_MOBI = True
 NO_SEARCH_INDEX = False
 SEARCH_INDEX_PARALLEL = False
@@ -240,6 +264,8 @@ ALL_EPUB_ZIP = 'wolnelektury_pl_epub'
 ALL_PDF_ZIP = 'wolnelektury_pl_pdf'
 ALL_MOBI_ZIP = 'wolnelektury_pl_mobi'
 
+CATALOGUE_DEFAULT_LANGUAGE = 'pol'
+
 PAGINATION_INVALID_PAGE_RAISES_404 = True
 
 import djcelery