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

lms/djangoapps/django_comment_client/base/urls.py

@@ -4,6 +4,7 @@ import django_comment_client.base.views
 urlpatterns = patterns('django_comment_client.base.views',
 
     url(r'upload$', 'upload', name='upload'),
+    url(r'threads/tags/autocomplete$', 'tags_autocomplete', name='tags_autocomplete'),
     url(r'threads/(?P<thread_id>[\w\-]+)/update$', 'update_thread', name='update_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/reply$', 'create_comment', name='create_comment'),
     url(r'threads/(?P<thread_id>[\w\-]+)/delete', 'delete_thread', name='delete_thread'),
@@ -22,4 +23,6 @@ urlpatterns = patterns('django_comment_client.base.views',
     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'search$', 'search', name='search'),
 )

lms/djangoapps/django_comment_client/base/views.py

@@ -65,7 +65,7 @@ def extract(dic, keys):
 @login_required
 @require_POST
 def create_thread(request, course_id, commentable_id):
-    attributes = extract(request.POST, ['body', 'title'])
+    attributes = extract(request.POST, ['body', 'title', 'tags'])
     attributes['user_id'] = request.user.id
     attributes['course_id'] = course_id
     response = comment_client.create_thread(commentable_id, attributes)
@@ -75,7 +75,7 @@ def create_thread(request, course_id, commentable_id):
 @login_required
 @require_POST
 def update_thread(request, course_id, thread_id):
-    attributes = extract(request.POST, ['body', 'title'])
+    attributes = extract(request.POST, ['body', 'title', 'tags'])
     response = comment_client.update_thread(thread_id, attributes)
     return JsonResponse(response)
 
@@ -188,14 +188,26 @@ def unfollow(request, course_id, followed_user_id):
     response = comment_client.unfollow(user_id, followed_user_id)
     return JsonResponse(response)
 
-@login_required
 @require_GET
 def search(request, course_id):
     text = request.GET.get('text', None)
     commentable_id = request.GET.get('commentable_id', None)
-    response = comment_client.search(text, commentable_id)
+    tags = request.GET.get('tags', None)
+    response = comment_client.search_threads({
+        'text': text,
+        'commentable_id': commentable_id,
+        'tags': tags,
+    })
     return JsonResponse(response)
 
+@require_GET
+def tags_autocomplete(request, course_id):
+    value = request.GET.get('q', None)
+    results = []
+    if value:
+        results = comment_client.tags_autocomplete(value)
+    return JsonResponse(results)
+
 @csrf.csrf_exempt
 @login_required
 @require_POST

lms/djangoapps/django_comment_client/forum/views.py

@@ -101,8 +101,21 @@ def single_thread(request, course_id, thread_id):
 def search(request, course_id):
 
     course = check_course(course_id)
+
     text = request.GET.get('text', None)
-    threads = comment_client.search(text)
+    commentable_id = request.GET.get('commentable_id', None)
+    tags = request.GET.get('tags', None)
+
+    print text
+    print commentable_id
+    print tags
+
+    threads = comment_client.search_threads({
+        'text': text,
+        'commentable_id': commentable_id,
+        'tags': tags,
+    })
+
     context = {
         'csrf': csrf(request)['csrf_token'],
         'init': '',

lms/lib/comment_client.py

@@ -14,6 +14,9 @@ def get_threads(commentable_id, recursive=False, *args, **kwargs):
 def get_threads_tags(*args, **kwargs):
     return _perform_request('get', _url_for_threads_tags(), {}, *args, **kwargs)
 
+def tags_autocomplete(value, *args, **kwargs):
+    return _perform_request('get', _url_for_threads_tags_autocomplete(), {'value': value}, *args, **kwargs)
+
 def create_thread(commentable_id, attributes, *args, **kwargs):
     return _perform_request('post', _url_for_threads(commentable_id), attributes, *args, **kwargs)
     
@@ -87,8 +90,8 @@ def unsubscribe_thread(user_id, thread_id, *args, **kwargs):
 def unsubscribe_commentable(user_id, commentable_id, *args, **kwargs):
     return unsubscribe(user_id, {'source_type': 'other', 'source_id': commentable_id})
 
-def search(text, commentable_id=None, *args, **kwargs):
-    return _perform_request('get', _url_for_search(), {'text': text, 'commentable_id': commentable_id}, *args, **kwargs)
+def search_threads(attributes, *args, **kwargs):
+    return _perform_request('get', _url_for_search_threads(), attributes, *args, **kwargs)
 
 def _perform_request(method, url, data_or_params=None, *args, **kwargs):
     if method in ['post', 'put', 'patch']:
@@ -127,8 +130,11 @@ def _url_for_subscription(user_id):
 def _url_for_user(user_id):
     return "{prefix}/users/{user_id}".format(prefix=PREFIX, user_id=user_id)
 
-def _url_for_search():
-    return "{prefix}/search".format(prefix=PREFIX)
+def _url_for_search_threads():
+    return "{prefix}/search/threads".format(prefix=PREFIX)
 
 def _url_for_threads_tags():
     return "{prefix}/threads/tags".format(prefix=PREFIX)
+
+def _url_for_threads_tags_autocomplete():
+    return "{prefix}/threads/tags/autocomplete".format(prefix=PREFIX)

lms/static/coffee/src/customwmd.coffee

@@ -96,18 +96,24 @@ $ ->
 
       deTilde(@blocks.join(""))
 
+    @removeMathWrapper: (_this) ->
+      (text) -> _this.removeMath(text)
+
     replaceMath: (text) ->
       text = text.replace /@@(\d+)@@/g, ($0, $1) => @math[$1]
       @math = null
       text
 
+    @replaceMathWrapper: (_this) ->
+      (text) -> _this.replaceMath(text)
+
   if Markdown?
 
     Markdown.getMathCompatibleConverter = ->
         converter = Markdown.getSanitizingConverter()
         processor = new MathJaxProcessor()
-        converter.hooks.chain "preConversion", processor.removeMath
-        converter.hooks.chain "postConversion", processor.replaceMath
+        converter.hooks.chain "preConversion", MathJaxProcessor.removeMathWrapper(processor)#processor.removeMath
+        converter.hooks.chain "postConversion", MathJaxProcessor.replaceMathWrapper(processor)#.replaceMath
         converter
 
     Markdown.makeWmdEditor = (elem, appended_id, imageUploadUrl) ->

lms/static/coffee/src/discussion.coffee

@@ -45,6 +45,7 @@ Discussion =
       downvote_comment    : "/courses/#{$$course_id}/discussion/comments/#{param}/downvote"
       upload              : "/courses/#{$$course_id}/discussion/upload"
       search              : "/courses/#{$$course_id}/discussion/forum/search"
+      tags_autocomplete   : "/courses/#{$$course_id}/discussion/threads/tags/autocomplete"
     }[name]
 
   handleAnchorAndReload: (response) ->
