X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d7faec10cb85ad286673eec266ccc397142bc20c..43116c58e5c56f94ef358a5a17fb13a252e02531:/redakcja/settings/compress.py diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py index d0f0df9f..c56592d0 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', @@ -28,12 +41,13 @@ COMPRESS_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': ( @@ -96,10 +110,3 @@ COMPRESS_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'