merge search into pretty branch

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index ed63a1d..4184c4e 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -60,6 +60,7 @@ USE_I18N = True
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = path.join(PROJECT_DIR, '../media')
 STATIC_ROOT = path.join(PROJECT_DIR, 'static')
+SEARCH_INDEX = path.join(MEDIA_ROOT, 'search')
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
@@ -110,7 +111,7 @@ TEMPLATE_DIRS = [
     path.join(PROJECT_DIR, 'templates'),
 ]
 
-LOGIN_URL = '/uzytkownicy/login/'
+LOGIN_URL = '/uzytkownicy/zaloguj/'
 
 LOGIN_REDIRECT_URL = '/'
 
@@ -137,6 +138,7 @@ INSTALLED_APPS = [
     'modeltranslation',
 
     # our
+    'ajaxable',
     'api',
     'catalogue',
     'chunks',
@@ -151,21 +153,28 @@ INSTALLED_APPS = [
     'sponsors',
     'stats',
     'suggest',
+    'picture',
+    'search',
 ]
 
 #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',
         ],
         'output_filename': 'css/all.min?.css',
     },
@@ -180,33 +189,36 @@ COMPRESS_CSS = {
 }
 
 COMPRESS_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',
+    '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/locale.js',
+            'js/dialogs.js',
+            'js/sponsors.js',
+            'js/pdcounter.js',
+
+            #~ 'js/jquery.autocomplete.js',
+            #~ 'js/jquery.labelify.js', 'js/catalogue.js',
+            ),
+        'output_filename': 'js/base?.min.js',
     },
-    'book': {
+    #~ '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': [],
+        #~ 'output_filename': 'js/book?.min.js',
+    #~ },
+    #~ 'book_ie': {
         #~ 'source_filenames': ('js/ierange-m2.js',),
-        'source_filenames': [],
-        'output_filename': 'js/book_ie?.min.js',
-    }
+        #~ 'source_filenames': [],
+        #~ 'output_filename': 'js/book_ie?.min.js',
+    #~ }
 
 }
 
@@ -238,7 +250,9 @@ MAX_TAG_LIST = 6
 NO_BUILD_EPUB = False
 NO_BUILD_TXT = False
 NO_BUILD_PDF = False
-NO_BUILD_MOBI = False
+NO_BUILD_MOBI = True
+NO_SEARCH_INDEX = False
+SEARCH_INDEX_PARALLEL = False
 
 ALL_EPUB_ZIP = 'wolnelektury_pl_epub'
 ALL_PDF_ZIP = 'wolnelektury_pl_pdf'
@@ -259,6 +273,7 @@ BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 
 
+
 # Load localsettings, if they exist
 try:
     from localsettings import *