Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into…

Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions

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

@@ -18,6 +18,7 @@ class @DiscussionThreadView extends Backbone.View
     if window.user.voted(@model)
       @$(".vote-btn").addClass("is-cast")
     @$("span.timeago").timeago()
+    DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "reply-body"
     @renderResponses()
     @
 

lms/templates/discussion/single_thread.html

@@ -14,6 +14,18 @@
 <%include file="_js_body_dependencies.html" />
 <%static:js group='discussion'/>
 <script type="text/javascript" src="${static.url('js/discussions-temp.js')}"></script>
+<script>
+    $$contents = {};
+    $$discussions = {};
+    $$course_id = "${course_id}";
+    $(document).ready(function() {
+        window.user = new DiscussionUser(JSON.parse("${user_info | escapejs}"));
+        var discussion = new Discussion(JSON.parse("${threads | escapejs}"));
+
+        new DiscussionRouter({discussion: discussion});
+        Backbone.history.start({pushState: true, root: "/courses/${course_id}/discussion/forum/"});
+    });
+</script>
 </%block>
 
 <%! from django.core.urlresolvers import reverse %>
@@ -173,6 +185,13 @@
     </div>
     <ol class="responses">
     </ol>
+    <form class="discussion-reply-new">
+      <ul class="discussion-errors"></ul>
+      <div class="reply-body"></div>
+      <div class="reply-post-control">
+        <a class="discussion-submit-post control-button" href="#">Submit</a>
+      </div>
+    </form>
   </article>
 </script>
 
@@ -200,15 +219,3 @@
     <a href="${'<%= id %>'}" data-id="${'<%= id %>'}"><span class="title">${"<%= title %>"}</span> <span class="comments-count">${"<%= comments_count %>"}</span><span class="votes-count">+${"<%= votes['up_count'] %>"}</span></a>
 </script>
 
-<script>
-    $$contents = {};
-    $$discussions = {};
-    $$course_id = "${course_id}";
-    $(document).ready(function() {
-        window.user = new DiscussionUser(JSON.parse("${user_info | escapejs}"));
-        var discussion = new Discussion(JSON.parse("${threads | escapejs}"));
-
-        var app = new DiscussionRouter({discussion: discussion});
-        Backbone.history.start({pushState: true, root: "/courses/${course_id}/discussion/forum/"});
-    });
-</script>