Just removing old cruft.

[redakcja.git] / redakcja / settings / compress.py

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 43150e4..9bee670 100644 (file)
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -1,5 +1,19 @@
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    'pipeline.finders.PipelineFinder',
+)
+
+
+STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+PIPELINE_CSS_COMPRESSOR = None
+PIPELINE_JS_COMPRESSOR = None
+PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'
+
+

 # CSS and JS files to compress
 # CSS and JS files to compress

-COMPRESS_CSS = {
+PIPELINE_CSS = {

     'detail': {
          'source_filenames': (
             'css/master.css',
     'detail': {
          'source_filenames': (
             'css/master.css',


@@ -9,32 +23,33 @@ COMPRESS_CSS = {
             'css/summary.css',
             'css/html.css',
             'css/jquery.autocomplete.css',
             'css/summary.css',
             'css/html.css',
             'css/jquery.autocomplete.css',

+            'css/imgareaselect-default.css', #img!

             'css/dialogs.css',
         ),
             'css/dialogs.css',
         ),

-        'output_filename': 'compressed/detail_styles_?.css',
+        'output_filename': 'compressed/detail_styles.css',

     },
     'catalogue': {
         'source_filenames': (
             'css/filelist.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',
         ),
      },
      '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',
         ),
     },
     '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': (
     # everything except codemirror
     'detail': {
         'source_filenames': (


@@ -69,7 +84,39 @@ COMPRESS_JS = {
                 'js/wiki/view_search.js',
                 'js/wiki/view_column_diff.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': (
      },
     'catalogue': {
         'source_filenames': (


@@ -77,7 +124,7 @@ COMPRESS_JS = {
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
         ),
                 'js/slugify.js',
                 'email_mangler/email_mangler.js',
         ),

-        'output_filename': 'compressed/catalogue_scripts_?.js',
+        'output_filename': 'compressed/catalogue_scripts.js',

      },
      'book': {
         'source_filenames': (
      },
      'book': {
         'source_filenames': (


@@ -86,7 +133,7 @@ COMPRESS_JS = {
             'js/book_text/jquery.highlightfade.js',
             'js/book_text/book.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': (
          },
     'book_list': {
         'source_filenames': (


@@ -94,13 +141,6 @@ COMPRESS_JS = {
             'contextmenu/jquery.contextMenu.js',
             'js/catalogue/book_list.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'