X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2f9cb34a07fcd98effda2fa900e48c31813f14c8..eb769f1b951951ebd6cb55060f2f61a8c25d5aac:/redakcja/settings/compress.py?ds=inline

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 05b3b15a..4ded9c07 100644
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -1,58 +1,61 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of MIL/PEER, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
-
 STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
-PIPELINE_CSS_COMPRESSOR = None
-PIPELINE_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/dialogs.css',
-        ),
-        'output_filename': 'compressed/detail_styles.css',
-    },
-    'catalogue': {
-        'source_filenames': (
-            #'css/filelist.css',
-            'css/base.css',
-            'datepicker/css/datepicker.css',
-        ),
-        'output_filename': 'compressed/catalogue_styles.css',
-     },
-     'book': {
-        'source_filenames': (
-            'css/book.css',
-        ),
-        'output_filename': 'compressed/book.css',
+PIPELINE = {
+    'PIPELINE_ENABLED': True,
+    'CSS_COMPRESSOR': None,
+    'JS_COMPRESSOR': None,
+    '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/dialogs.css',
+            ),
+            'output_filename': 'compressed/detail_styles.css',
+        },
+        'catalogue': {
+            'source_filenames': (
+                # 'css/filelist.css',
+                'css/base.css',
+                'datepicker/css/datepicker.css',
+                'js/lib/chosen-1.6.2/bootstrap-chosen.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',
+        },
     },
-    '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,33 +86,35 @@ PIPELINE_JS = {
                 'js/wiki/view_annotations.js',
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
-        ),
-        'output_filename': 'compressed/detail_scripts.js',
-     },
-    'catalogue': {
-        'source_filenames': (
+            ),
+            'output_filename': 'compressed/detail_scripts.js',
+        },
+        'catalogue': {
+            'source_filenames': (
                 'js/catalogue/catalogue.js',
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
                 'datepicker/js/bootstrap-datepicker.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',
-         },
-    'book_list': {
-        'source_filenames': (
-            'contextmenu/jquery.ui.position.js',
-            'contextmenu/jquery.contextMenu.js',
-            'js/catalogue/book_list.js',
-        ),
-        'output_filename': 'compressed/book_list.js',
+                'js/lib/chosen-1.6.2/chosen.jquery.min.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',
+        },
+        'book_list': {
+            'source_filenames': (
+                'contextmenu/jquery.ui.position.js',
+                'contextmenu/jquery.contextMenu.js',
+                'js/catalogue/book_list.js',
+            ),
+            'output_filename': 'compressed/book_list.js',
+        }
     }
 }