Merge branch 'obrazy' into rwd

[wolnelektury.git] / wolnelektury / settings / static.py

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 798f5af..a6f5d1b 100644 (file)
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -47,6 +47,13 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/compressed/book_text.css',
     },
         ],
         'output_filename': 'css/compressed/book_text.css',
     },

+    'picture': {
+        'source_filenames': [
+            'css/master.book.css',
+            'css/master.picture.css',
+        ],
+        'output_filename': 'css/compressed/picture.css',
+    },

     'player': {
         'source_filenames': [
             'jplayer/jplayer.blue.monday.css', 
     'player': {
         'source_filenames': [
             'jplayer/jplayer.blue.monday.css', 


@@ -101,13 +108,20 @@ PIPELINE_JS = {
             'js/jquery.highlightfade.js',
             'js/book_text/other.js',
             'js/book.js',
             'js/jquery.highlightfade.js',
             'js/book_text/other.js',
             'js/book.js',

+            'js/picture.js',
+            'js/raphael-min.js',

             'player/openplayer.js',
             'player/openplayer.js',

+            'js/progressSpin.min.js',

         ],
         'output_filename': 'js/book.min.js',
     },
     'book_text': {
         'source_filenames': [
         ],
         'output_filename': 'js/book.min.js',
     },
     'book_text': {
         'source_filenames': [

+            'js/jquery.form.js',
+            'js/jquery.jqmodal.js',

             'js/book_text/*.js',
             'js/book_text/*.js',

+            'js/locale.js',
+            'js/dialogs.js',

         ],
         'output_filename': 'js/book_text.js',
     },
         ],
         'output_filename': 'js/book_text.js',
     },