X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/2d0cc46d3bc3357c19d13fc585c0a9492e5ee1b7..3306216e9d0c249c2699275aad212a7c4c3cc4a7:/wolnelektury/settings/static.py diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py index 7ea3d70e5..81e15f82b 100644 --- a/wolnelektury/settings/static.py +++ b/wolnelektury/settings/static.py @@ -15,15 +15,14 @@ STATIC_URL = '/static/' # CSS and JavaScript file groups - -PIPELINE_CSS = { +PIPELINE = { + 'STYLESHEETS': { 'main': { # styles both for mobile and for big screen 'source_filenames': [ - 'css/jquery.countdown.css', + 'css/jquery.countdown.css', 'sponsors/css/sponsors.css', - 'css/social/shelf_tags.css', 'uni_form/uni-form.css', 'uni_form/default.uni-form.css', @@ -58,8 +57,8 @@ PIPELINE_CSS = { }, 'player': { 'source_filenames': [ - 'jplayer/jplayer.blue.monday.css', - 'player/player.css', + 'jplayer/jplayer.blue.monday.css', + 'player/player.css', ], 'output_filename': 'css/compressed/player.css', }, @@ -67,9 +66,12 @@ PIPELINE_CSS = { 'source_filenames': ('css/simple.css',), 'output_filename': 'css/compressed/simple.css', }, -} - -PIPELINE_JS = { + 'widget': { + 'source_filenames': ('scss/widget.scss',), + 'output_filename': 'css/compressed/widget.css', + }, + }, + 'JAVASCRIPT': { 'base': { 'source_filenames': ( 'js/contrib/jquery.cycle.min.js', @@ -90,16 +92,16 @@ PIPELINE_JS = { 'player/openplayer.js', 'js/search.js', 'funding/funding.js', - + 'uni_form/uni-form.js', ), 'output_filename': 'js/base.min.js', }, 'player': { 'source_filenames': [ - 'jplayer/jquery.jplayer.min.js', - 'jplayer/jplayer.playlist.min.js', - 'player/player.js', + 'jplayer/jquery.jplayer.min.js', + 'jplayer/jplayer.playlist.min.js', + 'player/player.js', ], 'output_filename': 'js/player.min.js', }, @@ -136,21 +138,37 @@ PIPELINE_JS = { 'book_ie': { 'source_filenames': ('js/contrib/ierange-m2.js',), 'output_filename': 'js/book_ie.min.js', - } - + }, + 'widget': { + 'source_filenames': ( + 'js/contrib/jquery.js', + 'js/contrib/jquery-ui-1.8.16.custom.min.js', + 'js/search.js', + 'js/widget_run.js', + ), + 'output_filename': 'js/widget.min.js', + }, + }, + 'CSS_COMPRESSOR': None, + 'JS_COMPRESSOR': 'pipeline.compressors.jsmin.JSMinCompressor', + 'COMPILERS': ( + 'pipeline.compilers.sass.SASSCompiler', + # We could probably use PySCSS instead, + # but they have some serious problems, like: + # https://github.com/Kronuz/pyScss/issues/166 (empty list syntax) + # https://github.com/Kronuz/pyScss/issues/258 (bad @media order) + #'pyscss_compiler.PySCSSCompiler', + ) } STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage' -PIPELINE_CSS_COMPRESSOR = None -PIPELINE_JS_COMPRESSOR = None - -PIPELINE_COMPILERS = ( - 'pipeline.compilers.sass.SASSCompiler', - # We could probably use PySCSS instead, - # but they have some serious problems, like: - # https://github.com/Kronuz/pyScss/issues/166 (empty list syntax) - # https://github.com/Kronuz/pyScss/issues/258 (bad @media order) - #'pyscss_compiler.PySCSSCompiler', -) + #PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss' #PIPELINE_PYSCSS_ARGUMENTS = '' + + +STATICFILES_FINDERS = [ + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'pipeline.finders.PipelineFinder', +]