X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d38155ea08184f51939e9e75609d5916a810ea54..49fd68327eee961b167b0dbbb80e99d6295afe10:/src/wolnelektury/settings/static.py diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py index e876ec801..b3edb72cb 100644 --- a/src/wolnelektury/settings/static.py +++ b/src/wolnelektury/settings/static.py @@ -1,6 +1,5 @@ -# -*- 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. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # from os import path from .paths import VAR_DIR @@ -9,7 +8,6 @@ from .paths import VAR_DIR # Example: "/home/media/media.lawrence.com/" MEDIA_ROOT = path.join(VAR_DIR, 'media/') STATIC_ROOT = path.join(VAR_DIR, 'static/') -SEARCH_INDEX = path.join(VAR_DIR, 'search_index/') # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash if there is a path component (optional in other cases). @@ -17,138 +15,107 @@ SEARCH_INDEX = path.join(VAR_DIR, 'search_index/') MEDIA_URL = '/media/' STATIC_URL = '/static/' +IMAGE_DIR = 'book/pictures/' + # CSS and JavaScript file groups PIPELINE = { 'STYLESHEETS': { 'main': { - # styles both for mobile and for big screen 'source_filenames': [ + 'contrib/jquery-ui-1.13.1.custom/jquery-ui.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', - 'css/ui-lightness/jquery-ui-1.8.16.custom.css', + '2022/styles/main.scss', + '2022/more.scss', + 'chunks/edit.scss', - 'scss/main.scss', + 'scss/text.scss', ], 'output_filename': 'css/compressed/main.css', }, - 'book': { - 'source_filenames': [ - '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', }, - 'picture': { - 'source_filenames': [ - 'css/master.book.css', - 'css/master.picture.css', - ], - 'output_filename': 'css/compressed/picture.css', - }, - 'player': { - 'source_filenames': [ - 'jplayer/jplayer.blue.monday.css', - 'player/player.css', - ], - 'output_filename': 'css/compressed/player.css', - }, - 'simple': { - 'source_filenames': ('css/simple.css',), - 'output_filename': 'css/compressed/simple.css', - }, 'widget': { 'source_filenames': ('scss/widget.scss',), 'output_filename': 'css/compressed/widget.css', }, }, 'JAVASCRIPT': { - 'base': { - 'source_filenames': ( - 'js/contrib/jquery.cycle.min.js', - 'js/contrib/jquery.jqmodal.js', - 'js/contrib/jquery.form.js', - 'js/contrib/jquery.paging.min.js', + 'main': { + 'source_filenames': [ + '2022/scripts/vendor.js', + 'contrib/jquery-ui-1.13.1.custom/jquery-ui.js', + + 'js/search.js', + 'js/header.js', + 'book/filter.js', + 'chunks/edit.js', + '2022/scripts/modernizr.js', + 'js/main.js', + + 'js/contrib/jquery.cycle2.min.js', + 'sponsors/js/sponsors.js', + 'annoy/banner.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/book_text/progress.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/contrib/jquery-ui-1.8.16.custom.min.js', - - 'jplayer/jquery.jplayer.min.js', - 'jplayer/jplayer.playlist.min.js', - 'player/player.js', - - 'js/locale.js', - 'js/dialogs.js', - 'js/base.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', + ], + 'output_filename': 'js/compressed/main.min.js' }, 'player': { 'source_filenames': [ - 'jplayer/jquery.jplayer.min.js', - 'jplayer/jplayer.playlist.min.js', + 'js/contrib/jplayer/jquery.jplayer.min.js', + 'js/contrib/jplayer/jplayer.playlist.min.js', 'player/player.js', ], - 'output_filename': 'js/player.min.js', - }, - 'book': { - 'source_filenames': [ - 'js/contrib/jquery.eventdelegation.js', - 'js/contrib/jquery.scrollto.js', - 'js/contrib/jquery.highlightfade.js', - 'js/book_text/other.js', - 'js/book.js', - - 'js/contrib/raphael-min.js', - 'js/contrib/progressSpin.min.js', - 'js/picture.js', - ], - 'output_filename': 'js/book.min.js', + 'output_filename': 'js/compressed/player.min.js', }, 'book_text': { '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/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', }, - 'book_ie': { - 'source_filenames': ('js/contrib/ierange-m2.js',), - 'output_filename': 'js/book_ie.min.js', - }, 'widget': { 'source_filenames': ( 'js/contrib/jquery.js', @@ -162,16 +129,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 = '' @@ -180,5 +142,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', ]