Merge branch 'search' of git+ssh://stigma.fnp/home/mkoziej/wl into search

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index e85f189..8148614 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')
 # 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).
 
 # 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).


@@ -81,14 +82,14 @@ TEMPLATE_LOADERS = [
 #     'django.template.loaders.eggs.load_template_source',
 ]
 
 #     'django.template.loaders.eggs.load_template_source',
 ]
 

-TEMPLATE_CONTEXT_PROCESSORS = [
+TEMPLATE_CONTEXT_PROCESSORS = (

     'django.core.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',
     'django.core.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',

-]
+)

 
 MIDDLEWARE_CLASSES = [
     'django.middleware.cache.UpdateCacheMiddleware',
 
 MIDDLEWARE_CLASSES = [
     'django.middleware.cache.UpdateCacheMiddleware',


@@ -98,6 +99,7 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'django.middleware.locale.LocaleMiddleware',

+    'piwik.django.middleware.PiwikMiddleware',

     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',


@@ -109,38 +111,50 @@ TEMPLATE_DIRS = [
     path.join(PROJECT_DIR, 'templates'),
 ]
 
     path.join(PROJECT_DIR, 'templates'),
 ]
 

-LOGIN_URL = '/uzytkownicy/zaloguj/'
+LOGIN_URL = '/uzytkownicy/login/'

 
 LOGIN_REDIRECT_URL = '/'
 
 INSTALLED_APPS = [
 
 LOGIN_REDIRECT_URL = '/'
 
 INSTALLED_APPS = [

-    # included
+    # external

     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.admindocs',

-
-    # external
+    'pagination',
+    'piston',
+    'piwik.django',
+    'rosetta',

     'south',
     'sorl.thumbnail',
     'south',
     'sorl.thumbnail',

-    'sponsors',
-    'newtagging',
-    'pagination',
-    'chunks',
+    'djcelery',
+    'djkombu',
+    #    'django_nose',
+
+    # included

     'compress',
     'modeltranslation',
     'compress',
     'modeltranslation',

-    'catalogue',
-    'lessons',
-    'piston',
+
+    # our

     'api',
     'api',

-    'rosetta',
+    'catalogue',
+    'chunks',
+    'dictionary',

     'infopages',
     'infopages',

-    'suggest',

     'lesmianator',
     'lesmianator',

+    'lessons',
+    'newtagging',

     'opds',
     'pdcounter',
     'opds',
     'pdcounter',

+    'sponsors',
+    'stats',
+    'suggest',
+    'search',
+
+    #
+    'django_nose',

 ]
 
 #CACHE_BACKEND = 'locmem:///?max_entries=3000'
 ]
 
 #CACHE_BACKEND = 'locmem:///?max_entries=3000'


@@ -150,22 +164,27 @@ CACHE_MIDDLEWARE_ANONYMOUS_ONLY=True
 # CSS and JavaScript file groups
 COMPRESS_CSS = {
     'all': {
 # 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.countdown.css',
+                             'css/master.plain.css', 'css/sponsors.css', 'css/facelist_2-0.css', 'css/ui-lightness/jquery-ui-1.8.16.custom.css'),

         'output_filename': 'css/all.min?.css',
     },
     'book': {
         'source_filenames': ('css/master.book.css',),
         'output_filename': 'css/book.min?.css',
         'output_filename': 'css/all.min?.css',
     },
     'book': {
         'source_filenames': ('css/master.book.css',),
         'output_filename': 'css/book.min?.css',

-    }
+    },
+    'simple': {
+        'source_filenames': ('css/simple.css',),
+        'output_filename': 'css/simple.min?.css',
+    },

 }
 
 COMPRESS_JS = {
     'jquery': {
 }
 
 COMPRESS_JS = {
     'jquery': {

-        'source_filenames': ('js/jquery.js',),
+        'source_filenames': ('js/jquery.js', 'js/jquery-ui-1.8.16.custom.min.js'),

         'output_filename': 'js/jquery.min.js',
     },
     'all': {
         'output_filename': 'js/jquery.min.js',
     },
     'all': {

-        'source_filenames': ('js/jquery.autocomplete.js', 'js/jquery.form.js',
+        'source_filenames': ('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.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',


@@ -178,7 +197,12 @@ COMPRESS_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': {
         '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',

     }
     }

+

 }
 
 COMPRESS_VERSION = True
 }
 
 COMPRESS_VERSION = True


@@ -199,11 +223,37 @@ THUMBNAIL_PROCESSORS = (
 
 TRANSLATION_REGISTRY = "wolnelektury.translation"
 
 
 TRANSLATION_REGISTRY = "wolnelektury.translation"
 

+
+# seconds until a changes appears in the changes api
+API_WAIT = 10
+

 # limit number of filtering tags
 MAX_TAG_LIST = 6
 
 # limit number of filtering tags
 MAX_TAG_LIST = 6
 

-NO_BUILD_EPUB = False
+NO_BUILD_EPUB = True

 NO_BUILD_TXT = False
 NO_BUILD_TXT = False

+NO_BUILD_PDF = True
+NO_BUILD_MOBI = True
+NO_SEARCH_INDEX = False
+SEARCH_INDEX_PARALLEL = False
+
+ALL_EPUB_ZIP = 'wolnelektury_pl_epub'
+ALL_PDF_ZIP = 'wolnelektury_pl_pdf'
+ALL_MOBI_ZIP = 'wolnelektury_pl_mobi'
+
+PAGINATION_INVALID_PAGE_RAISES_404 = True
+
+import djcelery
+djcelery.setup_loader()
+
+BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
+BROKER_HOST = "localhost"
+BROKER_PORT = 5672
+BROKER_USER = "guest"
+BROKER_PASSWORD = "guest"
+BROKER_VHOST = "/"
+
+

 
 # Load localsettings, if they exist
 try:
 
 # Load localsettings, if they exist
 try: