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/djangoapps/django_comment_client/forum/views.py

@@ -18,7 +18,7 @@ from django_comment_client.utils import merge_dict, extract, strip_none, strip_b
 import json
 import django_comment_client.utils as utils
 import comment_client as cc
-
+import xml.sax.saxutils as saxutils
 
 THREADS_PER_PAGE = 50000
 PAGES_NEARBY_DELTA = 2
@@ -143,9 +143,10 @@ def render_search_bar(request, course_id, discussion_id=None, text=''):
 
 def forum_form_discussion(request, course_id):
     course = get_course_with_access(request.user, course_id, 'load')
+    category_map = utils.get_discussion_category_map(course)
     threads, query_params = get_threads(request, course_id)
     content = render_forum_discussion(request, course_id, threads, discussion_id=_general_discussion_id(course_id), query_params=query_params)
-
+    user_info = cc.User.from_django_user(request.user).to_dict()
     if request.is_ajax():
         return utils.JsonResponse({
             'html': content,
@@ -161,6 +162,7 @@ def forum_form_discussion(request, course_id):
         trending_tags = cc.search_trending_tags(
             course_id,
         )
+        escapedict = {'"': '"'}
         context = {
             'csrf': csrf(request)['csrf_token'],
             'course': course,
@@ -168,7 +170,10 @@ def forum_form_discussion(request, course_id):
             'recent_active_threads': recent_active_threads,
             'trending_tags': trending_tags,
             'staff_access' : has_access(request.user, course, 'staff'),
-            'threads': threads,
+            'threads': saxutils.escape(json.dumps(threads),escapedict),
+            'user_info': saxutils.escape(json.dumps(user_info),escapedict),
+            'course_id': course.id,
+            'category_map': category_map,
         }
         # print "start rendering.."
         return render_to_response('discussion/index.html', context)
@@ -226,19 +231,19 @@ def single_thread(request, course_id, discussion_id, thread_id):
         )
 
         user_info = cc.User.from_django_user(request.user).to_dict()
-
+        escapedict = {'"': '"'}
         context = {
             'discussion_id': discussion_id,
             'csrf': csrf(request)['csrf_token'],
             'init': '',
-            'user_info': json.dumps(user_info),
+            'user_info': saxutils.escape(json.dumps(user_info),escapedict),
             'content': render_single_thread(request, discussion_id, course_id, thread_id),
             'course': course,
             'recent_active_threads': recent_active_threads,
             'trending_tags': trending_tags,
             'course_id': course.id,
             'thread_id': thread_id,
-            'threads': json.dumps(threads),
+            'threads': saxutils.escape(json.dumps(threads), escapedict),
             'category_map': category_map,
         }
 

lms/lib/comment_client/user.py

@@ -8,6 +8,7 @@ class User(models.Model):
     accessible_fields = ['username', 'email', 'follower_ids', 'upvoted_ids', 'downvoted_ids',
                          'id', 'external_id', 'subscribed_user_ids', 'children', 'course_id',
                          'subscribed_thread_ids', 'subscribed_commentable_ids',
+                         'default_sort_key',
                          'threads_count', 'comments_count',
                         ]
 

lms/static/coffee/src/discussion/content.coffee

@@ -47,6 +47,7 @@ if Backbone?
 
     initialize: ->
       DiscussionUtil.addContent @id, @
+      @set 'user_url', DiscussionUtil.urlFor('user_profile', @get('user_id'))
       @resetComments(@get('children'))
       
 

lms/static/coffee/src/discussion/discussion.coffee

@@ -3,7 +3,6 @@ if Backbone?
     model: Thread
 
     initialize: ->
-      DiscussionUtil.addDiscussion @id, @
       @bind "add", (item) =>
         item.discussion = @
       @comparator = @sortByDate

lms/static/coffee/src/discussion/discussion_router.coffee

@@ -13,7 +13,8 @@ class @DiscussionRouter extends Backbone.Router
       @newPostView = new NewPostView(el: $(".new-post-article"))
 
   allThreads: ->
-      true
+    # TODO: Do something reasonable here
+    $(".discussion-column").html("No thread selected.")
 
   setActiveThread: =>
     if @thread

lms/static/coffee/src/discussion/main.coffee

+DiscussionApp =
+  start: (elem)->
+    # TODO: Perhaps eliminate usage of global variables when possible
+    element = $(elem)
+    window.$$contents = {}
+    window.$$course_id = element.data("course-id")
+    user_info = element.data("user-info")
+    threads = element.data("threads")
+    window.user = new DiscussionUser(user_info)
+    discussion = new Discussion(threads)
+    new DiscussionRouter({discussion: discussion})
+    Backbone.history.start({pushState: true, root: "/courses/#{$$course_id}/discussion/forum/"})
+
+$ ->
+  $("section.discussion").each (index, elem) ->
+    DiscussionApp.start(elem)

lms/static/coffee/src/discussion/utils.coffee

@@ -13,17 +13,10 @@ class @DiscussionUtil
   @getTemplate: (id) ->
     $("script##{id}").html()
 
-  @getDiscussionData: (id) ->
-    return $$discussion_data[id]
-
   @addContent: (id, content) -> window.$$contents[id] = content
 
   @getContent: (id) -> window.$$contents[id]
   
-  @addDiscussion: (id, discussion) -> window.$$discussions[id] = discussion
-
-  @getDiscussion: (id) -> window.$$discussions[id]
-  
   @bulkUpdateContentInfo: (infos) ->
     for id, info of infos
       @getContent(id).updateInfo(info)
@@ -64,13 +57,16 @@ class @DiscussionUtil
       openclose_thread        : "/courses/#{$$course_id}/discussion/threads/#{param}/close"
       permanent_link_thread   : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}"
       permanent_link_comment  : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}##{param2}"
