Reworked discussion assets management to work on production like environment…

Reworked discussion assets management to work on production like environment (pipelines+nginx proxy)

cms/envs/common.py

@@ -389,6 +389,10 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/cms-style-xmodule-annotations.css',
     },
+    'discussion': {
+        'source_filenames': ['sass/discussion-forum.css'],
+        'output_filename': 'css/cms-style-discussion-forum.css'
+    }
 }
 
 # test_order: Determines the position of this chunk of javascript on

common/lib/xblock/discussion/discussion_forum/utils.py

@@ -11,8 +11,6 @@ from mako.template import Template as MakoTemplate
 
 from rooted_paths import rooted_glob
 
-discussion_js = sorted(rooted_glob(settings.COMMON_ROOT / 'static', 'coffee/src/discussion/**/*.js'))
-
 JS_URLS = [
     # VENDOR
     'js/vendor/URI.min.js',
@@ -30,11 +28,10 @@ JS_URLS = [
     'xblock/discussion/js/vendor/Markdown.Editor.js',
     'xblock/discussion/js/vendor/mathjax_delay_renderer.js',
     'xblock/discussion/js/vendor/customwmd.js',
-] + discussion_js
+]
 
 CSS_URLS = [
-    'xblock/discussion/css/vendor/font-awesome.css',
-    'sass/discussion-forum.css',
+    'xblock/discussion/css/vendor/font-awesome.css'
 ]
 
 

common/static/coffee/src/discussion/views/discussion_thread_view.coffee

@@ -34,6 +34,8 @@ if Backbone?
       if @isQuestion()
         @markedAnswers = new Comments()
 
+      @options = options
+
     rerender: () ->
       if @showView?
         @showView.undelegateEvents()

common/templates/discussion/_discussion_course.html

 <%! from django.utils.translation import ugettext as _ %>
 
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="js_extra">
+    <%static:js group='discussion'/>
+</%block>
+
+<%block name="css_extra">
+    <%static:css group='discussion'/>
+</%block>
+
 <div class="discussion-course">
 
   % if enable_new_post_btn and has_permission_to_create_thread:

common/templates/discussion/_discussion_inline.html

@@ -2,6 +2,16 @@
 <%! from django_comment_client.permissions import has_permission %>
 <%include file="_underscore_templates.html" />
 
+<%namespace name='static' file='../static_content.html'/>
+
+<%block name="js_extra">
+    <%static:js group='discussion'/>
+</%block>
+
+<%block name="css_extra">
+    <%static:css group='discussion'/>
+</%block>
+
 <div class="discussion-module" data-discussion-id="${discussion_id | h}">
     <a class="discussion-show control-button" href="javascript:void(0)" data-discussion-id="${discussion_id | h}" role="button"><span class="show-hide-discussion-icon"></span><span class="button-text">${_("Show Discussion")}</span></a>
     % if has_permission(user, 'create_thread', course.id):

lms/envs/common.py

@@ -1077,6 +1077,10 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/lms-style-xmodule-annotations.css',
     },
+    'discussion': {
+        'source_filenames': ['sass/discussion-forum.css'],
+        'output_filename': 'css/lms-style-discussion-forum.css'
+    }
 }
 
 

lms/templates/courseware/courseware.html

@@ -50,7 +50,6 @@ ${page_title_breadcrumbs(course_name())}
   <script type="text/javascript" src="${static.url('js/vendor/codemirror-compressed.js')}"></script>
 
   <%static:js group='courseware'/>
-  <%static:js group='discussion'/>
 
   <%include file="../discussion/_js_body_dependencies.html" />
   % if staff_access: