X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/dbe22f64e83af84c570ada1c73975eff9d83efe2..bf852b7e6f2828e0ef53440b69247e10b782e8cd:/prawokultury/settings.d/50-static.py

diff --git a/prawokultury/settings.d/50-static.py b/prawokultury/settings.d/50-static.py
index 297d03b..4a47f9f 100644
--- a/prawokultury/settings.d/50-static.py
+++ b/prawokultury/settings.d/50-static.py
@@ -9,43 +9,44 @@ STATICFILES_FINDERS = (
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
-STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage'
-PIPELINE_CSS_COMPRESSOR = None
-PIPELINE_JS_COMPRESSOR = None
-PIPELINE_CSS = {
-    'base': {
-        'source_filenames': (
-          'css/base.scss',
-          'css/layout.scss',
-          'css/header.scss',
-          'css/menu.scss',
-          'css/search.scss',
-          'css/sidebar.scss',
-          'css/promobox.scss',
-          'css/entry.scss',
-          'css/footer.scss',
-          'css/prevnext.scss',
-          'css/forms.scss',
-          'events/events.scss',
+STATICFILES_STORAGE = 'fnpdjango.pipeline_storage.GzipPipelineCachedStorage'
 
-          'contrib/lightbox/css/lightbox.css',
-        ),
-        'output_filename': 'compressed/base.css',
+PIPELINE = {
+    'CSS_COMPRESSOR': None,
+    'JS_COMPRESSOR': None,
+    'STYLESHEETS': {
+        'base': {
+            'source_filenames': (
+                'css/base.scss',
+                'css/layout.scss',
+                'css/header.scss',
+                'css/menu.scss',
+                'css/search.scss',
+                'css/sidebar.scss',
+                'css/promobox.scss',
+                'css/entry.scss',
+                'css/footer.scss',
+                'css/prevnext.scss',
+                'css/forms.scss',
+                'events/events.scss',
+
+                'contrib/lightbox/css/lightbox.css',
+            ),
+            'output_filename': 'compressed/base.css',
+        },
     },
-}
-PIPELINE_JS = {
-    'base': {
-        'source_filenames': (
-            'js/promobox.js',
-            'js/workshop_form.js',
-            'contrib/lightbox/js/lightbox.min.js',
-        ),
-        'output_filename': 'compressed/base.js',
+    'JAVASCRIPT': {
+        'base': {
+            'source_filenames': (
+                'js/promobox.js',
+                'js/workshop_form.js',
+                'js/optional_fields.js',
+                'contrib/lightbox/js/lightbox.min.js',
+            ),
+            'output_filename': 'compressed/base.js',
+        },
     },
+    'COMPILERS': (
+        'pipeline.compilers.sass.SASSCompiler',
+    ),
 }
-
-PIPELINE_COMPILERS = (
-  'pipeline.compilers.sass.SASSCompiler',
-)
-
-PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'