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

lms/djangoapps/django_comment_client/base/urls.py

@@ -10,8 +10,8 @@ urlpatterns = patterns('django_comment_client.base.views',
     url(r'threads/(?P<thread_id>[\w\-]+)/delete', 'delete_thread', name='delete_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/upvote$', 'vote_for_thread', {'value': 'up'}, name='upvote_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/downvote$', 'vote_for_thread', {'value': 'down'}, name='downvote_thread'),
-    url(r'threads/(?P<thread_id>[\w\-]+)/watch$', 'watch_thread', name='watch_thread'),
-    url(r'threads/(?P<thread_id>[\w\-]+)/unwatch$', 'unwatch_thread', name='unwatch_thread'),
+    url(r'threads/(?P<thread_id>[\w\-]+)/follow$', 'follow_thread', name='follow_thread'),
+    url(r'threads/(?P<thread_id>[\w\-]+)/unfollow$', 'unfollow_thread', name='unfollow_thread'),
 
     url(r'comments/(?P<comment_id>[\w\-]+)/update$', 'update_comment', name='update_comment'),
     url(r'comments/(?P<comment_id>[\w\-]+)/endorse$', 'endorse_comment', name='endorse_comment'),
@@ -21,8 +21,8 @@ urlpatterns = patterns('django_comment_client.base.views',
     url(r'comments/(?P<comment_id>[\w\-]+)/downvote$', 'vote_for_comment', {'value': 'down'}, name='downvote_comment'),
     
     url(r'(?P<commentable_id>[\w\-]+)/threads/create$', 'create_thread', name='create_thread'),
-    url(r'(?P<commentable_id>[\w\-]+)/watch$', 'watch_commentable', name='watch_commentable'),
-    url(r'(?P<commentable_id>[\w\-]+)/unwatch$', 'unwatch_commentable', name='unwatch_commentable'),
+    url(r'(?P<commentable_id>[\w\-]+)/follow$', 'follow_commentable', name='follow_commentable'),
+    url(r'(?P<commentable_id>[\w\-]+)/unfollow$', 'unfollow_commentable', name='unfollow_commentable'),
 
     url(r'search$', 'search', name='search'),
 )

lms/djangoapps/django_comment_client/base/views.py

@@ -140,42 +140,42 @@ def vote_for_thread(request, course_id, thread_id, value):
 
 @login_required
 @require_POST
-def watch_thread(request, course_id, thread_id):
+def follow_thread(request, course_id, thread_id):
     user_id = request.user.id
     response = comment_client.subscribe_thread(user_id, thread_id)
     return JsonResponse(response)
 
 @login_required
 @require_POST
-def watch_commentable(request, course_id, commentable_id):
+def follow_commentable(request, course_id, commentable_id):
     user_id = request.user.id
     response = comment_client.subscribe_commentable(user_id, commentable_id)
     return JsonResponse(response)
 
 @login_required
 @require_POST
-def follow(request, course_id, followed_user_id):
+def follow_user(request, course_id, followed_user_id):
     user_id = request.user.id
     response = comment_client.follow(user_id, followed_user_id)
     return JsonResponse(response)
 
 @login_required
 @require_POST
-def unwatch_thread(request, course_id, thread_id):
+def unfollow_thread(request, course_id, thread_id):
     user_id = request.user.id
     response = comment_client.unsubscribe_thread(user_id, thread_id)
     return JsonResponse(response)
 
 @login_required
 @require_POST
-def unwatch_commentable(request, course_id, commentable_id):
+def unfollow_commentable(request, course_id, commentable_id):
     user_id = request.user.id
     response = comment_client.unsubscribe_commentable(user_id, commentable_id)
     return JsonResponse(response)
 
 @login_required
 @require_POST
-def unfollow(request, course_id, followed_user_id):
+def unfollow_user(request, course_id, followed_user_id):
     user_id = request.user.id
     response = comment_client.unfollow(user_id, followed_user_id)
     return JsonResponse(response)

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

 $ ->
 
   Discussion = window.Discussion
+  console.log "here"
   if $('#accordion').length
     active = $('#accordion ul:has(li.active)').index('#accordion ul')
     $('#accordion').bind('accordionchange', @log).accordion

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

@@ -9,23 +9,23 @@ Discussion = @Discussion
     (selector) -> $(elem).find(selector)
 
   generateDiscussionLink: (cls, txt, handler) ->
-    $("<a>").addClass("discussion-link").
-             attr("href", "javascript:void(0)").
-             addClass(cls).html(txt).
-             click(-> handler(this))
-
+    $("<a>").addClass("discussion-link")
+            .attr("href", "javascript:void(0)")
+            .addClass(cls).html(txt)
+            .click -> handler(this)
+    
   urlFor: (name, param, param1) ->
     {
-      watch_commentable      : "/courses/#{$$course_id}/discussion/#{param}/watch"
-      unwatch_commentable    : "/courses/#{$$course_id}/discussion/#{param}/unwatch"
+      follow_discussion      : "/courses/#{$$course_id}/discussion/#{param}/follow"
+      unfollow_discussion    : "/courses/#{$$course_id}/discussion/#{param}/unfollow"
       create_thread          : "/courses/#{$$course_id}/discussion/#{param}/threads/create"
       update_thread          : "/courses/#{$$course_id}/discussion/threads/#{param}/update"
       create_comment         : "/courses/#{$$course_id}/discussion/threads/#{param}/reply"
       delete_thread          : "/courses/#{$$course_id}/discussion/threads/#{param}/delete"
       upvote_thread          : "/courses/#{$$course_id}/discussion/threads/#{param}/upvote"
       downvote_thread        : "/courses/#{$$course_id}/discussion/threads/#{param}/downvote"
-      watch_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/watch"
-      unwatch_thread         : "/courses/#{$$course_id}/discussion/threads/#{param}/unwatch"
+      follow_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/follow"
+      unfollow_thread         : "/courses/#{$$course_id}/discussion/threads/#{param}/unfollow"
       update_comment         : "/courses/#{$$course_id}/discussion/comments/#{param}/update"
       endorse_comment        : "/courses/#{$$course_id}/discussion/comments/#{param}/endorse"
       create_sub_comment     : "/courses/#{$$course_id}/discussion/comments/#{param}/reply"
@@ -50,3 +50,18 @@ Discussion = @Discussion
   handleAnchorAndReload: (response) ->
     #window.location = window.location.pathname + "#" + response['id']
     window.location.reload()
+
+  bindLocalEvents: ($local, eventsHandler) ->
+    for eventSelector, handler of eventsHandler
+      [event, selector] = eventSelector.split(' ')
+      $local(selector)[event] handler
+
+  tagsInputOptions: ->
+    autocomplete_url: Discussion.urlFor('tags_autocomplete')
+    autocomplete:
+      remoteDataType: 'json'
+    interactive: true
+    defaultText: "Tag your post: press enter after each tag"
+    height: "30px"
+    width: "100%"
+    removeWithBackspace: true