fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oh, right
[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
aa2a203
..
40e38c3
100644
(file)
--- a/
edumed/settings.d/50-static.py
+++ b/
edumed/settings.d/50-static.py
@@
-25,6
+25,9
@@
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',
+
+ 'css/forum.scss',
+ 'css/mil.scss'
),
'output_filename': 'compressed/base.css',
},
),
'output_filename': 'compressed/base.css',
},
@@
-36,14
+39,26
@@
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/
carousel
.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',
),
'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 = (