@@ -111,6 +112,7 @@ Discussion =
             Discussion.handleAnchorAndReload(response)
         , 'json'
 
+      
       if id in $$user_info.subscribed_thread_ids
         unwatchThread = generateDiscussionLink("discussion-unwatch-thread", "Unwatch", handleUnwatchThread)
         $local(".info").append(unwatchThread)
@@ -118,11 +120,23 @@ Discussion =
         watchThread = generateDiscussionLink("discussion-watch-thread", "Watch", handleWatchThread)
         $local(".info").append(watchThread)
 
+    $local = generateLocal(discussion)
+
     if $$user_info?
-      $(discussion).find(".comment").each(initializeVote)
-      $(discussion).find(".thread").each(initializeVote).each(initializeWatchThreads)
+      $local(".comment").each(initializeVote)
+      $local(".thread").each(initializeVote).each(initializeWatchThreads)
       initializeWatchDiscussion(discussion)
 
+    if $$tags?
+      $local(".new-post-tags").tagsInput
+        autocomplete_url: Discussion.urlFor('tags_autocomplete')
+        autocomplete:
+          remoteDataType: 'json'
+        interactive: true
+        defaultText: "add a tag"
+        height: "30px"
+        removeWithBackspace: true
+
   bindContentEvents: (content) ->
 
     $content = $(content)
@@ -255,8 +269,9 @@ Discussion =
     handleSubmitNewThread = (elem) ->
       title = $local(".new-post-title").val()
       body = $local("#wmd-input-new-post-body-#{id}").val()
+      tags = $local(".new-post-tags").val()
       url = Discussion.urlFor('create_thread', $local(".new-post-form").attr("_id"))
-      $.post url, {title: title, body: body}, (response, textStatus) ->
+      $.post url, {title: title, body: body, tags: tags}, (response, textStatus) ->
         if textStatus == "success"
           Discussion.handleAnchorAndReload(response)
       , 'json'

lms/static/css/vendor/jquery.autocomplete.css

+.acInput {
+	width: 200px;
+}
+
+.acResults {
+	padding: 0px;
+	border: 1px solid WindowFrame;
+	background-color: Window;
+	overflow: hidden;
+}
+
+.acResults ul {
+	margin: 0px;
+	padding: 0px;
+	list-style-position: outside;
+	list-style: none;	
+}
+
+.acResults ul li {
+	margin: 0px;
+	padding: 2px 5px;
+	cursor: pointer;
+	display: block;
+	font: menu;
+	font-size: 12px;
+	overflow: hidden;
+}
+
+.acLoading {
+	background : url('indicator.gif') right center no-repeat;
+}
+
+.acSelect {
+	background-color: Highlight;
+	color: HighlightText;
+}

lms/static/css/vendor/jquery.tagsinput.css