+      user_profile            : "/courses/#{$$course_id}/discussion/forum/users/#{param}"
     }[name]
 
   @safeAjax: (params) ->
     $elem = params.$elem
-    if $elem.attr("disabled")
+    if $elem and $elem.attr("disabled")
       return
+    params["url"] = URI(params["url"]).addSearch ajax: 1
     params["beforeSend"] = ->
+      if $elem
         $elem.attr("disabled", "disabled")
       if params["$loading"]
         if params["loadingCallback"]?
@@ -78,6 +74,7 @@ class @DiscussionUtil
         else
           params["$loading"].loading()
     $.ajax(params).always ->
+      if $elem
         $elem.removeAttr("disabled")
       if params["$loading"]
         if params["loadedCallback"]?

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

@@ -29,7 +29,9 @@ class @DiscussionThreadView extends Backbone.View
     MathJax.Hub.Queue ["Typeset", MathJax.Hub, element.attr("id")]
 
   renderResponses: ->
-    $.ajax @model.id, success: (data, textStatus, xhr) =>
+    DiscussionUtil.safeAjax
+      url: @model.id
+      success: (data, textStatus, xhr) =>
         @$(".loading").remove()
         comments = new Comments(data['content']['children'])
         comments.each @renderResponse

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

@@ -57,12 +57,15 @@ class @ThreadResponseView extends Backbone.View
         if textStatus == 'success'
           @model.set(response)
 
-  submitComment: ->
+  submitComment: (event) ->
     url = @model.urlFor('reply')
     body = @$(".comment-form-input").val()
+    if not body.trim().length
+      return false
     comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"))
     @renderComment(comment)
     @trigger "comment:add"
+    @$(".comment-form-input").val("")
 
     DiscussionUtil.safeAjax
       $elem: $(event.target)
@@ -71,4 +74,5 @@ class @ThreadResponseView extends Backbone.View
       dataType: 'json'
       data:
         body: body
+       
     false

lms/static/sass/_discussion.scss

