fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
force non-empty answers
[edumed.git]
/
edumed
/
settings
/
static.py
diff --git
a/edumed/settings/static.py
b/edumed/settings/static.py
index
98da70c
..
19a69ca
100644
(file)
--- a/
edumed/settings/static.py
+++ b/
edumed/settings/static.py
@@
-23,17
+23,10
@@
PIPELINE_CSS = {
'css/base.scss',
'css/main.scss',
'css/form.scss',
'css/base.scss',
'css/main.scss',
'css/form.scss',
- 'catalogue/css/carousel.scss',
'catalogue/css/layout.scss',
'catalogue/css/layout.scss',
- 'catalogue/css/lesson.scss',
'catalogue/css/exercise.scss',
'catalogue/css/exercise.scss',
- 'catalogue/css/section_list.scss',
- 'curriculum/curriculum.scss',
'jquery/colorbox/colorbox.css',
'fnpdjango/annoy/annoy.css',
'jquery/colorbox/colorbox.css',
'fnpdjango/annoy/annoy.css',
-
- 'css/forum.scss',
- 'css/mil.scss'
),
'output_filename': 'compressed/base.css',
},
),
'output_filename': 'compressed/base.css',
},
@@
-41,18
+34,12
@@
PIPELINE_CSS = {
PIPELINE_JS = {
'base': {
'source_filenames': (
PIPELINE_JS = {
'base': {
'source_filenames': (
- 'catalogue/js/jquery-ui-1.10.0.custom.js',
- 'catalogue/js/jquery.cycle.all.js',
'jquery/colorbox/jquery.colorbox-min.js',
'jquery/colorbox/jquery.colorbox-pl.js',
'jquery/colorbox/jquery.colorbox-min.js',
'jquery/colorbox/jquery.colorbox-pl.js',
- '
catalogue/js/carouse
l.js',
+ '
jquery/jquery.cycle.al
l.js',
'catalogue/js/edumed.js',
'catalogue/js/edumed.js',
- 'catalogue/js/lesson.js',
- 'catalogue/js/lesson-list.js',
'sponsors/js/sponsors.js',
'sponsors/js/sponsors.js',
- 'curriculum/curriculum.js',
'js/formset.js',
'js/formset.js',
- 'pybb/js/pybbjs.js',
'fnpdjango/annoy/annoy.js',
'js/checkfile.js',
),
'fnpdjango/annoy/annoy.js',
'js/checkfile.js',
),
@@
-60,7
+47,7
@@
PIPELINE_JS = {
},
'wtem': {
'source_filenames': (
},
'wtem': {
'source_filenames': (
- '
catalogue/
js/jquery-ui-1.10.0.custom.js',
+ 'js/jquery-ui-1.10.0.custom.js',
'wtem/edumed.js',
'wtem/wtem.js',
'wtem/json2.js'
'wtem/edumed.js',
'wtem/wtem.js',
'wtem/json2.js'