Merge remote-tracking branch 'origin/master' into 7012x-clean

common/static/coffee/src/discussion/discussion_module_view.coffee

@@ -73,7 +73,13 @@ if Backbone?
       # $elem.html("Hide Discussion")
       @discussion = new Discussion()
       @discussion.reset(response.discussion_data, {silent: false})
+
+      #use same discussion template but different thread templated
+      #determined in the coffeescript based on whether or not there's a
+      #group id
+      
       $discussion = $(Mustache.render $("script#_inline_discussion").html(), {'threads':response.discussion_data, 'discussionId': discussionId, 'allow_anonymous_to_peers': allow_anonymous_to_peers, 'allow_anonymous': allow_anonymous})
+      
       if @$('section.discussion').length
         @$('section.discussion').replaceWith($discussion)
       else

common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee

@@ -16,7 +16,10 @@ if Backbone?
       @$delegateElement = @$local
 
     render: ->
-      @template = DiscussionUtil.getTemplate("_inline_thread")
+      if @model.has('group_id')
+        @template = DiscussionUtil.getTemplate("_inline_thread_cohorted")
+      else
+        @template = DiscussionUtil.getTemplate("_inline_thread")
 
       if not @model.has('abbreviatedBody')
         @abbreviateBody()

common/static/coffee/src/discussion/views/new_post_inline_vew.coffee

@@ -25,6 +25,7 @@ if Backbone?
       event.preventDefault()
       title   = @$(".new-post-title").val()
       body    = @$(".new-post-body").find(".wmd-input").val()
+      group = @$(".new-post-group option:selected").attr("value")
 
       # TODO tags: commenting out til we know what to do with them
       #tags    = @$(".new-post-tags").val()
@@ -45,6 +46,7 @@ if Backbone?
         data:
           title: title
           body: body
+          group_id: group
           
           # TODO tags: commenting out til we know what to do with them
           #tags: tags

common/static/coffee/src/discussion/views/new_post_view.coffee

@@ -14,8 +14,9 @@ if Backbone?
           @setSelectedTopic()
 
           DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "new-post-body"
+          
           @$(".new-post-tags").tagsInput DiscussionUtil.tagsInputOptions()
-
+          
       events:
           "submit .new-post-form":            "createPost"
           "click  .topic_dropdown_button":    "toggleTopicDropdown"
@@ -65,6 +66,11 @@ if Backbone?
               @topicText  = @getFullTopicName($target)
               @topicId   = $target.data('discussion_id')
               @setSelectedTopic()
+              if $target.attr('cohorted') == "True"
+                $('.choose-cohort').show();
+              else
+                $('.choose-cohort').hide();
+              
 
       setSelectedTopic: ->
           @dropdownButton.html(@fitName(@topicText) + ' <span class="drop-arrow">▾</span>')
@@ -116,6 +122,7 @@ if Backbone?
           title   = @$(".new-post-title").val()
           body    = @$(".new-post-body").find(".wmd-input").val()
           tags    = @$(".new-post-tags").val()
+          group = @$(".new-post-group option:selected").attr("value")
 
           anonymous          = false || @$("input.discussion-anonymous").is(":checked")
           anonymous_to_peers = false || @$("input.discussion-anonymous-to-peers").is(":checked")
@@ -137,6 +144,7 @@ if Backbone?
                   anonymous: anonymous
                   anonymous_to_peers: anonymous_to_peers
                   auto_subscribe: follow
+                  group_id: group
               error: DiscussionUtil.formErrorHandler(@$(".new-post-form-errors"))
               success: (response, textStatus) =>
                   # TODO: Move this out of the callback, this makes it feel sluggish

common/static/js/vendor/mathjax-MathJax-c9db6ac/docs/source/conf.py

@@ -11,7 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys
+import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the