Remove machina, remove default cache config, add some upgrades and compatibility...

[wolnelektury.git] / src / wolnelektury / settings / static.py

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 5bd26db..776b47f 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -26,7 +26,8 @@ PIPELINE = {
             'source_filenames': [
                 'contrib/jquery-ui-1.13.1.custom/jquery-ui.css',
                 '2022/styles/main.scss',
-                '2022/more.scss', 
+                '2022/more.scss',
+                'chunks/edit.scss',
             ],
             'output_filename': 'css/compressed/2022.css',
         },
@@ -140,6 +141,8 @@ PIPELINE = {
                 'contrib/jquery-ui-1.13.1.custom/jquery-ui.js',
                 'js/search.js',
                 'js/2022.js',
+                '2022/book/filter.js',
+                'chunks/edit.js',
             ],
             'output_filename': 'js/2022.min.js'
         },
@@ -153,8 +156,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',
@@ -223,8 +226,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 = ''
@@ -236,9 +238,3 @@ STATICFILES_FINDERS = [
     'pipeline.finders.CachedFileFinder',
     'pipeline.finders.PipelineFinder',
 ]
-
-
-from machina import MACHINA_MAIN_STATIC_DIR
-STATICFILES_DIRS = (
-    MACHINA_MAIN_STATIC_DIR,
-)