X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/43116c58e5c56f94ef358a5a17fb13a252e02531..f67de73a6cabbef2d84dc79706cbeb4441800860:/redakcja/settings/compress.py diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py index c56592d0..9bee6706 100644 --- a/redakcja/settings/compress.py +++ b/redakcja/settings/compress.py @@ -2,6 +2,7 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', # 'django.contrib.staticfiles.finders.DefaultStorageFinder', + 'pipeline.finders.PipelineFinder', ) @@ -22,28 +23,29 @@ PIPELINE_CSS = { 'css/summary.css', 'css/html.css', 'css/jquery.autocomplete.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', + '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', }, } @@ -82,7 +84,39 @@ PIPELINE_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': ( + # 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.imgareaselect.js', + 'js/button_scripts.js', + 'js/slugify.js', + + # wiki scripts + 'js/wiki_img/wikiapi.js', + + # base UI + 'js/wiki_img/base.js', + 'js/wiki/toolbar.js', + + # dialogs + 'js/wiki/dialog_save.js', + 'js/wiki/dialog_revert.js', + 'js/wiki/dialog_pubmark.js', + + # views + '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', }, 'catalogue': { 'source_filenames': ( @@ -90,7 +124,7 @@ PIPELINE_JS = { 'js/slugify.js', 'email_mangler/email_mangler.js', ), - 'output_filename': 'compressed/catalogue_scripts_?.js', + 'output_filename': 'compressed/catalogue_scripts.js', }, 'book': { 'source_filenames': ( @@ -99,7 +133,7 @@ PIPELINE_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': ( @@ -107,6 +141,6 @@ PIPELINE_JS = { 'contextmenu/jquery.contextMenu.js', 'js/catalogue/book_list.js', ), - 'output_filename': 'compressed/book_list_?.js', + 'output_filename': 'compressed/book_list.js', } }