X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/73ef2b8442dc95f8b7279de812c30ac8626d5f39..1e373b12f008865c90a75cc56202d8adde06e2b7:/redakcja/settings/compress.py?ds=inline

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 34cfa2ff..9bee6706 100644
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -1,5 +1,19 @@
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    'pipeline.finders.PipelineFinder',
+)
+
+
+STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+PIPELINE_CSS_COMPRESSOR = None
+PIPELINE_JS_COMPRESSOR = None
+PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'
+
+
 # CSS and JS files to compress
-COMPRESS_CSS = {
+PIPELINE_CSS = {
     'detail': {
          'source_filenames': (
             'css/master.css',
@@ -12,17 +26,30 @@ COMPRESS_CSS = {
             'css/imgareaselect-default.css', #img!
             'css/dialogs.css',
         ),
-        'output_filename': 'compressed/detail_styles_?.css',
+        'output_filename': 'compressed/detail_styles.css',
     },
     'catalogue': {
         'source_filenames': (
             'css/filelist.css',
         ),
-        'output_filename': 'compressed/catalogue_styles_?.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',
+    },
 }
 
-COMPRESS_JS = {
+PIPELINE_JS = {
     # everything except codemirror
     'detail': {
         'source_filenames': (
@@ -57,7 +84,7 @@ COMPRESS_JS = {
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.js',
         ),
-        'output_filename': 'compressed/detail_scripts_?.js',
+        'output_filename': 'compressed/detail_scripts.js',
      },
     'wiki_img': {
         'source_filenames': (
@@ -75,20 +102,21 @@ COMPRESS_JS = {
 
                 # base UI
                 'js/wiki_img/base.js',
-                'js/wiki_img/toolbar.js',
+                'js/wiki/toolbar.js',
 
                 # dialogs
-                'js/wiki_img/dialog_save.js',
-                'js/wiki_img/dialog_addtag.js',
+                'js/wiki/dialog_save.js',
+                'js/wiki/dialog_revert.js',
+                'js/wiki/dialog_pubmark.js',
 
                 # views
-                'js/wiki_img/view_summary.js',
                 'js/wiki_img/view_editor_objects.js',
                 'js/wiki_img/view_editor_motifs.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',
+        'output_filename': 'compressed/detail_img_scripts.js',
      },
     'catalogue': {
         'source_filenames': (
@@ -96,13 +124,23 @@ COMPRESS_JS = {
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
         ),
-        'output_filename': 'compressed/catalogue_scripts_?.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'