Merge branch 'picture' into pretty

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 826d111..0692cc7 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -147,9 +147,11 @@ INSTALLED_APPS = [
     'newtagging',
     'opds',
     'pdcounter',
+    'reporting',
     'sponsors',
     'stats',
     'suggest',
+    'picture',
 ]
 
 #CACHE_BACKEND = 'locmem:///?max_entries=3000'
@@ -159,7 +161,13 @@ 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/jquery.countdown.css', 'css/master.plain.css', 'css/sponsors.css', 'css/facelist_2-0.css',),
+        'source_filenames': [
+            'css/base.css',
+            'css/header.css',
+            'css/main_page.css',
+            'css/book_box.css',
+        ],
         'output_filename': 'css/all.min?.css',
     },
     'book': {
@@ -173,29 +181,33 @@ 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',
-            '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',
-            ),
-        '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',
-    },
-    'book_ie': {
-        'source_filenames': ('js/ierange-m2.js',),
-        'output_filename': 'js/book_ie?.min.js',
-    }
+    #~ 'jquery': {
+        #~ #'source_filenames': ('js/jquery.js',),
+        #~ 'source_filenames': [],
+        #~ 'output_filename': 'js/jquery.min.js',
+    #~ },
+    #~ 'all': {
+        #~ 'source_filenames': ('js/jquery.autocomplete.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',
+            #~ ),
+        #~ 'source_filenames': [],
+        #~ 'output_filename': 'js/all?.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',
+    #~ }
 
 }
 
@@ -227,9 +239,13 @@ MAX_TAG_LIST = 6
 NO_BUILD_EPUB = False
 NO_BUILD_TXT = False
 NO_BUILD_PDF = False
+NO_BUILD_MOBI = False
 
 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
 
@@ -243,7 +259,6 @@ BROKER_USER = "guest"
 BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 
-USE_CELERY = True
 
 # Load localsettings, if they exist
 try: