X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f4921ca797953ddab6b35786864b2dd523190503..b899f584abdfe9345c90563bf28661756c959356:/redakcja/settings/compress.py

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 5554aca8..05b3b15a 100644
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -1,5 +1,18 @@
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    '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
-COMPRESS_CSS = {
+PIPELINE_CSS = {
     'detail': {
          'source_filenames': (
             'css/master.css',
@@ -11,25 +24,40 @@ COMPRESS_CSS = {
             'css/jquery.autocomplete.css',
             'css/dialogs.css',
         ),
-        'output_filename': 'compressed/detail_styles_?.css',
+        'output_filename': 'compressed/detail_styles.css',
     },
-    'listing': {
+    'catalogue': {
         'source_filenames': (
-            'css/filelist.css',
+            #'css/filelist.css',
+            'css/base.css',
+            'datepicker/css/datepicker.css',
         ),
-        'output_filename': 'compressed/listing_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': (
                 # 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.xmlns.js',
                 'js/button_scripts.js',
                 'js/slugify.js',
 
@@ -44,7 +72,6 @@ COMPRESS_JS = {
                 # dialogs
                 'js/wiki/dialog_save.js',
                 'js/wiki/dialog_revert.js',
-                'js/wiki/dialog_addtag.js',
                 'js/wiki/dialog_pubmark.js',
 
                 # views
@@ -57,20 +84,32 @@ 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',
      },
-    'listing': {
+    'catalogue': {
         'source_filenames': (
-                'js/lib/jquery-1.4.2.min.js',
+                '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/listing_scripts_?.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'