Fixes #3314, #3331: Various minor fixes.

[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 a23551f..f2924eb 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 = {


@@ -39,8 +39,10 @@ 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',
             'js/formset.js',
             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',
             'js/formset.js',


@@ -62,5 +64,3 @@ PIPELINE_JS = {
 PIPELINE_COMPILERS = (
   'pipeline.compilers.sass.SASSCompiler',
 )
 PIPELINE_COMPILERS = (
   'pipeline.compilers.sass.SASSCompiler',
 )

-
-PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'