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

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 43150e47..61437292 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,30 +24,30 @@ COMPRESS_CSS = {
             'css/jquery.autocomplete.css',
             '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',         
+        'output_filename': 'compressed/book.css',
     },
     'book_list': {
         'source_filenames': (
             'contextmenu/jquery.contextMenu.css',
             'css/book_list.css',
         ),
-        'output_filename': 'compressed/book_list_?.css',
+        'output_filename': 'compressed/book_list.css',
     },
 }
 
-COMPRESS_JS = {
+PIPELINE_JS = {
     # everything except codemirror
     'detail': {
         'source_filenames': (
@@ -69,7 +82,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',
      },
     'catalogue': {
         'source_filenames': (
@@ -77,7 +90,7 @@ 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': (
@@ -86,7 +99,7 @@ COMPRESS_JS = {
             'js/book_text/jquery.highlightfade.js',
             'js/book_text/book.js',
         ),
-        'output_filename': 'compressed/book_?.js',
+        'output_filename': 'compressed/book.js',
          },
     'book_list': {
         'source_filenames': (
@@ -94,13 +107,6 @@ COMPRESS_JS = {
             'contextmenu/jquery.contextMenu.js',
             'js/catalogue/book_list.js',
         ),
-        'output_filename': 'compressed/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'