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
03d93a2e
Commit
03d93a2e
authored
Dec 05, 2016
by
alisan617
Committed by
Brian Jacobel
Dec 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
copy edits and profile page title
parent
2f78b0ec
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
12 deletions
+11
-12
common/static/common/js/discussion/utils.js
+0
-1
common/static/common/js/discussion/views/discussion_inline_view.js
+1
-2
common/static/common/js/discussion/views/discussion_thread_list_view.js
+1
-2
common/static/common/js/discussion/views/discussion_thread_view.js
+2
-5
common/static/common/js/discussion/views/response_comment_view.js
+1
-2
lms/djangoapps/discussion/templates/discussion/discussion_profile_page.html
+1
-0
lms/static/sass/discussion/_layouts.scss
+5
-0
No files found.
common/static/common/js/discussion/utils.js
View file @
03d93a2e
...
...
@@ -184,7 +184,6 @@
if
(
!
params
.
error
)
{
params
.
error
=
function
()
{
self
.
discussionAlert
(
gettext
(
'Error'
),
gettext
(
'Your request could not be processed. Refresh the page and try again.'
)
);
};
...
...
common/static/common/js/discussion/views/discussion_inline_view.js
View file @
03d93a2e
...
...
@@ -181,8 +181,7 @@
this
.
loadDiscussions
(
this
.
$el
,
function
()
{
self
.
hideDiscussion
();
DiscussionUtil
.
discussionAlert
(
gettext
(
'Error'
),
gettext
(
'This discussion could not be loaded. Refresh the page to try again.'
)
gettext
(
'This discussion could not be loaded. Refresh the page and try again.'
)
);
});
}
...
...
common/static/common/js/discussion/views/discussion_thread_list_view.js
View file @
03d93a2e
...
...
@@ -309,8 +309,7 @@
error
=
function
()
{
self
.
renderThreads
();
DiscussionUtil
.
discussionAlert
(
gettext
(
'Error'
),
gettext
(
'Additional posts could not be loaded. Refresh the page to try again.'
)
gettext
(
'Additional posts could not be loaded. Refresh the page and try again.'
)
);
};
return
this
.
collection
.
retrieveAnotherPage
(
this
.
mode
,
options
,
{
...
...
common/static/common/js/discussion/views/discussion_thread_view.js
View file @
03d93a2e
...
...
@@ -261,18 +261,15 @@
}
if
(
xhr
.
status
===
404
)
{
DiscussionUtil
.
discussionAlert
(
gettext
(
'Error'
),
gettext
(
'The post you selected has been deleted.'
)
);
}
else
if
(
firstLoad
)
{
DiscussionUtil
.
discussionAlert
(
gettext
(
'Error'
),
gettext
(
'Responses could not be loaded. Refresh the page to try again.'
)
gettext
(
'Responses could not be loaded. Refresh the page and try again.'
)
);
}
else
{
DiscussionUtil
.
discussionAlert
(
gettext
(
'Error'
),
gettext
(
'Additional responses could not be loaded. Refresh the page to try again.'
)
gettext
(
'Additional responses could not be loaded. Refresh the page and try again.'
)
);
}
}
...
...
common/static/common/js/discussion/views/response_comment_view.js
View file @
03d93a2e
...
...
@@ -114,8 +114,7 @@
},
error
:
function
()
{
return
DiscussionUtil
.
discussionAlert
(
gettext
(
'Error'
),
gettext
(
'This comment could not be deleted. Refresh the page to try again.'
)
gettext
(
'This comment could not be deleted. Refresh the page and try again.'
)
);
}
});
...
...
lms/djangoapps/discussion/templates/discussion/discussion_profile_page.html
View file @
03d93a2e
...
...
@@ -57,6 +57,7 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str
<div
class=
"page-header-main"
>
<div
class=
"sr-is-focusable"
tabindex=
"-1"
></div>
<div>
<h2
class=
"discussion-profile-title"
>
${_("Discussion")}
</h2>
<
%
def
name=
"span(num)"
><span
class=
"discussion-count"
>
${num}
</span></
%
def>
<span
class=
"user-name"
><a
href=
"${learner_profile_page_url}"
>
${django_user.username}
</a></span>
<span
class=
"discussion-profile-info"
>
...
...
lms/static/sass/discussion/_layouts.scss
View file @
03d93a2e
...
...
@@ -3,6 +3,11 @@
.discussion-user-profile-board
{
.discussion-profile-title
{
margin-bottom
:
$baseline
/
5
;
font-size
:
$forum-x-large-font-size
;
}
.discussion-profile-count
{
margin-top
:
$baseline
/
4
;
}
...
...
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