X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/3268c2681874b53c1a9fbda5f7ab1388d62226b4..8f939c57adbcfa3bb6f2ab9625881495140c4501:/edumed/settings.d/50-static.py?ds=sidebyside diff --git a/edumed/settings.d/50-static.py b/edumed/settings.d/50-static.py index 23de9b2..40e38c3 100644 --- a/edumed/settings.d/50-static.py +++ b/edumed/settings.d/50-static.py @@ -15,15 +15,19 @@ PIPELINE_JS_COMPRESSOR = None PIPELINE_CSS = { 'base': { 'source_filenames': ( - 'jquery/colorbox/colorbox.css', 'css/base.scss', 'css/main.scss', + 'css/form.scss', 'catalogue/css/carousel.scss', 'catalogue/css/layout.scss', 'catalogue/css/lesson.scss', 'catalogue/css/exercise.scss', 'catalogue/css/section_list.scss', 'curriculum/curriculum.scss', + 'jquery/colorbox/colorbox.css', + + 'css/forum.scss', + 'css/mil.scss' ), 'output_filename': 'compressed/base.css', }, @@ -35,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/carousel.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', + 'js/formset.js', + 'pybb/js/pybbjs.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 = (