minor fix

[redakcja.git] / redakcja / settings / compress.py

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 7207f1b..4ded9c0 100644 (file)
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -1,35 +1,66 @@
-# CSS and JS files to compress
-COMPRESS_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',
-    },
-    'listing': {
-        'source_filenames': (
-            'css/filelist.css',
-        ),
-        'output_filename': 'compressed/listing_styles_?.css',
-     }
-}
+# -*- 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',
+)
+
+STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'

 
 

-COMPRESS_JS = {
-    # everything except codemirror
-    'detail': {
-        'source_filenames': (
+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',
+        },
+    },
+    'JAVASCRIPT': {
+        # everything except codemirror
+        'detail': {
+            'source_filenames': (

                 # libraries
                 # libraries

-                'js/lib/jquery-1.4.2.min.js',

                 'js/lib/jquery/jquery.autocomplete.js',
                 'js/lib/jquery/jquery.blockui.js',
                 'js/lib/jquery/jquery.elastic.js',
                 'js/lib/jquery/jquery.autocomplete.js',
                 'js/lib/jquery/jquery.blockui.js',
                 'js/lib/jquery/jquery.elastic.js',

+                'js/lib/jquery/jquery.xmlns.js',

                 'js/button_scripts.js',
                 'js/slugify.js',
 
                 'js/button_scripts.js',
                 'js/slugify.js',
 


@@ -43,7 +74,8 @@ COMPRESS_JS = {
 
                 # dialogs
                 'js/wiki/dialog_save.js',
 
                 # dialogs
                 'js/wiki/dialog_save.js',

-                'js/wiki/dialog_addtag.js',
+                'js/wiki/dialog_revert.js',
+                'js/wiki/dialog_pubmark.js',

 
                 # views
                 'js/wiki/view_history.js',
 
                 # views
                 'js/wiki/view_history.js',


@@ -51,22 +83,38 @@ COMPRESS_JS = {
                 'js/wiki/view_editor_source.js',
                 'js/wiki/view_editor_wysiwyg.js',
                 'js/wiki/view_gallery.js',
                 'js/wiki/view_editor_source.js',
                 'js/wiki/view_editor_wysiwyg.js',
                 'js/wiki/view_gallery.js',

+                'js/wiki/view_annotations.js',
+                'js/wiki/view_search.js',

                 'js/wiki/view_column_diff.js',
                 'js/wiki/view_column_diff.js',

-        ),
-        'output_filename': 'compressed/detail_scripts_?.js',
-     },
-    'listing': {
-        'source_filenames': (
-                'js/lib/jquery-1.4.2.min.js',
+            ),
+            'output_filename': 'compressed/detail_scripts.js',
+        },
+        'catalogue': {
+            'source_filenames': (
+                'js/catalogue/catalogue.js',

                 'js/slugify.js',
                 'js/slugify.js',

-        ),
-        'output_filename': 'compressed/listing_scripts_?.js',
-     }
+                'email_mangler/email_mangler.js',
+                'datepicker/js/bootstrap-datepicker.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',
+        }
+    }

 }
 }

-
-COMPRESS = True
-COMPRESS_CSS_FILTERS = None
-COMPRESS_JS_FILTERS = None
-COMPRESS_AUTO = True
-COMPRESS_VERSION = True
-COMPRESS_VERSIONING = 'compress.versioning.hash.MD5Versioning'