Merge branch 'edumed' of https://github.com/fnp/redakcja into edumed

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

diff --git a/redakcja/settings/compress.py b/redakcja/settings/compress.py
index db72c00..31e86b4 100644 (file)
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@ -13,12 +13,25 @@ COMPRESS_CSS = {
         ),
         'output_filename': 'compressed/detail_styles_?.css',
     },
         ),
         'output_filename': 'compressed/detail_styles_?.css',
     },

-    'listing': {
+    'catalogue': {

         'source_filenames': (
             'css/filelist.css',
         ),
         'source_filenames': (
             'css/filelist.css',
         ),

-        'output_filename': 'compressed/listing_styles_?.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 = {
 }
 
 COMPRESS_JS = {


@@ -26,7 +39,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',


@@ -37,6 +49,7 @@ COMPRESS_JS = {
                 # wiki scripts
                 'js/wiki/wikiapi.js',
                 'js/wiki/xslt.js',
                 # wiki scripts
                 'js/wiki/wikiapi.js',
                 'js/wiki/xslt.js',

+                'js/wiki/xml-tools.js',

 
                 # base UI
                 'js/wiki/base.js',
 
                 # base UI
                 'js/wiki/base.js',


@@ -59,13 +72,31 @@ COMPRESS_JS = {
         ),
         'output_filename': 'compressed/detail_scripts_?.js',
      },
         ),
         'output_filename': 'compressed/detail_scripts_?.js',
      },

-    'listing': {
+    'catalogue': {

         'source_filenames': (
         'source_filenames': (

-                'js/lib/jquery-1.4.2.min.js',
+                'js/catalogue/catalogue.js',

                 'js/slugify.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/listing_scripts_?.js',
-     }
+        'output_filename': 'compressed/book_list_?.js',
+    }

 }
 
 COMPRESS = True
 }
 
 COMPRESS = True