Change JSONField implementation

[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 835c8a5..43dbb7c 100644 (file)
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@ -26,7 +26,8 @@ PIPELINE_CSS = {
           'curriculum/curriculum.scss',
           'jquery/colorbox/colorbox.css',
 
           'curriculum/curriculum.scss',
           'jquery/colorbox/colorbox.css',
 

-          'css/annoy.css',
+          'css/forum.scss',
+          'css/mil.scss'

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


@@ -42,8 +43,8 @@ PIPELINE_JS = {
             'catalogue/js/lesson.js',
             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',
             'catalogue/js/lesson.js',
             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',

-
-            'js/annoy.js',
+            'js/formset.js',
+            'pybb/js/pybbjs.js',

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