X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bd743f7ae0f46d0d2a68f80e3c3cf14313d61aa3..3dd7042cbf47824b9bbcb3068f5360fd66aa662f:/redakcja/settings/compress.py?ds=inline diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py index 5637cee6..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', @@ -18,15 +31,27 @@ COMPRESS_CSS = { 'css/filelist.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', @@ -63,14 +88,25 @@ COMPRESS_JS = { 'source_filenames': ( 'js/catalogue/catalogue.js', 'js/slugify.js', + 'email_mangler/email_mangler.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'