Merge branch 'obrazy' into rwd

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

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 8d0e5be..a6f5d1b 100644 (file)
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -1,5 +1,5 @@
 from os import path
 from os import path

-from settings.paths import PROJECT_DIR
+from .paths import PROJECT_DIR

 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"


@@ -14,44 +14,45 @@ MEDIA_URL = '/media/'
 STATIC_URL = '/static/'
 
 # CSS and JavaScript file groups
 STATIC_URL = '/static/'
 
 # CSS and JavaScript file groups

+
+

 PIPELINE_CSS = {
 PIPELINE_CSS = {

-    'all': {
+    'main': {

         # styles both for mobile and for big screen
         'source_filenames': [
             'css/jquery.countdown.css', 
 
         # 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',
             'sponsors/css/sponsors.css',

-            'css/auth.css',
-            'funding/funding.scss',
-

             'css/social/shelf_tags.css',
             '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',
 
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 

-            'css/annoy.css',
+            'scss/main.scss',
+        ],
+        'output_filename': 'css/compressed/main.css',
+    },
+    'book': {
+        'source_filenames': [
+            'css/master.book.css',

         ],
         ],

-        'output_filename': 'css/compressed/all.css',
+        'output_filename': 'css/compressed/book.css',

     },
     },

-    'ie': {
+    'book_text': {

         'source_filenames': [
         'source_filenames': [

-            'css/ie.css',
+            'scss/book_text.scss',
+            'css/new.book.css',

         ],
         ],

-        'output_filename': 'css/compressed/ie.css',
+        'output_filename': 'css/compressed/book_text.css',

     },
     },

-    'book': {
+    'picture': {

         'source_filenames': [
             'css/master.book.css',
         'source_filenames': [
             'css/master.book.css',

-
-            'css/annoy.css',
+            'css/master.picture.css',

         ],
         ],

-        'output_filename': 'css/compressed/book.css',
+        'output_filename': 'css/compressed/picture.css',

     },
     'player': {
         'source_filenames': [
     },
     'player': {
         'source_filenames': [


@@ -86,8 +87,9 @@ PIPELINE_JS = {
             'sponsors/js/sponsors.js',
             'player/openplayer.js',
             'js/search.js',
             'sponsors/js/sponsors.js',
             'player/openplayer.js',
             'js/search.js',

-
-            'js/annoy.js',
+            'funding/funding.js',
+            
+            'uni_form/uni-form.js',

             ),
         'output_filename': 'js/base.min.js',
     },
             ),
         'output_filename': 'js/base.min.js',
     },


@@ -104,13 +106,25 @@ PIPELINE_JS = {
             'js/jquery.eventdelegation.js',
             'js/jquery.scrollto.js',
             'js/jquery.highlightfade.js',
             'js/jquery.eventdelegation.js',
             'js/jquery.scrollto.js',
             'js/jquery.highlightfade.js',

+            'js/book_text/other.js',

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

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

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

-
-            'js/annoy.js',
+            'js/progressSpin.min.js',

         ],
         'output_filename': 'js/book.min.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',
+        ],
+        'output_filename': 'js/book_text.js',
+    },

     'book_ie': {
         'source_filenames': ('js/ierange-m2.js',),
         'output_filename': 'js/book_ie.min.js',
     'book_ie': {
         'source_filenames': ('js/ierange-m2.js',),
         'output_filename': 'js/book_ie.min.js',


@@ -124,4 +138,11 @@ PIPELINE_JS_COMPRESSOR = None
 
 PIPELINE_COMPILERS = (
     'pipeline.compilers.sass.SASSCompiler',
 
 PIPELINE_COMPILERS = (
     '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 = ''