Merge branch 'master' of github.com:dementrock/mitx into discussion2

This commit is contained in:
Brittany Cheng
2012-08-02 17:21:08 -04:00
2 changed files with 5 additions and 3 deletions

View File

@@ -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 ->

View File

@@ -1,6 +1,6 @@
<%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">