Commit f5936b36 by alisan617 Committed by Brian Jacobel

remove Related to in inline, add it to Profile, spacing nits

parent ee3a58ed
<div class="discussion-post"> <div class="discussion-post">
<header class="wrapper-post-header"> <header class="wrapper-post-header">
<div class="post-header-content"> <div class="post-header-content">
<h1 class="post-title"><%- title %></h1> <h4 class="post-title"><%- title %></h4>
<p class="posted-details"> <p class="posted-details">
<% <%
var timeAgoHtml = interpolate( var timeAgoHtml = interpolate(
......
...@@ -1081,9 +1081,7 @@ class InlineDiscussionTestCase(ForumsEnableMixin, ModuleStoreTestCase): ...@@ -1081,9 +1081,7 @@ class InlineDiscussionTestCase(ForumsEnableMixin, ModuleStoreTestCase):
"""Verifies that the response contains the appropriate courseware_url and courseware_title""" """Verifies that the response contains the appropriate courseware_url and courseware_title"""
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
response_data = json.loads(response.content) response_data = json.loads(response.content)
expected_courseware_url = '/courses/TestX/101/Test_Course/jump_to/i4x://TestX/101/discussion/Discussion1'
expected_courseware_title = 'Chapter / Discussion1' expected_courseware_title = 'Chapter / Discussion1'
self.assertEqual(response_data['discussion_data'][0]['courseware_url'], expected_courseware_url)
self.assertEqual(response_data["discussion_data"][0]["courseware_title"], expected_courseware_title) self.assertEqual(response_data["discussion_data"][0]["courseware_title"], expected_courseware_title)
def test_courseware_data(self, mock_request): def test_courseware_data(self, mock_request):
......
...@@ -444,6 +444,8 @@ def user_profile(request, course_key, user_id): ...@@ -444,6 +444,8 @@ def user_profile(request, course_key, user_id):
is_staff = has_permission(request.user, 'openclose_thread', course.id) is_staff = has_permission(request.user, 'openclose_thread', course.id)
threads = [utils.prepare_content(thread, course_key, is_staff) for thread in threads] threads = [utils.prepare_content(thread, course_key, is_staff) for thread in threads]
with newrelic.agent.FunctionTrace(nr_transaction, "add_courseware_context"):
add_courseware_context(threads, course, request.user)
if request.is_ajax(): if request.is_ajax():
return utils.JsonResponse({ return utils.JsonResponse({
'discussion_data': threads, 'discussion_data': threads,
......
...@@ -202,10 +202,6 @@ body.discussion { ...@@ -202,10 +202,6 @@ body.discussion {
} }
} }
.responses li header {
margin-bottom: $baseline;
}
blockquote { blockquote {
background: $gray-l5; background: $gray-l5;
border-radius: $forum-border-radius; border-radius: $forum-border-radius;
......
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
padding: 0; padding: 0;
font-size: $forum-base-font-size; font-size: $forum-base-font-size;
} }
.response-count {
@include margin-right($baseline / 4);
}
} }
.discussion-column { .discussion-column {
......
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
} }
.thread-preview-body { .thread-preview-body {
margin-top: $baseline / 4; @include margin($baseline / 4, $baseline, 0, 0);
color: $forum-color-response-count; color: $forum-color-response-count;
font-size: $forum-small-font-size; font-size: $forum-small-font-size;
overflow: hidden; overflow: hidden;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
padding: 0 ($baseline/2); padding: 0 ($baseline/2);
.wrapper-post-header { .wrapper-post-header {
padding-bottom: 0; padding-bottom: $baseline;
} }
.post-header-content { .post-header-content {
......
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