Merge branch 'img-playground' of ssh://epsilon.fnp/home/rczajka/workspace/redakcja...

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

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index 5637cee..ddd0aec 100644 (file)
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -9,6 +9,7 @@ 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',
         ),
         'output_filename': 'compressed/detail_styles_?.css',
             'css/dialogs.css',
         ),
         'output_filename': 'compressed/detail_styles_?.css',


@@ -26,7 +27,6 @@ COMPRESS_JS = {
     'detail': {
         'source_filenames': (
                 # libraries
     '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',
                 'js/lib/jquery/jquery.autocomplete.js',
                 'js/lib/jquery/jquery.blockui.js',
                 'js/lib/jquery/jquery.elastic.js',


@@ -59,10 +59,43 @@ COMPRESS_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': (
                 'js/catalogue/catalogue.js',
                 'js/slugify.js',
     'catalogue': {
         'source_filenames': (
                 'js/catalogue/catalogue.js',
                 'js/slugify.js',

+                'email_mangler/email_mangler.js',

         ),
         'output_filename': 'compressed/catalogue_scripts_?.js',
      }
         ),
         'output_filename': 'compressed/catalogue_scripts_?.js',
      }