X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6d42bc478e3d1bd90eb294464748c21e4de0fc63..da1171ae5f512c20c68a0616b3157ae9927a6f1f:/src/wolnelektury/settings/static.py

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 6cf76662d..6d12fbded 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,42 +21,70 @@ IMAGE_DIR = 'book/pictures/'
 
 PIPELINE = {
     'STYLESHEETS': {
+        '2022': {
+            'source_filenames': [
+                'contrib/jquery-ui-1.13.1.custom/jquery-ui.css',
+                'contrib/leaflet-1.9.4/leaflet.css',
+                'contrib/leaflet.markercluster-1.4.1/MarkerCluster.css',
+                'contrib/leaflet.markercluster-1.4.1/MarkerCluster.Default.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',
 
-                'css/annoy.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',
-                'css/annoy.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',
             ],
@@ -110,10 +137,36 @@ PIPELINE = {
                 'funding/funding.js',
                 'club/form.js',
 
-                'js/annoy.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',
+                'contrib/leaflet-1.9.4/leaflet.js',
+                'contrib/leaflet.markercluster-1.4.1/leaflet.markercluster.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',
@@ -122,6 +175,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',
@@ -138,21 +199,24 @@ PIPELINE = {
         },
         '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',
                 '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/annoy.js',
+                'annoy/banner.js',
             ],
             'output_filename': 'js/book_text.js',
         },
@@ -179,17 +243,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.pipeline_storage.GzipPipelineCachedStorage'
-#STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineManifestStorage'
 
 # PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
 # PIPELINE_PYSCSS_ARGUMENTS = ''
@@ -201,9 +259,3 @@ STATICFILES_FINDERS = [
     'pipeline.finders.CachedFileFinder',
     'pipeline.finders.PipelineFinder',
 ]
-
-
-from machina import MACHINA_MAIN_STATIC_DIR
-STATICFILES_DIRS = (
-    MACHINA_MAIN_STATIC_DIR,
-)