X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9c6af643b95a83fbe5d34055a6b03a6a286a2468..142cf364fb3fc7cd95df709126ada97b6944c128:/wolnelektury/settings.py?ds=inline diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index 49073a18f..bd4e8a0b4 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -81,14 +81,14 @@ TEMPLATE_LOADERS = [ # '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', -] +) MIDDLEWARE_CLASSES = [ 'django.middleware.cache.UpdateCacheMiddleware', @@ -98,6 +98,7 @@ MIDDLEWARE_CLASSES = [ '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', @@ -109,38 +110,47 @@ TEMPLATE_DIRS = [ path.join(PROJECT_DIR, 'templates'), ] -LOGIN_URL = '/uzytkownicy/zaloguj/' +LOGIN_URL = '/uzytkownicy/login/' 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', - - # external + 'pagination', + 'piston', + 'piwik.django', + 'rosetta', 'south', 'sorl.thumbnail', - 'sponsors', - 'newtagging', - 'pagination', - 'chunks', + 'djcelery', + 'djkombu', + # 'django_nose', + + # included 'compress', 'modeltranslation', - 'catalogue', - 'lessons', - 'piston', + + # our 'api', - 'rosetta', + 'catalogue', + 'chunks', + 'dictionary', 'infopages', - 'suggest', 'lesmianator', + 'lessons', + 'newtagging', 'opds', 'pdcounter', + 'reporting', + 'sponsors', + 'stats', + 'suggest', ] #CACHE_BACKEND = 'locmem:///?max_entries=3000' @@ -150,39 +160,53 @@ 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': { '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': { - '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', + #~ } } @@ -204,11 +228,36 @@ THUMBNAIL_PROCESSORS = ( 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 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 + +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: