X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c44816fb6561b51cb9fcbdf1bf272ffad8571dca..f177dd0cdb753827bd208960a159d1bbbaae9e80:/src/wolnelektury/settings/static.py?ds=sidebyside diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py index ab364a409..53c54b001 100644 --- a/src/wolnelektury/settings/static.py +++ b/src/wolnelektury/settings/static.py @@ -33,11 +33,10 @@ PIPELINE = { 'css/annoy.css', - 'uni_form/uni-form.css', - 'uni_form/default.uni-form.css', - 'css/ui-lightness/jquery-ui-1.8.16.custom.css', + 'css/tlite.css', + 'scss/main.scss', ], 'output_filename': 'css/compressed/main.css', @@ -52,6 +51,7 @@ PIPELINE = { 'source_filenames': [ 'scss/book_text.scss', 'css/new.book.css', + 'css/annoy.css', 'css/master.picture.css', ], @@ -91,9 +91,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', @@ -106,8 +109,7 @@ PIPELINE = { 'player/openplayer.js', 'js/search.js', 'funding/funding.js', - - 'uni_form/uni-form.js', + 'club/form.js', 'js/annoy.js', ), @@ -139,7 +141,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', @@ -147,10 +153,16 @@ PIPELINE = { 'js/contrib/raphael-min.js', 'player/openplayer.js', 'js/contrib/progressSpin.min.js', - 'js/picture.js', + 'js/annoy.js', ], 'output_filename': 'js/book_text.js', }, + 'picture': { + 'source_filenames': [ + 'js/picture.js', + ], + 'output_filename': 'js/picture.min.js', + }, 'book_ie': { 'source_filenames': ('js/contrib/ierange-m2.js',), 'output_filename': 'js/book_ie.min.js', @@ -177,7 +189,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 = '' @@ -186,5 +199,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', ]