Skip to content

E
edx-platform
Commit b92a180d by Rocky Duan
Options

add tags to threads & view threads by tags

parent 1ad838ac
Showing with 88 additions and 14 deletions
lms/djangoapps/django_comment_client/base/urls.py
......@@ -22,4 +22,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)
......@@ -193,7 +193,12 @@ def unfollow(request, course_id, followed_user_id):
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)
@csrf.csrf_exempt
......
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
......@@ -87,8 +87,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 +127,8 @@ 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)
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
......@@ -111,6 +111,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 +119,21 @@ 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: $$tags
interactive: true
defaultText: "add a tag"
height: "30px"
removeWithBackspace: true
bindContentEvents: (content) ->
$content = $(content)
......@@ -255,8 +266,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.tagsinput.css 0 → 100644
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;
......@@ -127,6 +130,20 @@ $discussion_input_width: 60%;
margin-top: 7px;
margin-bottom: 2px;
}
.thread-tags {
.thread-tag {
@include discussion-font;
border-right: 3px solid #205C85;
padding-right: 5px;
margin-right: 5px;
border-radius: 15px;
color: #205C85;
&:hover {
color: #3CC5E7;
border-right: 3px solid #3CC5E7;
}
}
}
.info {
@include discussion-font;
font-size: $comment_info_size;
......
lms/templates/discussion/index.html
......@@ -32,6 +32,8 @@
<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.tagsinput.js')}"></script>
<link href="${static.url('css/vendor/jquery.tagsinput.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 +12,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 +23,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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment