Merge branch 'forum'

[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 5be1fac..4d75c9a 100644 (file)
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@ -17,7 +17,16 @@ PIPELINE_CSS = {
         'source_filenames': (
           'css/base.scss',
           'css/main.scss',
         'source_filenames': (
           'css/base.scss',
           'css/main.scss',

+          'css/form.scss',

           'catalogue/css/carousel.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',

         ),
         'output_filename': 'compressed/base.css',
     },
         ),
         'output_filename': 'compressed/base.css',
     },


@@ -25,6 +34,16 @@ 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',
+            'catalogue/js/edumed.js',
+            'catalogue/js/lesson.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',
     },