Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"

This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.

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

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

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

@@ -25,7 +25,6 @@ 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()
@@ -46,7 +45,6 @@ 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,9 +14,8 @@ 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"
@@ -66,11 +65,6 @@ 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>')
@@ -122,7 +116,6 @@ 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")
@@ -144,7 +137,6 @@ 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