X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3f24386508e4c86c6623fe7b0146a2dcbe7df4ef..48a8d1d73adefae7f0c58015494ce956d7cd70df:/src/wolnelektury/settings/static.py diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py index 052a6ff8e..f6411ccc5 100644 --- a/src/wolnelektury/settings/static.py +++ b/src/wolnelektury/settings/static.py @@ -17,10 +17,11 @@ SEARCH_INDEX = path.join(VAR_DIR, 'search_index/') MEDIA_URL = '/media/' STATIC_URL = '/static/' +IMAGE_DIR = 'book/pictures/' + # CSS and JavaScript file groups PIPELINE = { - 'PIPELINE_ENABLED': False, 'STYLESHEETS': { 'main': { # styles both for mobile and for big screen @@ -30,11 +31,12 @@ PIPELINE = { 'sponsors/css/sponsors.css', - 'uni_form/uni-form.css', - 'uni_form/default.uni-form.css', + 'css/annoy.css', 'css/ui-lightness/jquery-ui-1.8.16.custom.css', + 'css/tlite.css', + 'scss/main.scss', ], 'output_filename': 'css/compressed/main.css', @@ -88,9 +90,12 @@ PIPELINE = { 'js/contrib/jquery.countdown-de.js', 'js/contrib/jquery.countdown-uk.js', 'js/contrib/jquery.countdown-es.js', 'js/contrib/jquery.countdown-lt.js', 'js/contrib/jquery.countdown-ru.js', 'js/contrib/jquery.countdown-fr.js', + 'js/contrib/jquery.shorten.js', 'js/contrib/jquery-ui-1.8.16.custom.min.js', + 'js/contrib/tlite.min.js', + 'jplayer/jquery.jplayer.min.js', 'jplayer/jplayer.playlist.min.js', 'player/player.js', @@ -104,7 +109,7 @@ PIPELINE = { 'js/search.js', 'funding/funding.js', - 'uni_form/uni-form.js', + 'js/annoy.js', ), 'output_filename': 'js/base.min.js', }, @@ -134,7 +139,11 @@ PIPELINE = { 'source_filenames': [ 'js/contrib/jquery.form.js', 'js/contrib/jquery.jqmodal.js', - 'js/book_text/*.js', + 'js/book_text/info.js', + 'js/book_text/menu.js', + 'js/book_text/note.js', + 'js/book_text/settings.js', + 'js/book_text/toc.js', 'js/locale.js', 'js/dialogs.js', @@ -172,7 +181,8 @@ PIPELINE = { ) } -STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage' +STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage' +#STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss' # PIPELINE_PYSCSS_ARGUMENTS = '' @@ -181,5 +191,6 @@ STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorag STATICFILES_FINDERS = [ 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'pipeline.finders.CachedFileFinder', 'pipeline.finders.PipelineFinder', ]