diff --git a/lms/djangoapps/django_comment_client/base/views.py b/lms/djangoapps/django_comment_client/base/views.py index fb2e1686f8..1092b6cbed 100644 --- a/lms/djangoapps/django_comment_client/base/views.py +++ b/lms/djangoapps/django_comment_client/base/views.py @@ -117,6 +117,7 @@ def _create_comment(request, course_id, thread_id=None, parent_id=None): if request.is_ajax(): context = { 'comment': comment.to_dict(), + 'course_id': course_id, } html = render_to_string('discussion/ajax_create_comment.html', context) annotated_content_info = utils.get_annotated_content_info(course_id, @@ -312,6 +313,7 @@ def update_moderator_status(request, course_id, user_id): discussion_user = cc.User(id=user_id, course_id=course_id) context = { 'course': course, + 'course_id': course_id, 'user': request.user, 'django_user': user, 'discussion_user': discussion_user.to_dict(), diff --git a/lms/static/coffee/src/discussion/content.coffee b/lms/static/coffee/src/discussion/content.coffee index 79fc4a8c1f..1613cf3285 100644 --- a/lms/static/coffee/src/discussion/content.coffee +++ b/lms/static/coffee/src/discussion/content.coffee @@ -326,7 +326,7 @@ initializeFollowThread = (thread) -> handleVote($elem, "down") "click .admin-endorse": -> - handleEndorse(this, true)#, $(this).is(":checked")) + handleEndorse(this, not $content.hasClass("endorsed")) "click .discussion-openclose": -> handleOpenClose(this, $(this).text()) diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index f8047b0eee..e0ada43475 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -131,6 +131,30 @@ $tag-text-color: #5b614f; text-align: right; color: #9a9a9a; } + +//user profile + + .sidebar-username { + font-size: 1.5em; + font-weight: bold; + line-height: 1.5em; + } + + .sidebar-user-roles { + color: darkGray; + font-style: italic; + margin-bottom: 15px; + } + + .sidebar-threads-count, .sidebar-comments-count { + + span { + font-size: 1.5em; + font-weight: bold; + line-height: 1.5em; + margin-right: 10px; + } + } } .discussion-non-content { @@ -424,7 +448,6 @@ $tag-text-color: #5b614f; .search-wrapper-inline { display: inline-block; - margin-bottom: 6%; margin-top: 3%; width: 80%; } @@ -770,7 +793,7 @@ $tag-text-color: #5b614f; &.inline-discussion, .forum-discussion { .new-post-form { - margin: 24px 60px; + margin: -30px 60px 24px 60px; .post-options { margin: 8px 0 16px 0; @@ -778,11 +801,13 @@ $tag-text-color: #5b614f; label { margin-right: 15px; + display: inline; } } .post-control { overflow: hidden; + margin: 0 0 5% 0; } } } diff --git a/lms/templates/discussion/_thread.html b/lms/templates/discussion/_thread.html index 593aa1e4f4..d852d520c7 100644 --- a/lms/templates/discussion/_thread.html +++ b/lms/templates/discussion/_thread.html @@ -98,16 +98,6 @@