X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/a4cf06ec9135a9375fbc9ed2c697bc60ad6052b5..da1171ae5f512c20c68a0616b3157ae9927a6f1f:/src/wolnelektury/settings/static.py?ds=sidebyside

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index a1e53186d..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).
@@ -25,6 +24,11 @@ PIPELINE = {
         '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',
@@ -66,6 +70,7 @@ PIPELINE = {
                 'css/new.book.css',
                 'annoy/banner.scss',
                 'annoy/book_text.scss',
+                '2022/styles/reader_player.scss',
 
                 'css/master.picture.css',
             ],
@@ -138,11 +143,27 @@ PIPELINE = {
         },
         '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'
         },
@@ -226,8 +247,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 = ''
@@ -239,9 +259,3 @@ STATICFILES_FINDERS = [
     'pipeline.finders.CachedFileFinder',
     'pipeline.finders.PipelineFinder',
 ]
-
-
-from machina import MACHINA_MAIN_STATIC_DIR
-STATICFILES_DIRS = (
-    MACHINA_MAIN_STATIC_DIR,
-)