Merge remote-tracking branch 'origin/filmowa' into filmowa

[edumed.git] / edumed / settings.d / 50-static.py

diff --git a/edumed/settings.d/50-static.py b/edumed/settings.d/50-static.py
index 4013a66..c667c32 100644 (file)
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@ -9,7 +9,7 @@ STATICFILES_FINDERS = (
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 

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

 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 PIPELINE_CSS = {
 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 PIPELINE_CSS = {


@@ -25,6 +25,10 @@ PIPELINE_CSS = {
           'catalogue/css/section_list.scss',
           'curriculum/curriculum.scss',
           'jquery/colorbox/colorbox.css',
           'catalogue/css/section_list.scss',
           'curriculum/curriculum.scss',
           'jquery/colorbox/colorbox.css',

+          'fnpdjango/annoy/annoy.css',
+
+          'css/forum.scss',
+          'css/mil.scss'

         ),
         'output_filename': 'compressed/base.css',
     },
         ),
         'output_filename': 'compressed/base.css',
     },


@@ -36,17 +40,29 @@ PIPELINE_JS = {
             'catalogue/js/jquery.cycle.all.js',
             'jquery/colorbox/jquery.colorbox-min.js',
             'jquery/colorbox/jquery.colorbox-pl.js',
             'catalogue/js/jquery.cycle.all.js',
             'jquery/colorbox/jquery.colorbox-min.js',
             'jquery/colorbox/jquery.colorbox-pl.js',

+            'catalogue/js/carousel.js',

             'catalogue/js/edumed.js',
             'catalogue/js/lesson.js',
             'catalogue/js/edumed.js',
             'catalogue/js/lesson.js',

+            'catalogue/js/lesson-list.js',

             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',
             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',

+            'js/formset.js',
+            'pybb/js/pybbjs.js',
+            'fnpdjango/annoy/annoy.js',

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

+    'wtem': {
+        'source_filenames': (
+            'catalogue/js/jquery-ui-1.10.0.custom.js',
+            'wtem/edumed.js',
+            'wtem/wtem.js',
+            'wtem/json2.js'
+        ),
+        'output_filename': 'compressed/wtem.js'
+    },

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

-
-PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'