X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c6939b2a92556332eaab2cbbfd61a0e6798091c7..da000570285d53adef7dd9d799ee49398e0e370b:/wolnelektury/settings/static.py

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 1e8bd9628..472b2e978 100644
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -14,36 +14,25 @@ MEDIA_URL = '/media/'
 STATIC_URL = '/static/'
 
 # CSS and JavaScript file groups
+
+
 PIPELINE_CSS = {
-    'all': {
+    'main': {
         # styles both for mobile and for big screen
         'source_filenames': [
             'css/jquery.countdown.css', 
 
-            'css/base.css',
-            'css/cite.css',
-            'css/header.css',
-            'css/main_page.css',
-            'css/dialogs.css',
-            'css/picture_box.css',
-            'css/book_box.css',
-            'css/catalogue.css',
             'sponsors/css/sponsors.css',
-            'css/auth.css',
-            'funding/funding.scss',
-            'polls/polls.scss',
-            'css/form.scss',
-
             'css/social/shelf_tags.css',
+
+            'uni_form/uni-form.css',
+            'uni_form/default.uni-form.css',
+
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
+
+            'scss/main.scss',
         ],
-        'output_filename': 'css/compressed/all.css',
-    },
-    'ie': {
-        'source_filenames': [
-            'css/ie.css',
-        ],
-        'output_filename': 'css/compressed/ie.css',
+        'output_filename': 'css/compressed/main.css',
     },
     'book': {
         'source_filenames': [
@@ -51,6 +40,15 @@ PIPELINE_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',
@@ -92,6 +90,8 @@ PIPELINE_JS = {
             'player/openplayer.js',
             'js/search.js',
             'funding/funding.js',
+            
+            'uni_form/uni-form.js',
             ),
         'output_filename': 'js/base.min.js',
     },
@@ -108,13 +108,30 @@ PIPELINE_JS = {
             'js/jquery.eventdelegation.js',
             'js/jquery.scrollto.js',
             'js/jquery.highlightfade.js',
+            'js/book_text/other.js',
             'js/book.js',
+
+            'js/raphael-min.js',
+            'js/progressSpin.min.js',
             'js/picture.js',
+        ],
+        'output_filename': 'js/book.min.js',
+    },
+    'book_text': {
+        'source_filenames': [
+            'js/jquery.form.js',
+            'js/jquery.jqmodal.js',
+            'js/book_text/*.js',
+            'js/locale.js',
+            'js/dialogs.js',
+
+            'js/jquery.highlightfade.js',
             'js/raphael-min.js',
             'player/openplayer.js',
             'js/progressSpin.min.js',
+            'js/picture.js',
         ],
-        'output_filename': 'js/book.min.js',
+        'output_filename': 'js/book_text.js',
     },
     'book_ie': {
         'source_filenames': ('js/ierange-m2.js',),
@@ -128,7 +145,12 @@ 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 /home/staging/wolnelektury.pl/ve/bin/pyscss'
-PIPELINE_PYSCSS_ARGUMENTS = ''
+#PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
+#PIPELINE_PYSCSS_ARGUMENTS = ''