fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix banner
[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
40e38c3
..
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.Gzip
PipelineCachedStorage'
PIPELINE_CSS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = None
PIPELINE_CSS = {
PIPELINE_CSS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = None
PIPELINE_CSS = {
@@
-25,6
+25,7
@@
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'
'css/forum.scss',
'css/mil.scss'
@@
-47,6
+48,7
@@
PIPELINE_JS = {
'curriculum/curriculum.js',
'js/formset.js',
'pybb/js/pybbjs.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',
},
@@
-64,5
+66,3
@@
PIPELINE_JS = {
PIPELINE_COMPILERS = (
'pipeline.compilers.sass.SASSCompiler',
)
PIPELINE_COMPILERS = (
'pipeline.compilers.sass.SASSCompiler',
)
-
-PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'