X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d019a9b5e928dcf777852d0c8d5413fd3d69b4dd..eaba19e725b49fdf4efc858604a7b9d70d27f59f:/src/wolnelektury/settings/static.py

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 5bde6170f..179467d9c 100644
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -24,8 +24,11 @@ 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',
         },
@@ -64,6 +67,7 @@ PIPELINE = {
                 'css/new.book.css',
                 'annoy/banner.scss',
                 'annoy/book_text.scss',
+                '2022/styles/reader_player.scss',
 
                 'css/master.picture.css',
             ],
@@ -134,6 +138,29 @@ PIPELINE = {
                 ),
             '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',
@@ -144,8 +171,8 @@ PIPELINE = {
         },
         '2022_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/2022_player.js',
             ],
             'output_filename': 'js/2022_player.min.js',
@@ -214,8 +241,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 = ''
@@ -227,9 +253,3 @@ STATICFILES_FINDERS = [
     'pipeline.finders.CachedFileFinder',
     'pipeline.finders.PipelineFinder',
 ]
-
-
-from machina import MACHINA_MAIN_STATIC_DIR
-STATICFILES_DIRS = (
-    MACHINA_MAIN_STATIC_DIR,
-)