fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use BofhFileSystemStorage where file names are preset.
[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
5b6c079
..
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.Gzip
PipelineCachedStorage'
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',
@@
-50,8
+52,10
@@
PIPELINE_JS = {
},
'wtem': {
'source_filenames': (
},
'wtem': {
'source_filenames': (
+ 'catalogue/js/jquery-ui-1.10.0.custom.js',
'wtem/edumed.js',
'wtem/wtem.js',
'wtem/edumed.js',
'wtem/wtem.js',
+ 'wtem/json2.js'
),
'output_filename': 'compressed/wtem.js'
},
),
'output_filename': 'compressed/wtem.js'
},
@@
-60,5
+64,3
@@
PIPELINE_JS = {
PIPELINE_COMPILERS = (
'pipeline.compilers.sass.SASSCompiler',
)
PIPELINE_COMPILERS = (
'pipeline.compilers.sass.SASSCompiler',
)
-
-PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'