X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9a938c8b406ce05e3bca4a5a483d473ece9e17b0..811c2c30277f11cc7a35a347a74e4112f97569ac:/src/wolnelektury/settings/static.py?ds=sidebyside diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py index 6f7938ded..179467d9c 100644 --- a/src/wolnelektury/settings/static.py +++ b/src/wolnelektury/settings/static.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # @@ -23,40 +22,66 @@ IMAGE_DIR = 'book/pictures/' PIPELINE = { 'STYLESHEETS': { + '2022': { + 'source_filenames': [ + 'contrib/jquery-ui-1.13.1.custom/jquery-ui.css', + 'css/jquery.countdown.css', + '2022/styles/main.scss', + '2022/more.scss', + 'chunks/edit.scss', + ], + 'output_filename': 'css/compressed/2022.css', + }, 'main': { # styles both for mobile and for big screen 'source_filenames': [ + 'css/import/gelasio.css', + 'css/jquery.countdown.css', 'jplayer/jplayer.blue.monday.css', 'sponsors/css/sponsors.css', - 'uni_form/uni-form.css', - 'uni_form/default.uni-form.css', + 'annoy/banner.scss', 'css/ui-lightness/jquery-ui-1.8.16.custom.css', + 'css/tlite.css', + 'scss/main.scss', + 'club/club.scss', ], 'output_filename': 'css/compressed/main.css', }, 'book': { 'source_filenames': [ + 'css/import/gelasio.css', 'css/master.book.css', ], 'output_filename': 'css/compressed/book.css', }, 'book_text': { 'source_filenames': [ + 'css/import/gelasio.css', 'scss/book_text.scss', 'css/new.book.css', + 'annoy/banner.scss', + 'annoy/book_text.scss', + '2022/styles/reader_player.scss', 'css/master.picture.css', ], 'output_filename': 'css/compressed/book_text.css', }, + 'forum': { + 'source_filenames': [ + 'scss/forum.scss', + ], + 'output_filename': 'css/compressed/compressed/forum.css', + }, 'picture': { 'source_filenames': [ + 'css/import/gelasio.css', 'css/master.book.css', 'css/master.picture.css', ], @@ -81,7 +106,7 @@ PIPELINE = { 'JAVASCRIPT': { 'base': { 'source_filenames': ( - 'js/contrib/jquery.cycle.min.js', + 'js/contrib/jquery.cycle2.min.js', 'js/contrib/jquery.jqmodal.js', 'js/contrib/jquery.form.js', 'js/contrib/jquery.paging.min.js', @@ -89,9 +114,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,11 +132,35 @@ PIPELINE = { 'player/openplayer.js', 'js/search.js', 'funding/funding.js', + 'club/form.js', - 'uni_form/uni-form.js', + 'annoy/banner.js', ), 'output_filename': 'js/base.min.js', }, + '2022': { + 'source_filenames': [ + '2022/scripts/vendor.js', + 'contrib/jquery-ui-1.13.1.custom/jquery-ui.js', + 'js/search.js', + 'js/2022.js', + '2022/book/filter.js', + 'chunks/edit.js', + '2022/scripts/modernizr.js', + '2021/scripts/main.js', + + 'js/contrib/jquery.cycle2.min.js', + 'sponsors/js/sponsors.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', + 'pdcounter/pdcounter.js', + + ], + 'output_filename': 'js/2022.min.js' + }, 'player': { 'source_filenames': [ 'jplayer/jquery.jplayer.min.js', @@ -117,6 +169,14 @@ PIPELINE = { ], 'output_filename': 'js/player.min.js', }, + '2022_player': { + 'source_filenames': [ + 'js/contrib/jplayer/jquery.jplayer.min.js', + 'js/contrib/jplayer/jplayer.playlist.min.js', + 'player/2022_player.js', + ], + 'output_filename': 'js/2022_player.min.js', + }, 'book': { 'source_filenames': [ 'js/contrib/jquery.eventdelegation.js', @@ -133,20 +193,33 @@ PIPELINE = { }, 'book_text': { 'source_filenames': [ + 'js/contrib/jquery.cycle2.min.js', '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/references.js', + 'js/book_text/settings.js', + 'js/book_text/toc.js', 'js/locale.js', 'js/dialogs.js', + 'annoy/book_text.js', 'js/contrib/jquery.highlightfade.js', 'js/contrib/raphael-min.js', 'player/openplayer.js', 'js/contrib/progressSpin.min.js', - 'js/picture.js', + 'annoy/banner.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', @@ -164,16 +237,11 @@ PIPELINE = { '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', + 'libsasscompiler.LibSassCompiler', ) } -STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage' +STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineManifestStorage' # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss' # PIPELINE_PYSCSS_ARGUMENTS = '' @@ -182,5 +250,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', ]