X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5913c54d19b8f6775633176032161d49f9b2f1aa..56145861cf5fa01c5fbb429d40242e0a16189ed1:/src/redakcja/settings/compress.py

diff --git a/src/redakcja/settings/compress.py b/src/redakcja/settings/compress.py
index 9bee6706..0406fdf8 100644
--- a/src/redakcja/settings/compress.py
+++ b/src/redakcja/settings/compress.py
@@ -7,52 +7,52 @@ STATICFILES_FINDERS = (
 
 
 STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
-PIPELINE_CSS_COMPRESSOR = None
-PIPELINE_JS_COMPRESSOR = None
-PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'
 
+PIPELINE = {
+    'CSS_COMPRESSOR': None,
+    'JS_COMPRESSOR': None,
+    #'PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'
 
-# CSS and JS files to compress
-PIPELINE_CSS = {
-    'detail': {
-         'source_filenames': (
-            'css/master.css',
-            'css/toolbar.css',
-            'css/gallery.css',
-            'css/history.css',
-            'css/summary.css',
-            'css/html.css',
-            'css/jquery.autocomplete.css',
-            'css/imgareaselect-default.css', #img!
-            'css/dialogs.css',
-        ),
-        'output_filename': 'compressed/detail_styles.css',
-    },
-    'catalogue': {
-        'source_filenames': (
-            'css/filelist.css',
-        ),
-        'output_filename': 'compressed/catalogue_styles.css',
-     },
-     'book': {
-        'source_filenames': (
-            'css/book.css',
-        ),
-        'output_filename': 'compressed/book.css',
-    },
-    'book_list': {
-        'source_filenames': (
-            'contextmenu/jquery.contextMenu.css',
-            'css/book_list.css',
-        ),
-        'output_filename': 'compressed/book_list.css',
+    # CSS and JS files to compress
+    'STYLESHEETS': {
+        'detail': {
+            'source_filenames': (
+                'css/master.css',
+                'css/toolbar.css',
+                'css/gallery.css',
+                'css/history.css',
+                'css/summary.css',
+                'css/html.css',
+                'css/jquery.autocomplete.css',
+                'css/imgareaselect-default.css', #img!
+                'css/dialogs.css',
+            ),
+            'output_filename': 'compressed/detail_styles.css',
+        },
+        'catalogue': {
+            'source_filenames': (
+                'css/filelist.css',
+            ),
+            'output_filename': 'compressed/catalogue_styles.css',
+         },
+         'book': {
+            'source_filenames': (
+                'css/book.css',
+            ),
+            'output_filename': 'compressed/book.css',
+        },
+        'book_list': {
+            'source_filenames': (
+                'contextmenu/jquery.contextMenu.css',
+                'css/book_list.css',
+            ),
+            'output_filename': 'compressed/book_list.css',
+        },
     },
-}
-
-PIPELINE_JS = {
-    # everything except codemirror
-    'detail': {
-        'source_filenames': (
+    'JAVASCRIPT': {
+        # everything except codemirror
+        'detail': {
+            'source_filenames': (
                 # libraries
                 'js/lib/jquery/jquery.autocomplete.js',
                 'js/lib/jquery/jquery.blockui.js',
@@ -83,11 +83,11 @@ PIPELINE_JS = {
                 'js/wiki/view_annotations.js',
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
-        ),
-        'output_filename': 'compressed/detail_scripts.js',
-     },
-    'wiki_img': {
-        'source_filenames': (
+            ),
+            'output_filename': 'compressed/detail_scripts.js',
+         },
+        'wiki_img': {
+            'source_filenames': (
                 # libraries
                 'js/lib/jquery-1.4.2.min.js',
                 'js/lib/jquery/jquery.autocomplete.js',
@@ -115,32 +115,33 @@ PIPELINE_JS = {
                 'js/wiki/view_editor_source.js',
                 'js/wiki/view_history.js',
                 'js/wiki/view_column_diff.js',
-        ),
-        'output_filename': 'compressed/detail_img_scripts.js',
-     },
-    'catalogue': {
-        'source_filenames': (
+            ),
+            'output_filename': 'compressed/detail_img_scripts.js',
+         },
+        'catalogue': {
+            'source_filenames': (
                 'js/catalogue/catalogue.js',
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
-        ),
-        'output_filename': 'compressed/catalogue_scripts.js',
-     },
-     'book': {
-        'source_filenames': (
-            'js/book_text/jquery.eventdelegation.js',
-            'js/book_text/jquery.scrollto.js',
-            'js/book_text/jquery.highlightfade.js',
-            'js/book_text/book.js',
-        ),
-        'output_filename': 'compressed/book.js',
+            ),
+            'output_filename': 'compressed/catalogue_scripts.js',
          },
-    'book_list': {
-        'source_filenames': (
-            'contextmenu/jquery.ui.position.js',
-            'contextmenu/jquery.contextMenu.js',
-            'js/catalogue/book_list.js',
-        ),
-        'output_filename': 'compressed/book_list.js',
+         'book': {
+            'source_filenames': (
+                'js/book_text/jquery.eventdelegation.js',
+                'js/book_text/jquery.scrollto.js',
+                'js/book_text/jquery.highlightfade.js',
+                'js/book_text/book.js',
+            ),
+            'output_filename': 'compressed/book.js',
+        },
+        'book_list': {
+            'source_filenames': (
+                'contextmenu/jquery.ui.position.js',
+                'contextmenu/jquery.contextMenu.js',
+                'js/catalogue/book_list.js',
+            ),
+            'output_filename': 'compressed/book_list.js',
+        }
     }
 }