+div.tagsinput { border:1px solid #CCC; background: #FFF; padding:5px; width:300px; height:100px; overflow-y: auto;}
+div.tagsinput span.tag { border: 1px solid #a5d24a; -moz-border-radius:2px; -webkit-border-radius:2px; display: block; float: left; padding: 5px; text-decoration:none; background: #cde69c; color: #638421; margin-right: 5px; margin-bottom:5px;font-family: helvetica;  font-size:13px;}
+div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px;  } 
+div.tagsinput input { width:80px; margin:0px; font-family: helvetica; font-size: 13px; border:1px solid transparent; padding:5px; background: transparent; color: #000; outline:0px;  margin-right:5px; margin-bottom:5px; }
+div.tagsinput div { display:block; float: left; } 
+.tags_clear { clear: both; width: 100%; height: 0px; }
+.not_valid {background: #FBD8DB !important; color: #90111A !important;}

lms/static/sass/_discussion.scss

@@ -109,6 +109,9 @@ $discussion_input_width: 60%;
       margin-top: 10px;
       font-weight: bold;
     }
+    .tagsinput {
+      margin-top: 20px;
+    }
   }
   .thread {
     //display: none;
@@ -121,11 +124,32 @@ $discussion_input_width: 60%;
       font-weight: bold;
       display: block;
     }
-    .thread-body {
+    .thread-body, .content-body {
       @include discussion-font;
       font-size: $comment_body_size;
       margin-top: 7px;
       margin-bottom: 2px;
+      p {
+        @include discussion-font;
+        margin: 0;
+      }
+    }
+    .thread-tags {
+      .thread-tag {
+        @include discussion-font;
+        font-size: 0.75em;
+        border-width: 0px 1px 1px 0px;
+        border-style: solid;
+        border-color: #205C85;
+        padding: 0px 3px 3px 0px;
+        margin-right: 5px;
+        border-radius: 4px;
+        color: #205C85;
+        &:hover {
+          color: #3CC5E7;
+          border-color: #3CC5E7;
+        }
+      }
     }
     .info {
       @include discussion-font;
@@ -171,7 +195,7 @@ $discussion_input_width: 60%;
       margin-left: $comment_margin_left;
       overflow: hidden;
       .comment {
-        .comment-body {
+        .comment-body, .content-body {
           @include discussion-font;
           font-size: $comment_body_size;
           margin-top: 3px;

lms/templates/discussion/index.html

@@ -31,6 +31,10 @@
   <script type="text/javascript" src="${static.url('js/vendor/Markdown.Converter.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/Markdown.Sanitizer.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/Markdown.Editor.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/jquery.autocomplete.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/jquery.tagsinput.js')}"></script>
+  <link href="${static.url('css/vendor/jquery.tagsinput.css')}" rel="stylesheet" type="text/css">
+  <link href="${static.url('css/vendor/jquery.autocomplete.css')}" rel="stylesheet" type="text/css">
 </%block>
 
 <%include file="../course_navigation.html" args="active_page='discussion'" />

lms/templates/discussion/inline.html

@@ -9,7 +9,7 @@
     <form class="new-post-form" _id="${discussion_id}">
      <input type="text" class="new-post-title" placeholder="Title"/>
       <div class="new-post-body"></div>
-      <input type="text" class="new-pot-tags" placeholder="tag1, tag2"/>
+      <input class="new-post-tags" placeholder="Tags"/>
       <a class="discussion-new-post" href="javascript:void(0)">New Post</a>
     </form>
   </div>

lms/templates/discussion/thread.html

 <%! from django.core.urlresolvers import reverse %>
 <%! from datehelper import time_ago_in_words %>
 <%! from dateutil.parser import parse %>
+<%! import urllib %>
 
 <%def name="render_thread(course_id, thread, edit_thread=False, show_comments=False)">
   <%
@@ -9,6 +10,8 @@
     else:
       thread_id = thread['id']
       url_for_thread = reverse('django_comment_client.forum.views.single_thread', args=[course_id, thread_id])
+    def url_for_tags(tags):
+      return reverse('django_comment_client.forum.views.search', args=[course_id]) + '?' + urllib.urlencode({'tags': ",".join(tags)})
   %>
   <div class="thread" _id="${thread['id']}">
     <div class="discussion-content">
@@ -18,6 +21,11 @@
           <a class="thread-title" name="${thread['id']}" href="${url_for_thread}">${thread['title'] | h}</a>
           <div class="discussion-content-view">
             <div class="content-body thread-body">${thread['body'] | h}</div>
+            <div class="thread-tags">
+              % for tag in thread['tags']:
+                <a class="thread-tag" href="${url_for_tags([tag])}">${tag}</a>
+              % endfor
+            </div>
             <div class="info">
               ${render_info(thread)}
               % if edit_thread:
@@ -83,7 +91,6 @@
   <a class="discussion-link discussion-watch-thread" href="javascript:void(0)">Watch</a>
 </%def>
 
-
 <%def name="render_vote(content)">
   <%
     upvote = "&#x2C4;"