Minor fixups.

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

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 472b2e9..ebce200 100644 (file)
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -20,10 +20,9 @@ PIPELINE_CSS = {
     'main': {
         # styles both for mobile and for big screen
         'source_filenames': [
     'main': {
         # styles both for mobile and for big screen
         'source_filenames': [

-            'css/jquery.countdown.css', 
+            'css/jquery.countdown.css',

 
             'sponsors/css/sponsors.css',
 
             'sponsors/css/sponsors.css',

-            'css/social/shelf_tags.css',

 
             'uni_form/uni-form.css',
             'uni_form/default.uni-form.css',
 
             'uni_form/uni-form.css',
             'uni_form/default.uni-form.css',


@@ -58,8 +57,8 @@ PIPELINE_CSS = {
     },
     'player': {
         'source_filenames': [
     },
     'player': {
         'source_filenames': [

-            'jplayer/jplayer.blue.monday.css', 
-            'player/player.css', 
+            'jplayer/jplayer.blue.monday.css',
+            'player/player.css',

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


@@ -67,20 +66,24 @@ PIPELINE_CSS = {
         'source_filenames': ('css/simple.css',),
         'output_filename': 'css/compressed/simple.css',
     },
         'source_filenames': ('css/simple.css',),
         'output_filename': 'css/compressed/simple.css',
     },

+    'widget': {
+        'source_filenames': ('scss/widget.scss',),
+        'output_filename': 'css/compressed/widget.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',


@@ -90,59 +93,67 @@ PIPELINE_JS = {
             'player/openplayer.js',
             'js/search.js',
             'funding/funding.js',
             'player/openplayer.js',
             'js/search.js',
             'funding/funding.js',

-            
+

             'uni_form/uni-form.js',
             ),
         'output_filename': 'js/base.min.js',
     },
     'player': {
         'source_filenames': [
             'uni_form/uni-form.js',
             ),
         'output_filename': 'js/base.min.js',
     },
     'player': {
         'source_filenames': [

-            'jplayer/jquery.jplayer.min.js', 
-            'jplayer/jplayer.playlist.min.js', 
-            'player/player.js', 
+            'jplayer/jquery.jplayer.min.js',
+            'jplayer/jplayer.playlist.min.js',
+            'player/player.js',

         ],
         'output_filename': 'js/player.min.js',
     },
     'book': {
         'source_filenames': [
         ],
         'output_filename': 'js/player.min.js',
     },
     '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_text/other.js',
             'js/book.js',
 

-            'js/raphael-min.js',
-            'js/progressSpin.min.js',
+            'js/contrib/raphael-min.js',
+            'js/contrib/progressSpin.min.js',

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

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

             'js/book_text/*.js',
             'js/locale.js',
             'js/dialogs.js',
 
             'js/book_text/*.js',
             'js/locale.js',
             'js/dialogs.js',
 

-            'js/jquery.highlightfade.js',
-            'js/raphael-min.js',
+            'js/contrib/jquery.highlightfade.js',
+            'js/contrib/raphael-min.js',

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

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

             'js/picture.js',
         ],
         'output_filename': 'js/book_text.js',
     },
     'book_ie': {
             'js/picture.js',
         ],
         'output_filename': 'js/book_text.js',
     },
     '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',

-    }
-
+    },
+    'widget': {
+        'source_filenames': (
+            'js/contrib/jquery.js',
+            'js/contrib/jquery-ui-1.8.16.custom.min.js',
+            'js/search.js',
+            'js/widget_run.js',
+        ),
+        'output_filename': 'js/widget.min.js',
+    },

 }
 
 }
 

-STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+STATICFILES_STORAGE = 'fnpdjango.utils.pipeline_storage.GzipPipelineCachedStorage'

 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_CSS_COMPRESSOR = None

-PIPELINE_JS_COMPRESSOR = None
+PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'

 
 PIPELINE_COMPILERS = (
     'pipeline.compilers.sass.SASSCompiler',
 
 PIPELINE_COMPILERS = (
     'pipeline.compilers.sass.SASSCompiler',