Celery 3.1, librarian update

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

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 9cdc60b..2bfcd25 100644 (file)
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -30,7 +30,7 @@ PIPELINE_CSS = {
 
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 
 
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 

-            'scss/all.scss',
+            'scss/main.scss',

         ],
         'output_filename': 'css/compressed/main.css',
     },
         ],
         'output_filename': 'css/compressed/main.css',
     },


@@ -40,6 +40,22 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/compressed/book.css',
     },
         ],
         'output_filename': 'css/compressed/book.css',
     },

+    'book_text': {
+        'source_filenames': [
+            'scss/book_text.scss',
+            'css/new.book.css',
+
+            'css/master.picture.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', 


@@ -56,15 +72,15 @@ PIPELINE_CSS = {
 PIPELINE_JS = {
     'base': {
         'source_filenames': (
 PIPELINE_JS = {
     'base': {
         'source_filenames': (

-            'js/jquery.cycle.min.js',
-            'js/jquery.jqmodal.js',
-            'js/jquery.form.js',
-            'js/jquery.countdown.js', 'js/jquery.countdown-pl.js',
-            'js/jquery.countdown-de.js', 'js/jquery.countdown-uk.js',
-            'js/jquery.countdown-es.js', 'js/jquery.countdown-lt.js',
-            'js/jquery.countdown-ru.js', 'js/jquery.countdown-fr.js',
+            'js/contrib/jquery.cycle.min.js',
+            'js/contrib/jquery.jqmodal.js',
+            'js/contrib/jquery.form.js',
+            'js/contrib/jquery.countdown.js', 'js/contrib/jquery.countdown-pl.js',
+            'js/contrib/jquery.countdown-de.js', 'js/contrib/jquery.countdown-uk.js',
+            'js/contrib/jquery.countdown-es.js', 'js/contrib/jquery.countdown-lt.js',
+            'js/contrib/jquery.countdown-ru.js', 'js/contrib/jquery.countdown-fr.js',

 
 

-            'js/jquery-ui-1.8.16.custom.min.js',
+            'js/contrib/jquery-ui-1.8.16.custom.min.js',

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


@@ -89,27 +105,52 @@ PIPELINE_JS = {
     },
     'book': {
         'source_filenames': [
     },
     'book': {
         'source_filenames': [

-            'js/jquery.eventdelegation.js',
-            'js/jquery.scrollto.js',
-            'js/jquery.highlightfade.js',
+            'js/contrib/jquery.eventdelegation.js',
+            'js/contrib/jquery.scrollto.js',
+            'js/contrib/jquery.highlightfade.js',
+            'js/book_text/other.js',

             'js/book.js',
             'js/book.js',

-            'player/openplayer.js',
+
+            'js/contrib/raphael-min.js',
+            'js/contrib/progressSpin.min.js',
+            'js/picture.js',

         ],
         'output_filename': 'js/book.min.js',
     },
         ],
         'output_filename': 'js/book.min.js',
     },

+    'book_text': {
+        'source_filenames': [
+            'js/contrib/jquery.form.js',
+            'js/contrib/jquery.jqmodal.js',
+            'js/book_text/*.js',
+            'js/locale.js',
+            'js/dialogs.js',
+
+            'js/contrib/jquery.highlightfade.js',
+            'js/contrib/raphael-min.js',
+            'player/openplayer.js',
+            'js/contrib/progressSpin.min.js',
+            'js/picture.js',
+        ],
+        'output_filename': 'js/book_text.js',
+    },

     'book_ie': {
     'book_ie': {

-        'source_filenames': ('js/ierange-m2.js',),
+        'source_filenames': ('js/contrib/ierange-m2.js',),

         'output_filename': 'js/book_ie.min.js',
     }
 
 }
 
         'output_filename': 'js/book_ie.min.js',
     }
 
 }
 

-STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+STATICFILES_STORAGE = 'wolnelektury.utils.GzipPipelineCachedStorage'

 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 
 PIPELINE_COMPILERS = (
 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 
 PIPELINE_COMPILERS = (

-    'pyscss_compiler.PySCSSCompiler',
+    'pipeline.compilers.sass.SASSCompiler',
+    # We could probably use PySCSS instead,
+    # but they have some serious problems, like:
+    # https://github.com/Kronuz/pyScss/issues/166 (empty list syntax)
+    # https://github.com/Kronuz/pyScss/issues/258 (bad @media order)
+    #'pyscss_compiler.PySCSSCompiler',

 )
 )

-PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
-PIPELINE_PYSCSS_ARGUMENTS = ''
+#PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
+#PIPELINE_PYSCSS_ARGUMENTS = ''