Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
f5936b36
Commit
f5936b36
authored
Dec 05, 2016
by
alisan617
Committed by
Brian Jacobel
Dec 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove Related to in inline, add it to Profile, spacing nits
parent
ee3a58ed
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
9 deletions
+9
-9
common/static/common/templates/discussion/thread-show.underscore
+1
-1
lms/djangoapps/discussion/tests/test_views.py
+0
-2
lms/djangoapps/discussion/views.py
+2
-0
lms/static/sass/discussion/_discussion.scss
+0
-4
lms/static/sass/discussion/_layouts.scss
+4
-0
lms/static/sass/discussion/elements/_navigation.scss
+1
-1
lms/static/sass/discussion/views/_thread.scss
+1
-1
No files found.
common/static/common/templates/discussion/thread-show.underscore
View file @
f5936b36
<div class="discussion-post">
<header class="wrapper-post-header">
<div class="post-header-content">
<h
1 class="post-title"><%- title %></h1
>
<h
4 class="post-title"><%- title %></h4
>
<p class="posted-details">
<%
var timeAgoHtml = interpolate(
...
...
lms/djangoapps/discussion/tests/test_views.py
View file @
f5936b36
...
...
@@ -1081,9 +1081,7 @@ class InlineDiscussionTestCase(ForumsEnableMixin, ModuleStoreTestCase):
"""Verifies that the response contains the appropriate courseware_url and courseware_title"""
self
.
assertEqual
(
response
.
status_code
,
200
)
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'
self
.
assertEqual
(
response_data
[
'discussion_data'
][
0
][
'courseware_url'
],
expected_courseware_url
)
self
.
assertEqual
(
response_data
[
"discussion_data"
][
0
][
"courseware_title"
],
expected_courseware_title
)
def
test_courseware_data
(
self
,
mock_request
):
...
...
lms/djangoapps/discussion/views.py
View file @
f5936b36
...
...
@@ -444,6 +444,8 @@ def user_profile(request, course_key, user_id):
is_staff
=
has_permission
(
request
.
user
,
'openclose_thread'
,
course
.
id
)
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
():
return
utils
.
JsonResponse
({
'discussion_data'
:
threads
,
...
...
lms/static/sass/discussion/_discussion.scss
View file @
f5936b36
...
...
@@ -202,10 +202,6 @@ body.discussion {
}
}
.responses
li
header
{
margin-bottom
:
$baseline
;
}
blockquote
{
background
:
$gray-l5
;
border-radius
:
$forum-border-radius
;
...
...
lms/static/sass/discussion/_layouts.scss
View file @
f5936b36
...
...
@@ -34,6 +34,10 @@
padding
:
0
;
font-size
:
$forum-base-font-size
;
}
.response-count
{
@include
margin-right
(
$baseline
/
4
);
}
}
.discussion-column
{
...
...
lms/static/sass/discussion/elements/_navigation.scss
View file @
f5936b36
...
...
@@ -191,7 +191,7 @@
}
.thread-preview-body
{
margin-top
:
$baseline
/
4
;
@include
margin
(
$baseline
/
4
,
$baseline
,
0
,
0
)
;
color
:
$forum-color-response-count
;
font-size
:
$forum-small-font-size
;
overflow
:
hidden
;
...
...
lms/static/sass/discussion/views/_thread.scss
View file @
f5936b36
...
...
@@ -14,7 +14,7 @@
padding
:
0
(
$baseline
/
2
);
.wrapper-post-header
{
padding-bottom
:
0
;
padding-bottom
:
$baseline
;
}
.post-header-content
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment