X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/24721591455e048cffca365384e6759daae05916..a3b153ea6e30da275edf3e34b8d2f8ca1bb436cc:/src/wolnelektury/settings/static.py?ds=inline diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py index b7beb79bb..e91c742d4 100644 --- a/src/wolnelektury/settings/static.py +++ b/src/wolnelektury/settings/static.py @@ -8,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). @@ -22,39 +21,16 @@ IMAGE_DIR = 'book/pictures/' PIPELINE = { 'STYLESHEETS': { - '2021': { + '2022': { 'source_filenames': [ - '2021/css/main.scss', - ], - 'output_filename': 'css/compressed/2021.css', - }, - 'main': { - # styles both for mobile and for big screen - 'source_filenames': [ - 'css/import/gelasio.css', - + 'contrib/jquery-ui-1.13.1.custom/jquery-ui.css', 'css/jquery.countdown.css', - 'jplayer/jplayer.blue.monday.css', - - 'sponsors/css/sponsors.css', - - 'annoy/banner.scss', - 'css/ui-lightness/jquery-ui-1.8.16.custom.css', - - 'css/tlite.css', - - 'scss/main.scss', - 'club/club.scss', + '2022/styles/main.scss', + '2022/more.scss', + 'chunks/edit.scss', ], - 'output_filename': 'css/compressed/main.css', - }, - 'book': { - 'source_filenames': [ - 'css/import/gelasio.css', - 'css/master.book.css', - ], - 'output_filename': 'css/compressed/book.css', + 'output_filename': 'css/compressed/2022.css', }, 'book_text': { 'source_filenames': [ @@ -63,101 +39,52 @@ PIPELINE = { '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', - ], - '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': ( + '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', - 'js/contrib/jquery.jqmodal.js', - 'js/contrib/jquery.form.js', - 'js/contrib/jquery.paging.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', - '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', - - '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', - 'club/form.js', - 'annoy/banner.js', - ), - 'output_filename': 'js/base.min.js', - }, - 'player': { - 'source_filenames': [ - 'jplayer/jquery.jplayer.min.js', - 'jplayer/jplayer.playlist.min.js', - 'player/player.js', ], - 'output_filename': 'js/player.min.js', + 'output_filename': 'js/2022.min.js' }, - 'book': { + '2022_player': { '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', + 'js/contrib/jplayer/jquery.jplayer.min.js', + 'js/contrib/jplayer/jplayer.playlist.min.js', + 'player/2022_player.js', ], - 'output_filename': 'js/book.min.js', + 'output_filename': 'js/2022_player.min.js', }, 'book_text': { 'source_filenames': [ - 'js/contrib/jquery.cycle2.min.js', 'js/contrib/jquery.form.js', 'js/contrib/jquery.jqmodal.js', 'js/book_text/info.js', @@ -172,22 +99,11 @@ PIPELINE = { 'js/contrib/jquery.highlightfade.js', 'js/contrib/raphael-min.js', - 'player/openplayer.js', 'js/contrib/progressSpin.min.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', - }, 'widget': { 'source_filenames': ( 'js/contrib/jquery.js', @@ -205,8 +121,7 @@ PIPELINE = { ) } -STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage' -#STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage' +STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineManifestStorage' # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss' # PIPELINE_PYSCSS_ARGUMENTS = '' @@ -218,9 +133,3 @@ STATICFILES_FINDERS = [ 'pipeline.finders.CachedFileFinder', 'pipeline.finders.PipelineFinder', ] - - -from machina import MACHINA_MAIN_STATIC_DIR -STATICFILES_DIRS = ( - MACHINA_MAIN_STATIC_DIR, -)