X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/293deaa71a6e390517966f4ba9fa907562524636..82c3054bcdeb000aa9782da80d644070797b5cbe:/wolnelektury/settings/static.py?ds=sidebyside diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py index e1e859442..81e15f82b 100644 --- a/wolnelektury/settings/static.py +++ b/wolnelektury/settings/static.py @@ -1,5 +1,5 @@ from os import path -from settings.paths import PROJECT_DIR +from .paths import PROJECT_DIR # Absolute path to the directory that holds media. # Example: "/home/media/media.lawrence.com/" @@ -14,44 +14,51 @@ MEDIA_URL = '/media/' STATIC_URL = '/static/' # CSS and JavaScript file groups -PIPELINE_CSS = { - 'all': { + +PIPELINE = { + 'STYLESHEETS': { + 'main': { # styles both for mobile and for big screen 'source_filenames': [ - 'css/jquery.countdown.css', - - 'css/base.css', - 'css/cite.css', - 'css/header.css', - 'css/main_page.css', - 'css/dialogs.css', - 'css/picture_box.css', - 'css/book_box.css', - 'css/catalogue.css', + 'css/jquery.countdown.css', + 'sponsors/css/sponsors.css', - 'css/auth.css', - 'css/social/shelf_tags.css', + 'uni_form/uni-form.css', + 'uni_form/default.uni-form.css', + 'css/ui-lightness/jquery-ui-1.8.16.custom.css', + + 'scss/main.scss', ], - 'output_filename': 'css/compressed/all.css', + 'output_filename': 'css/compressed/main.css', }, - 'ie': { + 'book': { 'source_filenames': [ - 'css/ie.css', + 'css/master.book.css', ], - 'output_filename': 'css/compressed/ie.css', + 'output_filename': 'css/compressed/book.css', }, - 'book': { + 'book_text': { + 'source_filenames': [ + 'scss/book_text.scss', + 'css/new.book.css', + + 'css/master.picture.css', + ], + 'output_filename': 'css/compressed/book_text.css', + }, + 'picture': { 'source_filenames': [ 'css/master.book.css', + 'css/master.picture.css', ], - 'output_filename': 'css/compressed/book.css', + 'output_filename': 'css/compressed/picture.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', }, @@ -59,20 +66,23 @@ 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/jquery.cycle.min.js', - 'js/jquery.jqmodal.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/contrib/jquery.cycle.min.js', + 'js/contrib/jquery.jqmodal.js', + 'js/contrib/jquery.form.js', + 'js/contrib/jquery.countdown.js', 'js/contrib/jquery.countdown-pl.js', + '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/jquery-ui-1.8.16.custom.min.js', + 'js/contrib/jquery-ui-1.8.16.custom.min.js', 'js/locale.js', 'js/dialogs.js', @@ -80,36 +90,85 @@ PIPELINE_JS = { 'pdcounter/pdcounter.js', 'sponsors/js/sponsors.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', }, 'book': { 'source_filenames': [ - 'js/jquery.eventdelegation.js', - 'js/jquery.scrollto.js', - 'js/jquery.highlightfade.js', + 'js/contrib/jquery.eventdelegation.js', + 'js/contrib/jquery.scrollto.js', + 'js/contrib/jquery.highlightfade.js', + 'js/book_text/other.js', 'js/book.js', - 'player/openplayer.js', + + 'js/contrib/raphael-min.js', + 'js/contrib/progressSpin.min.js', + 'js/picture.js', ], 'output_filename': 'js/book.min.js', }, + 'book_text': { + 'source_filenames': [ + 'js/contrib/jquery.form.js', + 'js/contrib/jquery.jqmodal.js', + 'js/book_text/*.js', + 'js/locale.js', + 'js/dialogs.js', + + 'js/contrib/jquery.highlightfade.js', + 'js/contrib/raphael-min.js', + 'player/openplayer.js', + 'js/contrib/progressSpin.min.js', + 'js/picture.js', + ], + 'output_filename': 'js/book_text.js', + }, 'book_ie': { - 'source_filenames': ('js/ierange-m2.js',), + '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 = 'pipeline.storage.PipelineCachedStorage' -PIPELINE_CSS_COMPRESSOR = None -PIPELINE_JS_COMPRESSOR = None +STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage' + +#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', +]