Merge branch 'discussion2' of github.com:dementrock/mitx

lms/templates/discussion/_forum.html

@@ -13,8 +13,8 @@
       <label for="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board">Search within board</label>
     </div>
     <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
-    <%include file="_sort.html" />
   </div>
+  <%include file="_sort.html" />
   <div class="threads">
     % for thread in threads:
       ${renderer.render_thread(course_id, thread, show_comments=False)}