@@ -844,6 +844,7 @@ body.discussion {
     background: #fff;
     box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
     width: 68%;
+    min-height: 500px
   }
 
   .discussion-article {

lms/templates/discussion/_single_thread.html

 <%namespace name="renderer" file="_content_renderer.html"/>
+<%! from django_comment_client.mustache_helpers import url_for_user %>
 
 <article class="discussion-article" data-id="${discussion_id| h}">
   <a href="#" class="dogear"></a>
@@ -8,7 +9,7 @@
       <h1>${thread['title']}</h1>
       <p class="posted-details">
         <span class="timeago" title="${thread['created_at'] | h}">sometime</span> by
-        <a href="${thread['user_id']}">${thread['username']}</a>
+        <a href="${url_for_user(thread, thread['user_id'])}">${thread['username']}</a>
       </p>
     </header>
     <div class="post-body">

lms/templates/discussion/_underscore_templates.html

@@ -34,7 +34,7 @@
                 <h1>${'<%= title %>'}</h1>
                 <p class="posted-details">
                     <span class="timeago" title="${'<%= created_at %>'}">sometime</span> by
-                    <a href="${'<%= user_id %>'}">${'<%= username %>'}</a>
+                    <a href="${'<%= user_url %>'}">${'<%= username %>'}</a>
                 </p>
             </header>
             <div class="post-body">
@@ -58,7 +58,7 @@
 <script type="text/template" id="thread-response-template">
     <header>
         <a href="#" class="vote-btn" data-tooltip="vote"><span class="plus-icon"></span><span class="votes-count-number">${"<%= votes['up_count'] %>"}</span></a>
-        <a href="#" class="posted-by">${"<%= username %>"}</a>
+        <a href="${'<%= user_url %>'}" class="posted-by">${"<%= username %>"}</a>
         <p class="posted-details" title="${'<%= created_at %>'}">Sometime</p>
     </header>
     <div class="response-body">${"<%= body %>"}</div>
@@ -72,7 +72,7 @@
 </script>
 
 <script type="text/template" id="response-comment-template">
-    <p>${'<%= body %>'}<span class="posted-details">–posted <span class="timeago" title="${'<%= created_at %>'}">sometime</span> by <a href="#">${'<%= username %>'}</a></span></p>
+  <p>${'<%= body %>'}<span class="posted-details">–posted <span class="timeago" title="${'<%= created_at %>'}">sometime</span> by <a href="${'<%= user_url %>'}">${'<%= username %>'}</a></span></p>
 </script>
 
 <script type="text/template" id="thread-list-item-template">

lms/templates/discussion/index.html

 <%! import django_comment_client.helpers as helpers %>
+<%! from django.template.defaultfilters import escapejs %>
+<%! from django.core.urlresolvers import reverse %>
+
 <%inherit file="../main.html" />
 <%namespace name='static' file='../static_content.html'/>
 <%block name="bodyclass">discussion</%block>
@@ -16,51 +19,15 @@
 
 <%include file="../courseware/course_navigation.html" args="active_page='discussion'" />
 
+<%include file="_new_post.html" />
 
-<section class="container">
-  <div class="discussion-wrapper">
-    <article class="discussion-sidebar">
-      <div class="board-selector">
-        <a href="#" class="board-drop-btn">Homework / Week 1 <span class="drop-arrow">▾</span></a>
-        <div class="board-drop-menu">
-        </div>
-      </div>
-      <div class="sort-bar">
-<a href="#"><span class="sort-label">Sort by:</span> most recent <span class="drop-arrow">▾</span></a>
-      </div>
-      <div class="post-list-wrapper">
-        <ul class="post-list">
-          % for thread in threads:
-          <li><a href="${helpers.permalink(thread) | h}"><span class="title">${thread['title'] | h}</span> <span class="comments">${thread['comments_count'] | h}</span><span class="votes">+${thread['votes']['up_count'] | h}</span></a></li>
-          % endfor
-        </ul>
-      </div>
-    </article>
-    <section class="discussion-content">
-      This page intentionally left blank
-    </section>
-  </div>
-
-</section>
-
-<section class="container">
-  <div class="course-wrapper">
-    <section aria-label="Course Navigation" class="course-index">
-      <nav>
-
-        <article class="sidebar-module discussion-sidebar">
-          <a href="#" class="sidebar-new-post-button">New Post</a>
-        </article>
-
-        <%include file="_recent_active_posts.html" />
+<script type="text/javascript" src="${static.url('js/discussions-temp.js')}"></script>
 
-        <%include file="_trending_tags.html" />
-
-      </nav>
-    </section>
-
-    <section class="course-content">
-      ${content.decode('utf-8')}
-    </section>
+<section class="discussion container" id="discussion-container" data-course-id="${course_id}" data-user-info="${user_info}" data-threads="${threads}">
+    <div class="discussion-body">
+        <div class="sidebar"></div>
+        <div class="discussion-column"></div>
     </div>
 </section>
+
+<%include file="_underscore_templates.html" />
\ No newline at end of file

lms/templates/discussion/single_thread.html

@@ -17,23 +17,7 @@
 <%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}";
-    DiscussionApp = {
-      start: 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/"});
-       }
-    }
-    $(document).ready(function() {
-        DiscussionApp.start();
-    });
-</script>
 </%block>
 
 <nav class="course-material">
@@ -71,11 +55,11 @@
 
 <%include file="_new_post.html" />
 
-<div class="discussion container">
+<section class="discussion container" id="discussion-container" data-course-id="${course_id}" data-user-info="${user_info}" data-threads="${threads}">
   <div class="discussion-body">
     <div class="sidebar"></div>
     <div class="discussion-column"></div>
   </div>
-</div>
+</section>
 
 <%include file="_underscore_templates.html" />