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
cf4ac2ef
Commit
cf4ac2ef
authored
Aug 02, 2012
by
Brittany Cheng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:dementrock/mitx into discussion2
parents
f649084a
f579730f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
lms/static/coffee/src/discussion/content.coffee
+4
-2
lms/templates/discussion/index.html
+1
-1
No files found.
lms/static/coffee/src/discussion/content.coffee
View file @
cf4ac2ef
...
...
@@ -4,6 +4,7 @@ if not @Discussion?
Discussion
=
@
Discussion
@
Discussion
=
$
.
extend
@
Discussion
,
bindContentEvents
:
(
content
)
->
$content
=
$
(
content
)
...
...
@@ -33,8 +34,8 @@ Discussion = @Discussion
}
$discussionContent
.
append
Mustache
.
render
Discussion
.
replyTemplate
,
view
Markdown
.
makeWmdEditor
$local
(
".reply-body"
),
"-reply-body-
#{
id
}
"
,
Discussion
.
urlFor
(
'upload'
)
$local
(
".discussion-submit-post"
).
click
handleSubmitReply
$local
(
".discussion-cancel-post"
).
click
handleCancelReply
$local
(
".discussion-submit-post"
).
click
->
handleSubmitReply
(
this
)
$local
(
".discussion-cancel-post"
).
click
->
handleCancelReply
(
this
)
$local
(
".discussion-link"
).
hide
()
$discussionContent
.
attr
(
"status"
,
"reply"
)
...
...
@@ -204,6 +205,7 @@ Discussion = @Discussion
$local
(
".thread-title"
).
click
handleShowSingleThread
$local
(
".discussion-show-comments"
).
click
handleShowSingleThread
$local
(
".discussion-reply-thread"
).
click
->
...
...
lms/templates/discussion/index.html
View file @
cf4ac2ef
<
%
inherit
file=
"../main.html"
/>
<
%
namespace
name=
'static'
file=
'../static_content.html'
/>
<
%
block
name=
"bodyclass"
>
courseware
discussion
</
%
block>
<
%
block
name=
"bodyclass"
>
discussion
</
%
block>
<
%
block
name=
"title"
><title>
Discussion – MITx 6.002x
</title></
%
block>
<
%
block
name=
"headextra"
>
...
...
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