Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading

cms/djangoapps/contentstore/views.py

@@ -53,7 +53,7 @@ def index(request):
     """
     courses = modulestore().get_items(['i4x', None, None, 'course', None])
     return render_to_response('index.html', {
-        'courses': [(course.metadata['display_name'],
+        'courses': [(course.metadata.get('display_name'),
                     reverse('course_index', args=[
                         course.location.org,
                         course.location.course,

cms/static/sass/_base.scss

@@ -14,9 +14,11 @@ $yellow: #fff8af;
 $cream: #F6EFD4;
 $border-color: #ddd;
 
+
 // edX colors
 $blue: rgb(29,157,217);
 $pink: rgb(182,37,104);
+$error-red: rgb(253, 87, 87);
 
 @mixin hide-text {
   background-color: transparent;

cms/static/sass/_calendar.scss

@@ -330,11 +330,6 @@ section.cal {
 
   &:hover {
     opacity: 1;
-    width: flex-grid(5) + flex-gutter();
-
-    + section.main-content {
-      width: flex-grid(7);
-    }
   }
 
   > header {

common/djangoapps/external_auth/admin.py

@@ -5,4 +5,8 @@ django admin pages for courseware model
 from external_auth.models import *
 from django.contrib import admin
 
-admin.site.register(ExternalAuthMap)
+class ExternalAuthMapAdmin(admin.ModelAdmin):
+    search_fields = ['external_id','user__username']
+    date_hierarchy = 'dtcreated'
+
+admin.site.register(ExternalAuthMap, ExternalAuthMapAdmin)

common/djangoapps/track/admin.py

+'''
+django admin pages for courseware model
+'''
+
+from track.models import *
+from django.contrib import admin
+
+admin.site.register(TrackingLog)

common/djangoapps/xmodule_modifiers.py

@@ -133,6 +133,7 @@ def add_histogram(get_html, module, user):
                          'source_file' : source_file,
                          'source_url': '%s/%s/tree/master/%s' % (giturl,data_dir,source_file),
                          'category': str(module.__class__.__name__),
+                         # Template uses element_id in js function names, so can't allow dashes
                          'element_id': module.location.html_id().replace('-','_'),
                          'edit_link': edit_link,
                          'user': user,

common/lib/capa/capa/capa_problem.py

@@ -265,7 +265,7 @@ class LoncapaProblem(object):
         # include solutions from <solution>...</solution> stanzas
         for entry in self.tree.xpath("//" + "|//".join(solution_types)):
             answer = etree.tostring(entry)
-            if answer: answer_map[entry.get('id')] = answer
+            if answer: answer_map[entry.get('id')] = contextualize_text(answer, self.context)
 
         log.debug('answer_map = %s' % answer_map)
         return answer_map
@@ -382,10 +382,10 @@ class LoncapaProblem(object):
         original_path = sys.path
 
         for script in scripts:
-
             sys.path = original_path + self._extract_system_path(script)
 
             stype = script.get('type')
+            
             if stype:
                 if 'javascript' in stype:
                     continue    # skip javascript

common/lib/capa/capa/inputtypes.py

@@ -326,8 +326,16 @@ def textline_dynamath(element, value, status, render_template, msg=''):
     count = int(eid.split('_')[-2]) - 1  # HACK
     size = element.get('size')
     hidden = element.get('hidden', '')	 # if specified, then textline is hidden and id is stored in div of name given by hidden
+
+    # Preprocessor to insert between raw input and Mathjax
+    preprocessor = {'class_name': element.get('preprocessorClassName',''),
+                    'script_src': element.get('preprocessorSrc','')}
+    if '' in preprocessor.values():
+        preprocessor = None
+
     context = {'id': eid, 'value': value, 'state': status, 'count': count, 'size': size,
                'msg': msg, 'hidden': hidden,
+               'preprocessor': preprocessor,
                }
     html = render_template("textinput_dynamath.html", context)
     return etree.XML(html)

common/lib/capa/capa/javascript_problem_generator.js

@@ -11,13 +11,11 @@ importAll("xproblem");
 
 generatorModulePath = process.argv[2];
 dependencies        = JSON.parse(process.argv[3]);
-seed                = process.argv[4];
+seed                = JSON.parse(process.argv[4]);
 params              = JSON.parse(process.argv[5]);
 
 if(seed==null){
     seed = 4;
-}else{
-    seed = parseInt(seed);
 }
 
 for(var i = 0; i < dependencies.length; i++){

common/lib/capa/capa/responsetypes.py

@@ -408,7 +408,7 @@ class JavascriptResponse(LoncapaResponse):
         output = self.call_node([generator_file,
                                  self.generator, 
                                  json.dumps(self.generator_dependencies),
-                                 json.dumps(str(self.system.seed)), 
+                                 json.dumps(str(self.context['the_lcp'].seed)),
                                  json.dumps(self.params)]).strip()
 
         return json.loads(output)
@@ -971,8 +971,9 @@ def sympy_check2():
         # build map giving "correct"ness of the answer(s)
         correct_map = CorrectMap()
         for k in range(len(idset)):
+            npoints = self.maxpoints[idset[k]] if correct[k] == 'correct' else 0
             correct_map.set(idset[k], correct[k], msg=messages[k],
-                            npoints=self.maxpoints[idset[k]])
+                            npoints=npoints)
         return correct_map
 
     def get_answers(self):

common/lib/capa/capa/templates/textinput_dynamath.html

 ###
-### version of textline.html which does dynammic math
+### version of textline.html which does dynamic math
 ###
-<section class="text-input-dynamath">
+<section class="text-input-dynamath capa_inputtype" id="inputtype_${id}">
+
+    % if preprocessor is not None:
+    <div class="text-input-dynamath_data" data-preprocessor="${preprocessor['class_name']}"/>
+    <div class="script_placeholder" data-src="${preprocessor['script_src']}"/>
+    % endif
+
     % if state == 'unsubmitted':
     <div class="unanswered" id="status_${id}">
     % elif state == 'correct':
@@ -20,7 +26,6 @@
         style="display:none;"
     % endif
     />
-
     <p class="status">
     % if state == 'unsubmitted':
     unanswered

common/lib/xmodule/xmodule/capa_module.py

@@ -507,8 +507,12 @@ class CapaModule(XModule):
         #       'success' will always be incorrect
         event_info['correct_map'] = correct_map.get_dict()
         event_info['success'] = success
+	event_info['attempts'] = self.attempts
         self.system.track_function('save_problem_check', event_info)
 
+	if hasattr(self.system,'psychometrics_handler'):	# update PsychometricsData using callback
+		self.system.psychometrics_handler(self.get_instance_state())
+
         # render problem into HTML
         html = self.get_problem_html(encapsulate=False)
 

common/lib/xmodule/xmodule/css/capa/display.scss

@@ -158,7 +158,7 @@ section.problem {
           border: 1px solid #e3e3e3;
           @include inline-block;
           @include border-radius(4px);
-          min-width: 300px;
+          min-width: 30px;
         }
       }
     }
@@ -311,6 +311,10 @@ section.problem {
       text-align: left;
     }
 
+    td {
+      text-align: left;
+    }
+
     caption, th, td {
       padding: .25em .75em .25em 0;
       padding: .25rem .75rem .25rem 0;
@@ -432,7 +436,7 @@ section.problem {
 
   .detailed-solution {
     border: 1px solid #ddd;
-    padding: 9px 9px 20px;
+    padding: 9px 15px 20px;
     margin-bottom: 10px;
     background: #FFF;
     position: relative;

common/lib/xmodule/xmodule/css/sequence/display.scss

@@ -32,7 +32,7 @@ nav.sequence-nav {
 
   .sequence-list-wrapper {
     position: relative;
-    z-index: 9999;
+    z-index: 99;
     border: 1px solid #ccc;
     height: 44px;
     margin: 0 30px;
@@ -297,7 +297,6 @@ nav.sequence-bottom {
   ul {
     @extend .clearfix;
     @include inline-block();
-    width: 103px;
 
     li {
       float: left;

common/lib/xmodule/xmodule/css/video/display.scss

@@ -157,6 +157,7 @@ div.video {
               opacity: 1;
               padding: 0;
               margin: 0;
+              list-style: none;
             }
           }
 
@@ -411,6 +412,7 @@ div.video {
     width: flex-grid(3, 9);
     margin: 0;
     font-size: 14px;
+    list-style: none;
 
     li {
       border: 0;

common/lib/xmodule/xmodule/js/src/capa/display.coffee

@@ -11,7 +11,9 @@ class @Problem
     $(selector, @el)
 
   bind: =>
-    MathJax.Hub.Queue ["Typeset", MathJax.Hub]
+    @el.find('.problem > div').each (index, element) =>
+      MathJax.Hub.Queue ["Typeset", MathJax.Hub, element]
+
     window.update_schematics()
 
     problem_prefix = @element_id.replace(/problem_/,'')
@@ -23,7 +25,11 @@ class @Problem
     @$('section.action input.reset').click @reset
     @$('section.action input.show').click @show
     @$('section.action input.save').click @save
-    @$('input.math').keyup(@refreshMath).each(@refreshMath)
+
+    # Dynamath
+    @$('input.math').keyup(@refreshMath)
+    @$('input.math').each (index, element) =>
+      MathJax.Hub.Queue [@refreshMath, null, element]
 
   updateProgress: (response) =>
     if response.progress_changed
@@ -262,7 +268,9 @@ class @Problem
               showMethod = @inputtypeShowAnswerMethods[cls]
               showMethod(inputtype, display, answers) if showMethod?
 
-        MathJax.Hub.Queue ["Typeset", MathJax.Hub]
+        @el.find('.problem > div').each (index, element) =>
+          MathJax.Hub.Queue ["Typeset", MathJax.Hub, element]
+
         @$('.show').val 'Hide Answer'
         @el.addClass 'showed'
         @updateProgress response
@@ -296,11 +304,20 @@ class @Problem
 
   refreshMath: (event, element) =>
     element = event.target unless element
-    target = "display_#{element.id.replace(/^input_/, '')}"
+    elid = element.id.replace(/^input_/,'')
+    target = "display_" + elid
+
+    # MathJax preprocessor is loaded by 'setupInputTypes'
+    preprocessor_tag = "inputtype_" + elid
+    mathjax_preprocessor = @inputtypeDisplays[preprocessor_tag]
 
     if jax = MathJax.Hub.getAllJax(target)[0]
-      MathJax.Hub.Queue ['Text', jax, $(element).val()],
-        [@updateMathML, jax, element]
+      eqn = $(element).val()
+      if mathjax_preprocessor
+        eqn = mathjax_preprocessor(eqn)
+      MathJax.Hub.Queue(['Text', jax, eqn], [@updateMathML, jax, element])
+
+    return # Explicit return for CoffeeScript
     
   updateMathML: (jax, element) =>
     try
@@ -317,6 +334,22 @@ class @Problem
     @answers = @inputs.serialize()
 
   inputtypeSetupMethods:
+
+    'text-input-dynamath': (element) =>
+      ###
+      Return: function (eqn) -> eqn that preprocesses the user formula input before
+                it is fed into MathJax. Return 'false' if no preprocessor specified
+      ###
+      data = $(element).find('.text-input-dynamath_data')
+
+      preprocessorClassName = data.data('preprocessor')
+      preprocessorClass = window[preprocessorClassName]
+      if not preprocessorClass?
+        return false
+      else
+        preprocessor = new preprocessorClass()
+        return preprocessor.fn
+
     javascriptinput: (element) =>
 
       data = $(element).find(".javascriptinput_data")

common/lib/xmodule/xmodule/js/src/capa/schematic.js

@@ -2023,7 +2023,16 @@ function add_schematic_handler(other_onload) {
 	update_schematics();
     }
 }
-window.onload = add_schematic_handler(window.onload);
+/*
+ * THK: Attaching update_schematic to window.onload is rather presumptuous...
+ *      The function is called for EVERY page load, whether in courseware or in
+ *      course info, in 6.002x or the public health course. It is also redundant
+ *      because courseware includes an explicit call to update_schematic after
+ *      each ajax exchange. In this case, calling update_schematic twice appears 
+ *      to contribute to a bug in Firefox that does not render the schematic
+ *      properly depending on timing.
+ */
+//window.onload = add_schematic_handler(window.onload);
 
 // ask each schematic input widget to update its value field for submission
 function prepare_schematics() {

common/lib/xmodule/xmodule/modulestore/__init__.py

@@ -29,6 +29,9 @@ INVALID_CHARS = re.compile(r"[^\w.-]")
 # Names are allowed to have colons.
 INVALID_CHARS_NAME = re.compile(r"[^\w.:-]")
 
+# html ids can contain word chars and dashes
+INVALID_HTML_CHARS = re.compile(r"[^\w-]")
+
 _LocationBase = namedtuple('LocationBase', 'tag org course category name revision')
 
 
@@ -45,11 +48,34 @@ class Location(_LocationBase):
     __slots__ = ()
 
     @staticmethod
+    def _clean(value, invalid):
+        """
+        invalid should be a compiled regexp of chars to replace with '_'
+        """
+        return re.sub('_+', '_', invalid.sub('_', value))
+
+
+    @staticmethod
     def clean(value):
         """
         Return value, made into a form legal for locations
         """
-        return re.sub('_+', '_', INVALID_CHARS.sub('_', value))
+        return Location._clean(value, INVALID_CHARS)
+
+    @staticmethod
+    def clean_for_url_name(value):
+        """
+        Convert value into a format valid for location names (allows colons).
+        """
+        return Location._clean(value, INVALID_CHARS_NAME)
+
+    @staticmethod
+    def clean_for_html(value):
+        """
+        Convert a string into a form that's safe for use in html ids, classes, urls, etc.
+        Replaces all INVALID_HTML_CHARS with '_', collapses multiple '_' chars
+        """
+        return Location._clean(value, INVALID_HTML_CHARS)
 
     @staticmethod
     def is_valid(value):
@@ -183,9 +209,9 @@ class Location(_LocationBase):
         Return a string with a version of the location that is safe for use in
         html id attributes
         """
-        # TODO: is ':' ok in html ids?
-        return "-".join(str(v) for v in self.list()
-                        if v is not None).replace('.', '_')
+        s = "-".join(str(v) for v in self.list()
+                        if v is not None)
+        return Location.clean_for_html(s)
 
     def dict(self):
         """

common/lib/xmodule/xmodule/modulestore/tests/test_location.py

@@ -114,12 +114,44 @@ def test_equality():
         Location('tag', 'org', 'course', 'category', 'name')
     )
 
-def test_clean():
-    pairs = [ ('',''),
+# All the cleaning functions should do the same thing with these
+general_pairs = [ ('',''),
                   (' ', '_'),
                   ('abc,', 'abc_'),
                   ('ab    fg!@//\\aj', 'ab_fg_aj'),
                   (u"ab\xA9", "ab_"),  # no unicode allowed for now
                   ]
+
+def test_clean():
+    pairs = general_pairs + [
+        ('a:b', 'a_b'),  # no colons in non-name components
+        ('a-b', 'a-b'),  # dashes ok 
+        ('a.b', 'a.b'),  # dot ok
+        ]
     for input, output in pairs:
         assert_equals(Location.clean(input), output)
+
+
+def test_clean_for_url_name():
+    pairs = general_pairs + [
+        ('a:b', 'a:b'),  # colons ok in names
+        ('a-b', 'a-b'),  # dashes ok in names
+        ('a.b', 'a.b'),  # dot ok in names
+        ]
+    for input, output in pairs:
+        assert_equals(Location.clean_for_url_name(input), output)
+
+
+def test_clean_for_html():
+    pairs = general_pairs + [
+              ("a:b", "a_b"),   # no colons for html use
+              ("a-b", "a-b"),   # dashes ok (though need to be replaced in various use locations. ugh.)
+              ('a.b', 'a_b'),   # no dots.
+              ]
+    for input, output in pairs:
+        assert_equals(Location.clean_for_html(input), output)
+
+
+def test_html_id():
+    loc = Location("tag://org/course/cat/name:more_name@rev")
+    assert_equals(loc.html_id(), "tag-org-course-cat-name_more_name-rev")

common/lib/xmodule/xmodule/seq_module.py

@@ -75,7 +75,7 @@ class SequenceModule(XModule):
         contents = []
         for child in self.get_display_items():
             progress = child.get_progress()
-            contents.append({
+            childinfo = {
                 'content': child.get_html(),
                 'title': "\n".join(
                     grand_child.display_name.strip()
@@ -85,7 +85,10 @@ class SequenceModule(XModule):
                 'progress_status': Progress.to_js_status_str(progress),
                 'progress_detail': Progress.to_js_detail_str(progress),
                 'type': child.get_icon_class(),
-            })
+            }
+            if childinfo['title']=='':
+                childinfo['title'] = child.metadata.get('display_name','')
+            contents.append(childinfo)
 
         params = {'items': contents,
                   'element_id': self.location.html_id(),

common/lib/xmodule/xmodule/tests/__init__.py

@@ -29,7 +29,7 @@ from nose.plugins.skip import SkipTest
 from mock import Mock
 
 i4xs = ModuleSystem(
-    ajax_url='/',
+    ajax_url='courses/course_id/modx/a_location',
     track_function=Mock(),
     get_module=Mock(),
     render_template=Mock(),

doc/discussion.md

@@ -72,9 +72,9 @@ For convenience, add the following environment variables to the terminal (assumi
     export DJANGO_SETTINGS_MODULE=lms.envs.dev
     export PYTHONPATH=.
 
-Now initialzie roles and permissions:
+Now initialzie roles and permissions, providing a course id eg.:
 
-    django-admin.py seed_permissions_roles
+    django-admin.py seed_permissions_roles "MITx/6.002x/2012_Fall"
 
 To assign yourself as a moderator, use the following command (assuming your username is "test", and the course id is "MITx/6.002x/2012_Fall"):
 

doc/xml-format.md

@@ -299,7 +299,7 @@ This is a sketch ("tue" is not a valid start date), that should help illustrate
 
 ## Specifying metadata in the xml file
 
-Metadata can also live in the xml files, but anything defined in the policy file overrides anything in the xml.  This is primarily for backwards compatibility, and you should probably  not use both.  If you do leave some metadata tags in the xml, you should be consistent (e.g. if `display_name`s stay in xml, they should all stay in xml).
+Metadata can also live in the xml files, but anything defined in the policy file overrides anything in the xml.  This is primarily for backwards compatibility, and you should probably  not use both.  If you do leave some metadata tags in the xml, you should be consistent (e.g. if `display_name`s stay in xml, they should all stay in xml. Note `display_name` should be specified in the problem xml definition itself, ie, <problem display_name="Title"> Problem Text </problem>, in file ProblemFoo.xml).
    - note, some xml attributes are not metadata.  e.g. in `<video youtube="xyz987293487293847"/>`, the `youtube` attribute specifies what video this is, and is logically part of the content, not the policy, so it should stay in the xml.
 
 Another example policy file:

lms/djangoapps/courseware/courses.py

@@ -101,6 +101,7 @@ def get_course_about_section(course, section_key):
     - textbook
     - faq
     - more_info
+    - ocw_links
     """
 
     # Many of these are stored as html files instead of some semantic
@@ -112,7 +113,7 @@ def get_course_about_section(course, section_key):
                        'course_staff_short', 'course_staff_extended',
                        'requirements', 'syllabus', 'textbook', 'faq', 'more_info',
                        'number', 'instructors', 'overview',
-                       'effort', 'end_date', 'prerequisites']:
+                       'effort', 'end_date', 'prerequisites', 'ocw_links']:
 
         try:
             fs = course.system.resources_fs
@@ -194,7 +195,11 @@ def get_course_syllabus_section(course, section_key):
 
     if section_key in ['syllabus', 'guest_syllabus']:
         try:
-            with course.system.resources_fs.open(path("syllabus") / section_key + ".html") as htmlFile:
+            fs = course.system.resources_fs
+            # first look for a run-specific version
+            dirs = [path("syllabus") / course.url_name, path("syllabus")]
+            filepath = find_file(fs, dirs, section_key + ".html")
+            with fs.open(filepath) as htmlFile:
                 return replace_urls(htmlFile.read().decode('utf-8'),
                                     course.metadata['data_dir'])
         except ResourceNotFoundError:

lms/djangoapps/courseware/module_render.py

@@ -16,6 +16,7 @@ from capa.xqueue_interface import XQueueInterface
 from courseware.access import has_access
 from mitxmako.shortcuts import render_to_string
 from models import StudentModule, StudentModuleCache
+from psychometrics.psychoanalyze import make_psychometrics_data_update_handler
 from static_replace import replace_urls
 from xmodule.errortracker import exc_info_to_str
 from xmodule.exceptions import NotFoundError
@@ -230,6 +231,9 @@ def _get_module(user, request, location, student_module_cache, course_id, positi
     # pass position specified in URL to module through ModuleSystem
     system.set('position', position)
     system.set('DEBUG', settings.DEBUG)
+    if settings.MITX_FEATURES.get('ENABLE_PSYCHOMETRICS') and instance_module is not None:
+        system.set('psychometrics_handler',		# set callback for updating PsychometricsData
+                   make_psychometrics_data_update_handler(instance_module))
 
     try:
         module = descriptor.xmodule_constructor(system)(instance_state, shared_state)

lms/djangoapps/django_comment_client/base/views.py

@@ -22,7 +22,7 @@ from django.contrib.auth.models import User
 from mitxmako.shortcuts import render_to_response, render_to_string
 from courseware.courses import get_course_with_access
 
-from django_comment_client.utils import JsonResponse, JsonError, extract
+from django_comment_client.utils import JsonResponse, JsonError, extract, get_courseware_context
 
 from django_comment_client.permissions import check_permissions_by_view
 from django_comment_client.models import Role
@@ -38,11 +38,10 @@ def permitted(fn):
             else:
                 content = None
             return content
-
         if check_permissions_by_view(request.user, kwargs['course_id'], fetch_content(), request.view_name):
             return fn(request, *args, **kwargs)
         else:
-            return JsonError("unauthorized")
+            return JsonError("unauthorized", status=401)
     return wrapper
 
 def ajax_content_response(request, course_id, content, template_name):
@@ -63,10 +62,23 @@ def ajax_content_response(request, course_id, content, template_name):
 @login_required
 @permitted
 def create_thread(request, course_id, commentable_id):
+    course = get_course_with_access(request.user, course_id, 'load')
     post = request.POST
+
+    if course.metadata.get("allow_anonymous", True):
+        anonymous = post.get('anonymous', 'false').lower() == 'true'
+    else:
+        anonymous = False
+
+    if course.metadata.get("allow_anonymous_to_peers", False):
+        anonymous_to_peers = post.get('anonymous_to_peers', 'false').lower() == 'true'
+    else:
+        anonymous_to_peers = False
+
     thread = cc.Thread(**extract(post, ['body', 'title', 'tags']))
     thread.update_attributes(**{
-        'anonymous'      : post.get('anonymous', 'false').lower() == 'true',
+        'anonymous'          : anonymous,
+        'anonymous_to_peers' : anonymous_to_peers,
         'commentable_id'     : commentable_id,
         'course_id'          : course_id,
         'user_id'            : request.user.id,
@@ -75,10 +87,14 @@ def create_thread(request, course_id, commentable_id):
     if post.get('auto_subscribe', 'false').lower() == 'true':
         user = cc.User.from_django_user(request.user)
         user.follow(thread)
+    courseware_context = get_courseware_context(thread, course)
+    data = thread.to_dict()
+    if courseware_context:
+        data.update(courseware_context)
     if request.is_ajax():
-        return ajax_content_response(request, course_id, thread.to_dict(), 'discussion/ajax_create_thread.html')
+        return ajax_content_response(request, course_id, data, 'discussion/ajax_create_thread.html')
     else:
-        return JsonResponse(utils.safe_content(thread.to_dict()))
+        return JsonResponse(utils.safe_content(data))
 
 @require_POST
 @login_required
@@ -95,8 +111,21 @@ def update_thread(request, course_id, thread_id):
 def _create_comment(request, course_id, thread_id=None, parent_id=None):
     post = request.POST
     comment = cc.Comment(**extract(post, ['body']))
+
+    course = get_course_with_access(request.user, course_id, 'load')
+    if course.metadata.get("allow_anonymous", True):
+        anonymous = post.get('anonymous', 'false').lower() == 'true'
+    else:
+        anonymous = False
+
+    if course.metadata.get("allow_anonymous_to_peers", False):
+        anonymous_to_peers = post.get('anonymous_to_peers', 'false').lower() == 'true'
+    else:
+        anonymous_to_peers = False
+
     comment.update_attributes(**{
-        'anonymous' : post.get('anonymous', 'false').lower() == 'true',
+        'anonymous'          : anonymous,
+        'anonymous_to_peers' : anonymous_to_peers,
         'user_id'   : request.user.id,
         'course_id' : course_id,
         'thread_id' : thread_id,

lms/djangoapps/django_comment_client/helpers.py

@@ -17,12 +17,6 @@ def pluralize(singular_term, count):
         return singular_term + 's'
     return singular_term
 
-def show_if(text, condition):
-    if condition:
-        return text
-    else:
-        return ''
-
 # TODO there should be a better way to handle this
 def include_mustache_templates():
     mustache_dir = settings.PROJECT_ROOT / 'templates' / 'discussion' / 'mustache'

lms/djangoapps/django_comment_client/management/commands/seed_permissions_roles.py

@@ -7,8 +7,10 @@ class Command(BaseCommand):
     help = 'Seed default permisssions and roles'
 
     def handle(self, *args, **options):
-        if len(args) != 1:
-            raise CommandError("The number of arguments does not match. ")
+        if len(args) == 0:
+            raise CommandError("Please provide a course id")
+        if len(args) > 1:
+            raise CommandError("Too many arguments")
         course_id = args[0]
         administrator_role = Role.objects.get_or_create(name="Administrator", course_id=course_id)[0]
         moderator_role = Role.objects.get_or_create(name="Moderator", course_id=course_id)[0]

lms/djangoapps/django_comment_client/permissions.py

@@ -5,7 +5,8 @@ from student.models import CourseEnrollment
 
 import logging
 from util.cache import cache
-
+from django.core import cache
+cache = cache.get_cache('default')
 
 def cached_has_permission(user, permission, course_id=None):
     """
@@ -75,12 +76,12 @@ def check_conditions_permissions(user, permissions, course_id, **kwargs):
 VIEW_PERMISSIONS = {
     'update_thread'     :       ['edit_content', ['update_thread', 'is_open', 'is_author']],
     'create_comment'    :       [["create_comment", "is_open"]],
-    'delete_thread'     :       ['delete_thread'],
+    'delete_thread'     :       ['delete_thread', ['update_thread', 'is_author']],
     'update_comment'    :       ['edit_content', ['update_comment', 'is_open', 'is_author']],
     'endorse_comment'   :       ['endorse_comment'],
     'openclose_thread'  :       ['openclose_thread'],
     'create_sub_comment':       [['create_sub_comment', 'is_open']],
-    'delete_comment'    :       ['delete_comment'],
+    'delete_comment'    :       ['delete_comment', ['update_comment', 'is_open', 'is_author']],
     'vote_for_comment'  :       [['vote', 'is_open']],
     'undo_vote_for_comment':    [['unvote', 'is_open']],
     'vote_for_thread'   :       [['vote', 'is_open']],

lms/djangoapps/instructor/views.py

@@ -27,6 +27,7 @@ from django.views.decorators.cache import cache_control
 from courseware import grades
 from courseware.access import has_access, get_access_group_name
 from courseware.courses import (get_course_with_access, get_courses_by_university)
+from psychometrics import psychoanalyze
 from student.models import UserProfile
 
 from student.models import UserTestGroup, CourseEnrollment
@@ -51,7 +52,18 @@ def instructor_dashboard(request, course_id):
     instructor_access = has_access(request.user, course, 'instructor')   # an instructor can manage staff lists
 
     msg = ''
-    # msg += ('POST=%s' % dict(request.POST)).replace('<','&lt;')
+    #msg += ('POST=%s' % dict(request.POST)).replace('<','&lt;')
+
+    problems = []
+    plots = []
+
+    # the instructor dashboard page is modal: grades, psychometrics, admin
+    # keep that state in request.session (defaults to grades mode)
+    idash_mode = request.POST.get('idash_mode','')
+    if idash_mode:
+        request.session['idash_mode'] = idash_mode
+    else:
+        idash_mode = request.session.get('idash_mode','Grades')
 
     def escape(s):
         """escape HTML special characters in string"""
@@ -149,6 +161,9 @@ def instructor_dashboard(request, course_id):
         track.views.server_track(request, 'dump-answer-dist-csv', {}, page='idashboard')
         return return_csv('answer_dist_%s.csv' % course_id, get_answers_distribution(request, course_id))
 
+    #----------------------------------------
+    # Admin
+
     elif 'List course staff' in action:
         group = get_staff_group(course)
         msg += 'Staff group = %s' % group.name
@@ -187,14 +202,31 @@ def instructor_dashboard(request, course_id):
             user.groups.remove(group)
             track.views.server_track(request, 'remove-staff %s' % user, {}, page='idashboard')
 
-    # For now, mostly a static page
+    #----------------------------------------
+    # psychometrics
+
+    elif action == 'Generate Histogram and IRT Plot':
+        problem = request.POST['Problem']
+        nmsg, plots = psychoanalyze.generate_plots_for_problem(problem)
+        msg += nmsg
+        track.views.server_track(request, 'psychometrics %s' % problem, {}, page='idashboard')
+
+    if idash_mode=='Psychometrics':
+        problems = psychoanalyze.problems_with_psychometric_data(course_id)
+
+    #----------------------------------------
+    # context for rendering
     context = {'course': course,
                'staff_access': True,
                'admin_access': request.user.is_staff,
                'instructor_access': instructor_access,
                'datatable': datatable,
                'msg': msg,
+               'modeflag': {idash_mode: 'selectedmode'},
+               'problems': problems,		# psychometrics
+               'plots': plots,			# psychometrics
                'course_errors': modulestore().get_item_errors(course.location),
+               'djangopid' : os.getpid(),
                }
 
     return render_to_response('courseware/instructor_dashboard.html', context)

lms/djangoapps/lms_migration/migrate.py

@@ -35,7 +35,17 @@ def getip(request):
         ip = request.META.get('REMOTE_ADDR','None')
     return ip
 
-def manage_modulestores(request,reload_dir=None):
+
+def get_commit_id(course):
+    return course.metadata.get('GIT_COMMIT_ID','No commit id')
+    # getattr(def_ms.courses[reload_dir], 'GIT_COMMIT_ID','No commit id')
+
+
+def set_commit_id(course,commit_id):
+    course.metadata['GIT_COMMIT_ID'] = commit_id
+    # setattr(def_ms.courses[reload_dir], 'GIT_COMMIT_ID', new_commit_id)
+
+def manage_modulestores(request, reload_dir=None, commit_id=None):
     '''
     Manage the static in-memory modulestores.
 
@@ -52,8 +62,9 @@ def manage_modulestores(request,reload_dir=None):
     ip = getip(request)
 
     if LOCAL_DEBUG:
-        html += '<h3>IP address: %s ' % ip
-        html += '<h3>User: %s ' % request.user
+        html += '<h3>IP address: %s <h3>' % ip
+        html += '<h3>User: %s </h3>' % request.user
+        html += '<h3>My pid: %s</h3>' % os.getpid()
         log.debug('request from ip=%s, user=%s' % (ip,request.user))
 
     if not (ip in ALLOWED_IPS or 'any' in ALLOWED_IPS):
@@ -66,14 +77,36 @@ def manage_modulestores(request,reload_dir=None):
             return HttpResponse(html, status=403)
 
     #----------------------------------------
-    # reload course if specified
+    # reload course if specified; handle optional commit_id
 
     if reload_dir is not None:
         if reload_dir not in def_ms.courses:
             html += '<h2 class="inline-error">Error: "%s" is not a valid course directory</h2>' % reload_dir
         else:
+            # reloading based on commit_id is needed when running mutiple worker threads,
+            # so that a given thread doesn't reload the same commit multiple times
+            current_commit_id = get_commit_id(def_ms.courses[reload_dir])
+            log.debug('commit_id="%s"' % commit_id)
+            log.debug('current_commit_id="%s"' % current_commit_id)
+
+            if (commit_id is not None) and (commit_id==current_commit_id):
+                html += "<h2>Already at commit id %s for %s</h2>" % (commit_id, reload_dir)
+                track.views.server_track(request,
+                                         'reload %s skipped already at %s (pid=%s)' % (reload_dir,
+                                                                                       commit_id,
+                                                                                       os.getpid(),
+                                                                                       ),
+                                         {}, page='migrate')
+            else:
                 html += '<h2>Reloaded course directory "%s"</h2>' % reload_dir
                 def_ms.try_load_course(reload_dir)
+                gdir = settings.DATA_DIR / reload_dir 
+                new_commit_id = os.popen('cd %s; git log -n 1 | head -1' % gdir).read().strip().split(' ')[1]
+                set_commit_id(def_ms.courses[reload_dir], new_commit_id)
+                html += '<p>commit_id=%s</p>' % new_commit_id
+                track.views.server_track(request, 'reloaded %s now at %s (pid=%s)' % (reload_dir,
+                                                                                      new_commit_id,
+                                                                                      os.getpid()), {}, page='migrate')
 
     #----------------------------------------
 
@@ -94,6 +127,8 @@ def manage_modulestores(request,reload_dir=None):
         html += '<hr width="100%"/>'
         html += '<h2>Course: %s (%s)</h2>' % (course.display_name,cdir)
 
+        html += '<p>commit_id=%s</p>' % get_commit_id(course)
+
         for field in dumpfields:
             data = getattr(course,field)
             html += '<h3>%s</h3>' % field

lms/djangoapps/psychometrics/admin.py

+'''
+django admin pages for courseware model
+'''
+
+from psychometrics.models import *
+from django.contrib import admin
+
+admin.site.register(PsychometricData)

lms/djangoapps/psychometrics/management/commands/init_psychometrics.py

+#!/usr/bin/python
+#
+# generate pyschometrics data from tracking logs and student module data
+
+import os, sys, string
+import datetime
+import json
+
+from courseware.models import *
+from track.models import *
+from psychometrics.models import *
+from xmodule.modulestore import Location
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+#db = "ocwtutor"	# for debugging
+#db = "default"
+
+db = getattr(settings,'DATABASE_FOR_PSYCHOMETRICS','default')
+
+
+class Command(BaseCommand):
+    help = "initialize PsychometricData tables from StudentModule instances (and tracking data, if in SQL)."
+    help += "Note this is done for all courses for which StudentModule instances exist."
+
+    def handle(self, *args, **options):
+
+        # delete all pmd
+
+        #PsychometricData.objects.all().delete()
+        #PsychometricData.objects.using(db).all().delete()
+
+        smset = StudentModule.objects.using(db).exclude(max_grade=None)
+        
+        for sm in smset:
+            url = sm.module_state_key
+            location = Location(url)
+            if not location.category=="problem":
+                continue
+            try:
+                state = json.loads(sm.state)
+                done = state['done']
+            except:
+                print "Oops, failed to eval state for %s (state=%s)" % (sm,sm.state)
+                continue
+            
+            if done:			# only keep if problem completed
+                try:
+                    pmd = PsychometricData.objects.using(db).get(studentmodule=sm)
+                except PsychometricData.DoesNotExist:
+                    pmd = PsychometricData(studentmodule=sm)
+        
+                pmd.done = done
+                pmd.attempts = state['attempts']
+        
+                # get attempt times from tracking log
+                uname = sm.student.username
+                tset = TrackingLog.objects.using(db).filter(username=uname, event_type__contains='save_problem_check')        
+                tset = tset.filter(event_source='server')
+                tset = tset.filter(event__contains="'%s'" % url)
+                checktimes = [x.dtcreated for x in tset]
+                pmd.checktimes = checktimes
+                if not len(checktimes)==pmd.attempts:
+                    print "Oops, mismatch in number of attempts and check times for %s" % pmd
+        
+                #print pmd
+                pmd.save(using=db)
+        
+        print "%d PMD entries" % PsychometricData.objects.using(db).all().count()

lms/djangoapps/psychometrics/models.py

+#
+# db model for psychometrics data
+#
+# this data is collected in real time
+#
+
+from django.db import models
+from courseware.models import StudentModule
+
+class PsychometricData(models.Model):
+    """
+    This data is a table linking student, module, and module performance,
+    including number of attempts, grade, max grade, and time of checks.
+
+    Links to instances of StudentModule, but only those for capa problems.
+
+    Note that StudentModule.module_state_key is nominally a Location instance (url string).
+    That means it is of the form {tag}://{org}/{course}/{category}/{name}[@{revision}]
+    and for capa problems, category = "problem".
+
+    checktimes is extracted from tracking logs, or added by capa module via psychometrics callback.
+    """
+
+    studentmodule = models.ForeignKey(StudentModule, db_index=True, unique=True)   # contains student, module_state_key, course_id
+
+    done = models.BooleanField(default=False)
+    attempts = models.IntegerField(default=0)			# extracted from studentmodule.state
+    checktimes = models.TextField(null=True, blank=True)	# internally stored as list of datetime objects
+
+    # keep in mind
+    # grade = studentmodule.grade
+    # max_grade = studentmodule.max_grade
+    # student = studentmodule.student
+    # course_id = studentmodule.course_id
+    # location = studentmodule.module_state_key
+    
+    def __unicode__(self):
+        sm = self.studentmodule
+        return "[PsychometricData] %s url=%s, grade=%s, max=%s, attempts=%s, ct=%s" % (sm.student,
+                                                                                       sm.module_state_key,
+                                                                                       sm.grade,
+                                                                                       sm.max_grade,
+                                                                                       self.attempts,
+                                                                                       self.checktimes)
+    

lms/envs/aws.py

@@ -70,6 +70,7 @@ SECRET_KEY = AUTH_TOKENS['SECRET_KEY']
 
 AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]
 AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
+AWS_STORAGE_BUCKET_NAME = 'edxuploads'
 
 DATABASES = AUTH_TOKENS['DATABASES']
 

lms/envs/common.py

@@ -71,6 +71,8 @@ MITX_FEATURES = {
     'ENABLE_DISCUSSION' : False,
     'ENABLE_DISCUSSION_SERVICE': True,
 
+    'ENABLE_PSYCHOMETRICS': False,	# real-time psychometrics (eg item response theory analysis in instructor dashboard)
+
     'ENABLE_SQL_TRACKING_LOGS': False,
     'ENABLE_LMS_MIGRATION': False,
     'ENABLE_MANUAL_GIT_RELOAD': False,
@@ -441,12 +443,12 @@ courseware_only_js += [
 main_vendor_js = [
   'js/vendor/jquery.min.js',
   'js/vendor/jquery-ui.min.js',
-  'js/vendor/swfobject/swfobject.js',
   'js/vendor/jquery.cookie.js',
   'js/vendor/jquery.qtip.min.js',
+  'js/vendor/swfobject/swfobject.js',
 ]
 
-discussion_js = sorted(glob2.glob(PROJECT_ROOT / 'static/coffee/src/discussion/*.coffee'))
+discussion_js = sorted(glob2.glob(PROJECT_ROOT / 'static/coffee/src/discussion/**/*.coffee'))
 
 # Load javascript from all of the available xmodules, and
 # prep it for use in pipeline js
@@ -619,6 +621,7 @@ INSTALLED_APPS = (
     'util',
     'certificates',
     'instructor',
+    'psychometrics',
     
     #For the wiki
     'wiki', # The new django-wiki from benjaoming

lms/envs/dev.py

@@ -20,6 +20,8 @@ MITX_FEATURES['SUBDOMAIN_COURSE_LISTINGS'] = False  # Enable to test subdomains-
 MITX_FEATURES['SUBDOMAIN_BRANDING'] = True
 MITX_FEATURES['FORCE_UNIVERSITY_DOMAIN'] = None		# show all university courses if in dev (ie don't use HTTP_HOST)
 MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD'] = True
+MITX_FEATURES['ENABLE_PSYCHOMETRICS'] = False    # real-time psychometrics (eg item response theory analysis in instructor dashboard)
+
 
 WIKI_ENABLED = True
 

lms/lib/comment_client/comment.py

@@ -7,15 +7,14 @@ import settings
 class Comment(models.Model):
 
     accessible_fields = [
-        'id', 'body', 'anonymous', 'course_id',
-        'endorsed', 'parent_id', 'thread_id',
-        'username', 'votes', 'user_id', 'closed',
-        'created_at', 'updated_at', 'depth',
-        'at_position_list', 'type', 'commentable_id',
+        'id', 'body', 'anonymous', 'anonymous_to_peers', 'course_id',
+        'endorsed', 'parent_id', 'thread_id', 'username', 'votes', 'user_id',
+        'closed', 'created_at', 'updated_at', 'depth', 'at_position_list',
+        'type', 'commentable_id',
     ]
 
     updatable_fields = [
-        'body', 'anonymous', 'course_id', 'closed',
+        'body', 'anonymous', 'anonymous_to_peers', 'course_id', 'closed',
         'user_id', 'endorsed',
     ]
 

lms/lib/comment_client/thread.py

@@ -6,16 +6,14 @@ import settings
 class Thread(models.Model):
 
     accessible_fields = [
-        'id', 'title', 'body', 'anonymous',
-        'course_id', 'closed', 'tags', 'votes',
-        'commentable_id', 'username', 'user_id',
-        'created_at', 'updated_at', 'comments_count',
-        'at_position_list', 'children', 'type',
-        'highlighted_title', 'highlighted_body',
+        'id', 'title', 'body', 'anonymous', 'anonymous_to_peers', 'course_id',
+        'closed', 'tags', 'votes', 'commentable_id', 'username', 'user_id',
+        'created_at', 'updated_at', 'comments_count', 'at_position_list',
+        'children', 'type', 'highlighted_title', 'highlighted_body', 'endorsed'
     ]
 
     updatable_fields = [
-        'title', 'body', 'anonymous', 'course_id', 
+        'title', 'body', 'anonymous', 'anonymous_to_peers', 'course_id',
         'closed', 'tags', 'user_id', 'commentable_id',
     ]
 
@@ -32,7 +30,7 @@ class Thread(models.Model):
                           'course_id': query_params['course_id'],
                           'recursive': False}
         params = merge_dict(default_params, strip_blank(strip_none(query_params)))
-        if query_params.get('text') or query_params.get('tags'):
+        if query_params.get('text') or query_params.get('tags') or query_params.get('commentable_ids'):
             url = cls.url(action='search')
         else:
             url = cls.url(action='get_all', params=extract(params, 'commentable_id'))

lms/lib/comment_client/user.py

@@ -8,7 +8,8 @@ class User(models.Model):
     accessible_fields = ['username', 'email', 'follower_ids', 'upvoted_ids', 'downvoted_ids',
                          'id', 'external_id', 'subscribed_user_ids', 'children', 'course_id',
                          'subscribed_thread_ids', 'subscribed_commentable_ids',
-                         'threads_count', 'comments_count', 'default_sort_key'
+                         'subscribed_course_ids', 'threads_count', 'comments_count', 
+                         'default_sort_key'
                         ]
 
     updatable_fields = ['username', 'external_id', 'email', 'default_sort_key']

lms/lib/comment_client/utils.py

@@ -28,9 +28,9 @@ def perform_request(method, url, data_or_params=None, *args, **kwargs):
     data_or_params['api_key'] = settings.API_KEY
     try:
         if method in ['post', 'put', 'patch']:
-            response = requests.request(method, url, data=data_or_params)
+            response = requests.request(method, url, data=data_or_params, timeout=5)
         else:
-            response = requests.request(method, url, params=data_or_params)
+            response = requests.request(method, url, params=data_or_params, timeout=5)
     except Exception as err:
         log.exception("Trying to call {method} on {url} with params {params}".format(
             method=method, url=url, params=data_or_params))

lms/static/coffee/src/customwmd.coffee

@@ -45,6 +45,7 @@ $ ->
 
     removeMath: (text) ->
 
+      text = text || ""
       @math = []
       start = end = last = null
       braces = 0
@@ -123,11 +124,9 @@ $ ->
 
     Markdown.makeWmdEditor = (elem, appended_id, imageUploadUrl, postProcessor) ->
       $elem = $(elem)
-
       if not $elem.length
         console.log "warning: elem for makeWmdEditor doesn't exist"
         return
-
       if not $elem.find(".wmd-panel").length
         initialText = $elem.html()
         $elem.empty()

lms/static/coffee/src/discussion/discussion.coffee

@@ -2,185 +2,67 @@ if Backbone?
   class @Discussion extends Backbone.Collection
     model: Thread
 
-    initialize: ->
-      DiscussionUtil.addDiscussion @id, @
+    initialize: (models, options={})->
+      @pages = options['pages'] || 1
+      @current_page = 1
       @bind "add", (item) =>
         item.discussion = @
+      @comparator = @sortByDateRecentFirst
+      @on "thread:remove", (thread) =>
+        @remove(thread)
 
     find: (id) ->
       _.first @where(id: id)
 
+    hasMorePages: ->
+      @current_page < @pages
+
     addThread: (thread, options) ->
+      # TODO: Check for existing thread with same ID in a faster way
+      if not @find(thread.id)
         options ||= {}
         model = new Thread thread
         @add model
         model
 
-  class @DiscussionView extends Backbone.View
-
-    $: (selector) ->
-      @$local.find(selector)
-
-    initLocal: ->
-      @$local = @$el.children(".local")
-      @$delegateElement = @$local
-
-    initialize: ->
-      @initLocal()
-      @model.id = @$el.attr("_id")
-      @model.view = @
-      @$el.children(".threads").children(".thread").each (index, elem) =>
-        threadView = new ThreadView el: elem, model: @model.find $(elem).attr("_id")
-      if @$el.hasClass("forum-discussion")
-        $(".discussion-sidebar").find(".sidebar-new-post-button")
-                                .unbind('click').click $.proxy @newPost, @
-      else if @$el.hasClass("inline-discussion")
-        @newPost()
-
-    reload: ($elem, url) ->
-      if not url then return
-      DiscussionUtil.safeAjax
-        $elem: $elem
-        $loading: $elem
-        loadingCallback: ->
-          $(this).parent().append("<span class='discussion-loading'></span>")
-        loadedCallback: ->
-          $(this).parent().children(".discussion-loading").remove()
-        url: url
-        type: "GET"
-        success: (response, textStatus) =>
-          $parent = @$el.parent()
-          @$el.replaceWith(response.html)
-          $discussion = $parent.find("section.discussion")
-          @model.reset(response.discussion_data, { silent: false })
-          view = new DiscussionView el: $discussion[0], model: @model
-          DiscussionUtil.bulkUpdateContentInfo(window.$$annotated_content_info)
-          $("html, body").animate({ scrollTop: 0 }, 0)
-
-    loadSimilarPost: (event) ->
-      console.log "loading similar"
-      $title = @$(".new-post-title")
-      $wrapper = @$(".new-post-similar-posts-wrapper")
-      $similarPosts = @$(".new-post-similar-posts")
-      prevText = $title.attr("prev-text")
-      text = $title.val()
-      if text == prevText
-        if @$(".similar-post").length
-          $wrapper.show()
-      else if $.trim(text).length
-        $elem = $(event.target)
-        url = DiscussionUtil.urlFor 'search_similar_threads', @model.id
-        data = { text: @$(".new-post-title").val() }
+    retrieveAnotherPage: (search_text="", commentable_ids="", sort_key="")->
+      # TODO: I really feel that this belongs in DiscussionThreadListView
+      @current_page += 1
+      url = DiscussionUtil.urlFor 'threads'
+      data = { page: @current_page }
+      if search_text
+        data['text'] = search_text
+      if sort_key
+        data['sort_key'] = sort_key
+      if commentable_ids
+        data['commentable_ids'] = commentable_ids
       DiscussionUtil.safeAjax
-          $elem: $elem
+        $elem: @$el
         url: url
         data: data
         dataType: 'json'
         success: (response, textStatus) =>
-            $wrapper.html(response.html)
-            if $wrapper.find(".similar-post").length
-              $wrapper.show()
-              $wrapper.find(".hide-similar-posts").click =>
-                $wrapper.hide()
-      else
-        $wrapper.hide()
-      $title.attr("prev-text", text)
-
-
-    newPost: ->
-      if not @$(".wmd-panel").length
-        view = { discussion_id: @model.id }
-        @$el.children(".discussion-non-content").append Mustache.render DiscussionUtil.getTemplate("_new_post"), view
-        $newPostBody = @$(".new-post-body")
-        DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "new-post-body"
-
-        $input = DiscussionUtil.getWmdInput @$el, $.proxy(@$, @), "new-post-body"
-        $input.attr("placeholder", "post a new topic...")
-        if @$el.hasClass("inline-discussion")
-          $input.bind 'focus', (e) =>
-            @$(".new-post-form").removeClass('collapsed')
-        else if @$el.hasClass("forum-discussion")
-          @$(".new-post-form").removeClass('collapsed')
-
-        @$(".new-post-tags").tagsInput DiscussionUtil.tagsInputOptions()
-
-        @$(".new-post-title").blur $.proxy(@loadSimilarPost, @)
-
-        @$(".hide-similar-posts").click =>
-          @$(".new-post-similar-posts-wrapper").hide()
-
-        @$(".discussion-submit-post").click $.proxy(@submitNewPost, @)
-        @$(".discussion-cancel-post").click $.proxy(@cancelNewPost, @)
-        
-
-      @$el.children(".blank").hide()
-      @$(".new-post-form").show()
-
-    submitNewPost: (event) ->
-      title = @$(".new-post-title").val()
-      body = DiscussionUtil.getWmdContent @$el, $.proxy(@$, @), "new-post-body"
-      tags = @$(".new-post-tags").val()
-      anonymous = false || @$(".discussion-post-anonymously").is(":checked")
-      autowatch = false || @$(".discussion-auto-watch").is(":checked")
-      url = DiscussionUtil.urlFor('create_thread', @model.id)
-      DiscussionUtil.safeAjax
-        $elem: $(event.target)
-        $loading: $(event.target) if event
-        url: url
-        type: "POST"
-        dataType: 'json'
-        data:
-          title: title
-          body: body
-          tags: tags
-          anonymous: anonymous
-          auto_subscribe: autowatch
-        error: DiscussionUtil.formErrorHandler(@$(".new-post-form-errors"))
-        success: (response, textStatus) =>
-          DiscussionUtil.clearFormErrors(@$(".new-post-form-errors"))
-          $thread = $(response.html)
-          @$el.children(".threads").prepend($thread)
-
-          @$el.children(".blank").remove()
-
-          @$(".new-post-similar-posts").empty()
-          @$(".new-post-similar-posts-wrapper").hide()
-          @$(".new-post-title").val("").attr("prev-text", "")
-          DiscussionUtil.setWmdContent @$el, $.proxy(@$, @), "new-post-body", ""
-          @$(".new-post-tags").val("")
-          @$(".new-post-tags").importTags("")
-
-          thread = @model.addThread response.content
-          threadView = new ThreadView el: $thread[0], model: thread
-          thread.updateInfo response.annotated_content_info
-          @cancelNewPost()
-          
-
-    cancelNewPost: (event) ->
-      if @$el.hasClass("inline-discussion")
-        @$(".new-post-form").addClass("collapsed")
-      else if @$el.hasClass("forum-discussion")
-        @$(".new-post-form").hide()
-      @$el.children(".blank").show()
-
-    search: (event) ->
-      event.preventDefault()
-      $elem = $(event.target)
-      url = URI($elem.attr("action")).addSearch({text: @$(".search-input").val()})
-      @reload($elem, url)
-
-    sort: (event) ->
-      $elem = $(event.target)
-      url = $elem.attr("sort-url")
-      @reload($elem, url)
-
-    page: (event) ->
-      $elem = $(event.target)
-      url = $elem.attr("page-url")
-      @reload($elem, url)
-
-    events:
-      "submit .search-wrapper>.discussion-search-form": "search"
-      "click .discussion-search-link": "search"
-      "click .discussion-sort-link": "sort"
-      "click .discussion-page-link": "page"
+          models = @models
+          new_threads = [new Thread(data) for data in response.discussion_data][0]
+          new_collection = _.union(models, new_threads)
+          @reset new_collection
+
+    sortByDate: (thread) ->
+      thread.get("created_at")
+
+    sortByDateRecentFirst: (thread) ->
+      -(new Date(thread.get("created_at")).getTime())
+      #return String.fromCharCode.apply(String,
+      #  _.map(thread.get("created_at").split(""),
+      #        ((c) -> return 0xffff - c.charChodeAt()))
+      #)
+
+    sortByVotes: (thread1, thread2) ->
+      thread1_count = parseInt(thread1.get("votes")['up_count'])
+      thread2_count = parseInt(thread2.get("votes")['up_count'])
+      thread2_count - thread1_count
+
+    sortByComments: (thread1, thread2) ->
+      thread1_count = parseInt(thread1.get("comments_count"))
+      thread2_count = parseInt(thread2.get("comments_count"))
+      thread2_count - thread1_count

lms/static/coffee/src/discussion/discussion_module.coffee

-if Backbone?
-  class @DiscussionModuleView extends Backbone.View
-    events:
-      "click .discussion-show": "toggleDiscussion"
-    toggleDiscussion: (event) ->
-      if @showed
-        @$("section.discussion").hide()
-        $(event.target).html("Show Discussion")
-        @showed = false
-      else
-        if @retrieved
-          @$("section.discussion").show()
-          $(event.target).html("Hide Discussion")
-          @showed = true
-        else
-          $elem = $(event.target)
-          discussion_id = $elem.attr("discussion_id")
-          url = DiscussionUtil.urlFor 'retrieve_discussion', discussion_id
-          DiscussionUtil.safeAjax
-            $elem: $elem
-            $loading: $elem
-            url: url
-            type: "GET"
-            dataType: 'json'
-            success: (response, textStatus) =>
-              @$el.append(response.html)
-              $discussion = @$el.find("section.discussion")
-              $(event.target).html("Hide Discussion")
-              discussion = new Discussion()
-              discussion.reset(response.discussion_data, {silent: false})
-              view = new DiscussionView(el: $discussion[0], model: discussion)
-              DiscussionUtil.bulkUpdateContentInfo(window.$$annotated_content_info)
-              @retrieved = true
-              @showed = true

lms/static/coffee/src/discussion/discussion_module_view.coffee

+if Backbone?
+  class @DiscussionModuleView extends Backbone.View
+    events:
+      "click .discussion-show": "toggleDiscussion"
+      "click .new-post-btn": "toggleNewPost"
+      "click .new-post-cancel": "hideNewPost"
+      "click .discussion-paginator a": "navigateToPage"
+
+    paginationTemplate: -> DiscussionUtil.getTemplate("_pagination")
+    page_re: /\?discussion_page=(\d+)/
+    initialize: ->
+      @toggleDiscussionBtn = @$(".discussion-show")
+      # Set the page if it was set in the URL. This is used to allow deep linking to pages
+      match = @page_re.exec(window.location.href)
+      if match
+        @page = parseInt(match[1])
+      else
+        @page = 1
+
+    toggleNewPost: (event) ->
+      event.preventDefault()
+      if !@newPostForm
+        @toggleDiscussion()
+        @isWaitingOnNewPost = true;
+        return
+      if @showed
+        @newPostForm.slideDown(300)
+      else
+        @newPostForm.show()
+      @toggleDiscussionBtn.addClass('shown')
+      @toggleDiscussionBtn.find('.button-text').html("Hide Discussion")
+      @$("section.discussion").slideDown()
+      @showed = true
+
+    hideNewPost: (event) ->
+      event.preventDefault()
+      @newPostForm.slideUp(300)
+
+    toggleDiscussion: (event) ->
+      if @showed
+        @$("section.discussion").slideUp()
+        @toggleDiscussionBtn.removeClass('shown')
+        @toggleDiscussionBtn.find('.button-text').html("Show Discussion")
+        @showed = false
+      else
+        @toggleDiscussionBtn.addClass('shown')
+        @toggleDiscussionBtn.find('.button-text').html("Hide Discussion")
+
+        if @retrieved
+          @$("section.discussion").slideDown()
+          @showed = true
+        else
+          $elem = @toggleDiscussionBtn
+          @loadPage $elem
+
+    loadPage: ($elem)=>
+      discussionId = @$el.data("discussion-id")
+      url = DiscussionUtil.urlFor('retrieve_discussion', discussionId) + "?page=#{@page}"
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        $loading: $elem
+        url: url
+        type: "GET"
+        dataType: 'json'
+        success: (response, textStatus, jqXHR) => @renderDiscussion($elem, response, textStatus, discussionId)
+
+    renderDiscussion: ($elem, response, textStatus, discussionId) =>
+      window.user = new DiscussionUser(response.user_info)
+      Content.loadContentInfos(response.annotated_content_info)
+      DiscussionUtil.loadRoles(response.roles)
+      allow_anonymous = response.allow_anonymous
+      allow_anonymous_to_peers = response.allow_anonymous_to_peers
+      # $elem.html("Hide Discussion")
+      @discussion = new Discussion()
+      @discussion.reset(response.discussion_data, {silent: false})
+      $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
+        $(".discussion-module").append($discussion)
+      @newPostForm = $('.new-post-article')
+      @threadviews = @discussion.map (thread) ->
+        new DiscussionThreadInlineView el: @$("article#thread_#{thread.id}"), model: thread
+      _.each @threadviews, (dtv) -> dtv.render()
+      DiscussionUtil.bulkUpdateContentInfo(window.$$annotated_content_info)
+      @newPostView = new NewPostInlineView el: @$('.new-post-article'), collection: @discussion
+      @discussion.on "add", @addThread
+      @retrieved = true
+      @showed = true
+      @renderPagination(2, response.num_pages)
+      if @isWaitingOnNewPost
+        @newPostForm.show()
+
+    addThread: (thread, collection, options) =>
+      # TODO: When doing pagination, this will need to repaginate. Perhaps just reload page 1?
+      article = $("<article class='discussion-thread' id='thread_#{thread.id}'></article>")
+      @$('section.discussion > .threads').prepend(article)
+      threadView = new DiscussionThreadInlineView el: article, model: thread
+      threadView.render()
+      @threadviews.unshift threadView
+
+    renderPagination: (delta, numPages) =>
+      minPage = Math.max(@page - delta, 1)
+      maxPage = Math.min(@page + delta, numPages)
+      pageUrl = (number) ->
+        "?discussion_page=#{number}"
+      params =
+        page: @page
+        lowPages: _.range(minPage, @page).map (n) -> {number: n, url: pageUrl(n)}
+        highPages: _.range(@page+1, maxPage+1).map (n) -> {number: n, url: pageUrl(n)}
+        previous: if @page-1 >= 1 then {url: pageUrl(@page-1), number: @page-1} else false
+        next: if @page+1 <= numPages then {url: pageUrl(@page+1), number: @page+1} else false
+        leftdots: minPage > 2
+        rightdots: maxPage < numPages-1
+        first: if minPage > 1 then {url: pageUrl(1)} else false
+        last: if maxPage < numPages then {number: numPages, url: pageUrl(numPages)} else false
+      thing = Mustache.render @paginationTemplate(), params
+      @$('section.pagination').html(thing)
+
+    navigateToPage: (event) =>
+      event.preventDefault()
+      window.history.pushState({}, window.document.title, event.target.href)
+      @page = $(event.target).data('page-number')
+      @loadPage($(event.target))

lms/static/coffee/src/discussion/discussion_router.coffee

+if Backbone?
+  class @DiscussionRouter extends Backbone.Router
+    routes:
+      "": "allThreads"
+      ":forum_name/threads/:thread_id" : "showThread"
+
+    initialize: (options) ->
+        @discussion = options['discussion']
+        @nav = new DiscussionThreadListView(collection: @discussion, el: $(".sidebar"))
+        @nav.on "thread:selected", @navigateToThread
+        @nav.on "thread:removed", @navigateToAllThreads
+        @nav.on "threads:rendered", @setActiveThread
+        @nav.render()
+
+        @newPostView = new NewPostView(el: $(".new-post-article"), collection: @discussion)
+        @nav.on "thread:created", @navigateToThread
+
+    allThreads: ->
+      @nav.updateSidebar()
+
+    setActiveThread: =>
+      if @thread
+        @nav.setActiveThread(@thread.get("id"))
+
+    showThread: (forum_name, thread_id) ->
+      @thread = @discussion.get(thread_id)
+      @setActiveThread()
+      if(@main)
+        @main.cleanup()
+        @main.undelegateEvents()
+
+      @main = new DiscussionThreadView(el: $(".discussion-column"), model: @thread)
+      @main.render()
+      @main.on "thread:responses:rendered", =>
+        @nav.updateSidebar()
+      @main.on "tag:selected", (tag) =>
+        search = "[#{tag}]"
+        @nav.setAndSearchFor(search)
+
+    navigateToThread: (thread_id) =>
+      thread = @discussion.get(thread_id)
+      @navigate("#{thread.get("commentable_id")}/threads/#{thread_id}", trigger: true)
+
+    navigateToAllThreads: =>
+      @navigate("", trigger: true)

lms/static/coffee/src/discussion/main.coffee

-$ ->
-
-  window.$$contents = {}
-  window.$$discussions = {}
-
+if Backbone?
+  DiscussionApp =
+    start: (elem)->
+      # TODO: Perhaps eliminate usage of global variables when possible
+      DiscussionUtil.loadRolesFromContainer()
+      element = $(elem)
+      window.$$course_id = element.data("course-id")
+      user_info = element.data("user-info")
+      threads = element.data("threads")
+      thread_pages = element.data("thread-pages")
+      content_info = element.data("content-info")
+      window.user = new DiscussionUser(user_info)
+      Content.loadContentInfos(content_info)
+      discussion = new Discussion(threads, pages: thread_pages)
+      new DiscussionRouter({discussion: discussion})
+      Backbone.history.start({pushState: true, root: "/courses/#{$$course_id}/discussion/forum/"})
+  DiscussionProfileApp =
+    start: (elem) ->
+      element = $(elem)
+      window.$$course_id = element.data("course-id")
+      threads = element.data("threads")
+      user_info = element.data("user-info")
+      window.user = new DiscussionUser(user_info)
+      new DiscussionUserProfileView(el: element, collection: threads)
+  $ ->
     $("section.discussion").each (index, elem) ->
-    discussionData = DiscussionUtil.getDiscussionData($(elem).attr("_id"))
-    discussion = new Discussion()
-    discussion.reset(discussionData, {silent: false})
-    view = new DiscussionView(el: elem, model: discussion)
-
-  if window.$$annotated_content_info?
-    DiscussionUtil.bulkUpdateContentInfo(window.$$annotated_content_info)
-
-  $userProfile = $(".discussion-sidebar>.user-profile")
-  if $userProfile.length
-    console.log "initialize user profile"
-    view = new DiscussionUserProfileView(el: $userProfile[0])
+      DiscussionApp.start(elem)
+    $("section.discussion-user-threads").each (index, elem) ->
+      DiscussionProfileApp.start(elem)

lms/static/coffee/src/discussion/models/discussion_user.coffee

+if Backbone?
+  class @DiscussionUser extends Backbone.Model
+      following: (thread) ->
+          _.include(@get('subscribed_thread_ids'), thread.id)
+
+      voted: (thread) ->
+          _.include(@get('upvoted_ids'), thread.id)
+
+      vote: (thread) ->
+          @get('upvoted_ids').push(thread.id)
+          thread.vote()
+
+      unvote: (thread) ->
+          @set('upvoted_ids', _.without(@get('upvoted_ids'), thread.id))
+          thread.unvote()

lms/static/coffee/src/discussion/user_profile.coffee

-class @DiscussionUserProfileView extends Backbone.View
+if Backbone?
+  class @DiscussionUserProfileView extends Backbone.View
     toggleModeratorStatus: (event) ->
       confirmValue = confirm("Are you sure?")
       if not confirmValue then return

lms/static/coffee/src/discussion/utils.coffee

 $ ->
+  if !window.$$contents
+    window.$$contents = {}
   $.fn.extend
     loading: ->
-      @$_loading = $("<span class='discussion-loading'></span>")
+      @$_loading = $("<div class='loading-animation'></div>")
       $(this).after(@$_loading)
     loaded: ->
       @$_loading.remove()
@@ -13,20 +15,19 @@ class @DiscussionUtil
   @getTemplate: (id) ->
     $("script##{id}").html()
 
-  @getDiscussionData: (id) ->
-    return $$discussion_data[id]
+  @loadRoles: (roles)->
+    @roleIds = roles
 
-  @addContent: (id, content) -> window.$$contents[id] = content
+  @loadRolesFromContainer: ->
+    @loadRoles($("#discussion-container").data("roles"))
 
-  @getContent: (id) -> window.$$contents[id]
-
-  @addDiscussion: (id, discussion) -> window.$$discussions[id] = discussion
-
-  @getDiscussion: (id) -> window.$$discussions[id]
+  @isStaff: (user_id) ->
+    staff = _.union(@roleIds['Staff'], @roleIds['Moderator'], @roleIds['Administrator'])
+    _.include(staff, parseInt(user_id))
 
   @bulkUpdateContentInfo: (infos) ->
     for id, info of infos
-      @getContent(id).updateInfo(info)
+      Content.getContent(id).updateInfo(info)
 
   @generateDiscussionLink: (cls, txt, handler) ->
     $("<a>").addClass("discussion-link")
@@ -64,26 +65,32 @@ class @DiscussionUtil
       openclose_thread        : "/courses/#{$$course_id}/discussion/threads/#{param}/close"
       permanent_link_thread   : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}"
       permanent_link_comment  : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}##{param2}"
+      user_profile            : "/courses/#{$$course_id}/discussion/forum/users/#{param}"
+      threads                 : "/courses/#{$$course_id}/discussion/forum"
     }[name]
 
   @safeAjax: (params) ->
     $elem = params.$elem
-    if $elem.attr("disabled")
+    if $elem and $elem.attr("disabled")
       return
+    params["url"] = URI(params["url"]).addSearch ajax: 1
     params["beforeSend"] = ->
+      if $elem
         $elem.attr("disabled", "disabled")
       if params["$loading"]
         if params["loadingCallback"]?
           params["loadingCallback"].apply(params["$loading"])
         else
           params["$loading"].loading()
-    $.ajax(params).always ->
+    request = $.ajax(params).always ->
+      if $elem
         $elem.removeAttr("disabled")
       if params["$loading"]
         if params["loadedCallback"]?
           params["loadedCallback"].apply(params["$loading"])
         else
           params["$loading"].loaded()
+    return request
 
   @get: ($elem, url, data, success) ->
     @safeAjax
@@ -108,6 +115,9 @@ class @DiscussionUtil
       [event, selector] = eventSelector.split(' ')
       $local(selector).unbind(event)[event] handler
 
+  @processTag: (text) ->
+    text.toLowerCase()
+
   @tagsInputOptions: ->
     autocomplete_url: @urlFor('tags_autocomplete')
     autocomplete:
@@ -117,6 +127,7 @@ class @DiscussionUtil
     width: '100%'
     defaultText: "Tag your post: press enter after each tag"
     removeWithBackspace: true
+    preprocessTag: @processTag
 
   @formErrorHandler: (errorsField) ->
     (xhr, textStatus, error) ->
@@ -124,7 +135,7 @@ class @DiscussionUtil
       if response.errors? and response.errors.length > 0
         errorsField.empty()
         for error in response.errors
-          errorsField.append($("<li>").addClass("new-post-form-error").html(error))
+          errorsField.append($("<li>").addClass("new-post-form-error").html(error)).show()
 
   @clearFormErrors: (errorsField) ->
     errorsField.empty()
@@ -144,21 +155,26 @@ class @DiscussionUtil
 
   @makeWmdEditor: ($content, $local, cls_identifier) ->
     elem = $local(".#{cls_identifier}")
-    id = $content.attr("_id")
+    placeholder = elem.data('placeholder')
+    id = elem.data("id")
     appended_id = "-#{cls_identifier}-#{id}"
     imageUploadUrl = @urlFor('upload')
     _processor = (_this) ->
       (text) -> _this.postMathJaxProcessor(text)
     editor = Markdown.makeWmdEditor elem, appended_id, imageUploadUrl, _processor(@)
     @wmdEditors["#{cls_identifier}-#{id}"] = editor
+    if placeholder?
+      elem.find("#wmd-input#{appended_id}").attr('placeholder', placeholder)
     editor
 
   @getWmdEditor: ($content, $local, cls_identifier) ->
-    id = $content.attr("_id")
+    elem = $local(".#{cls_identifier}")
+    id = elem.data("id")
     @wmdEditors["#{cls_identifier}-#{id}"]
 
   @getWmdInput: ($content, $local, cls_identifier) ->
-    id = $content.attr("_id")
+    elem = $local(".#{cls_identifier}")
+    id = elem.data("id")
     $local("#wmd-input-#{cls_identifier}-#{id}")
 
   @getWmdContent: ($content, $local, cls_identifier) ->
@@ -264,5 +280,17 @@ class @DiscussionUtil
     @processEachMathAndCode text, @stripHighlight
 
   @markdownWithHighlight: (text) ->
+    text = text.replace(/^\&gt\;/gm, ">")
     converter = Markdown.getMathCompatibleConverter()
-    @unescapeHighlightTag @stripLatexHighlight converter.makeHtml text
+    text = @unescapeHighlightTag @stripLatexHighlight converter.makeHtml text
+    return text.replace(/^>/gm,"&gt;")
+
+  @abbreviateString: (text, minLength) ->
+    # Abbreviates a string to at least minLength characters, stopping at word boundaries
+    if text.length<minLength
+      return text
+    else
+      while minLength < text.length && text[minLength] != ' '
+        minLength++
+      return text.substr(0, minLength) + '...'
+

lms/static/coffee/src/discussion/views/discussion_content_view.coffee

+if Backbone?
+  class @DiscussionContentView extends Backbone.View
+
+    attrRenderer:
+      endorsed: (endorsed) ->
+        if endorsed
+          @$(".action-endorse").show().addClass("is-endorsed")
+        else
+          if @model.get('ability')?.can_endorse
+            @$(".action-endorse").show()
+          else
+            @$(".action-endorse").hide()
+          @$(".action-endorse").removeClass("is-endorsed")
+
+      closed: (closed) ->
+        return if not @$(".action-openclose").length
+        return if not @$(".post-status-closed").length
+        if closed
+          @$(".post-status-closed").show()
+          @$(".action-openclose").html(@$(".action-openclose").html().replace("Close", "Open"))
+          @$(".discussion-reply-new").hide()
+        else
+          @$(".post-status-closed").hide()
+          @$(".action-openclose").html(@$(".action-openclose").html().replace("Open", "Close"))
+          @$(".discussion-reply-new").show()
+
+      voted: (voted) ->
+
+      votes_point: (votes_point) ->
+
+      comments_count: (comments_count) ->
+
+      subscribed: (subscribed) ->
+        if subscribed
+          @$(".dogear").addClass("is-followed")
+        else
+          @$(".dogear").removeClass("is-followed")
+
+      ability: (ability) ->
+        for action, selector of @abilityRenderer
+          if not ability[action]
+            selector.disable.apply(@)
+          else
+            selector.enable.apply(@)
+
+    abilityRenderer:
+      editable:
+        enable: -> @$(".action-edit").closest("li").show()
+        disable: -> @$(".action-edit").closest("li").hide()
+      can_delete:
+        enable: -> @$(".action-delete").closest("li").show()
+        disable: -> @$(".action-delete").closest("li").hide()
+      can_endorse:
+        enable: ->
+          @$(".action-endorse").show().css("cursor", "auto")
+        disable: ->
+          @$(".action-endorse").css("cursor", "default")
+          if not @model.get('endorsed')
+            @$(".action-endorse").hide()
+          else
+            @$(".action-endorse").show()
+      can_openclose:
+        enable: -> @$(".action-openclose").closest("li").show()
+        disable: -> @$(".action-openclose").closest("li").hide()
+
+    renderPartialAttrs: ->
+      for attr, value of @model.changedAttributes()
+        if @attrRenderer[attr]
+          @attrRenderer[attr].apply(@, [value])
+
+    renderAttrs: ->
+      for attr, value of @model.attributes
+        if @attrRenderer[attr]
+          @attrRenderer[attr].apply(@, [value])
+
+    $: (selector) ->
+      @$local.find(selector)
+
+    initLocal: ->
+      @$local = @$el.children(".local")
+      if not @$local.length
+        @$local = @$el
+      @$delegateElement = @$local
+
+    makeWmdEditor: (cls_identifier) =>
+      if not @$el.find(".wmd-panel").length
+        DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), cls_identifier
+
+    getWmdEditor: (cls_identifier) =>
+      DiscussionUtil.getWmdEditor @$el, $.proxy(@$, @), cls_identifier
+
+    getWmdContent: (cls_identifier) =>
+      DiscussionUtil.getWmdContent @$el, $.proxy(@$, @), cls_identifier
+
+    setWmdContent: (cls_identifier, text) =>
+      DiscussionUtil.setWmdContent @$el, $.proxy(@$, @), cls_identifier, text
+
+    initialize: ->
+      @initLocal()
+      @model.bind('change', @renderPartialAttrs, @)

lms/static/coffee/src/discussion/views/discussion_thread_edit_view.coffee

+if Backbone?
+  class @DiscussionThreadEditView extends Backbone.View
+
+    events:
+      "click .post-update": "update"
+      "click .post-cancel": "cancel_edit"
+
+    $: (selector) ->
+      @$el.find(selector)
+
+    initialize: ->
+      super()
+
+    render: ->
+      @template = _.template($("#thread-edit-template").html())
+      @$el.html(@template(@model.toJSON()))
+      @delegateEvents()
+      DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "edit-post-body"
+      @$(".edit-post-tags").tagsInput DiscussionUtil.tagsInputOptions()
+      @
+
+    update: (event) ->
+      @trigger "thread:update", event
+
+    cancel_edit: (event) ->
+      @trigger "thread:cancel_edit", event

lms/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee

+if Backbone?
+  class @DiscussionThreadProfileView extends DiscussionContentView
+    expanded = false
+    events:
+      "click .discussion-vote": "toggleVote"
+      "click .action-follow": "toggleFollowing"
+      "click .expand-post": "expandPost"
+      "click .collapse-post": "collapsePost"
+
+    initLocal: ->
+      @$local = @$el.children(".discussion-article").children(".local")
+      @$delegateElement = @$local
+
+    initialize: ->
+      super()
+      @model.on "change", @updateModelDetails
+
+    render: ->
+      @template = DiscussionUtil.getTemplate("_profile_thread")
+      if not @model.has('abbreviatedBody')
+        @abbreviateBody()
+      params = $.extend(@model.toJSON(),{expanded: @expanded, permalink: @model.urlFor('retrieve')})
+      if not @model.get('anonymous')
+        params = $.extend(params, user:{username: @model.username, user_url: @model.user_url})
+      @$el.html(Mustache.render(@template, params))
+      @initLocal()
+      @delegateEvents()
+      @renderDogear()
+      @renderVoted()
+      @renderAttrs()
+      @$("span.timeago").timeago()
+      @convertMath()
+      if @expanded
+        @renderResponses()
+      @
+
+    renderDogear: ->
+      if window.user.following(@model)
+        @$(".dogear").addClass("is-followed")
+
+    renderVoted: =>
+      if window.user.voted(@model)
+        @$("[data-role=discussion-vote]").addClass("is-cast")
+      else
+        @$("[data-role=discussion-vote]").removeClass("is-cast")
+
+    updateModelDetails: =>
+      @renderVoted()
+      @$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"])
+
+    convertMath: ->
+      element = @$(".post-body")
+      element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.html()
+      MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]]
+
+    renderResponses: ->
+      DiscussionUtil.safeAjax
+        url: "/courses/#{$$course_id}/discussion/forum/#{@model.get('commentable_id')}/threads/#{@model.id}"
+        $loading: @$el
+        success: (data, textStatus, xhr) =>
+          @$el.find(".loading").remove()
+          Content.loadContentInfos(data['annotated_content_info'])
+          comments = new Comments(data['content']['children'])
+          comments.each @renderResponse
+          @trigger "thread:responses:rendered"
+
+    renderResponse: (response) =>
+      response.set('thread', @model)
+      view = new ThreadResponseView(model: response)
+      view.on "comment:add", @addComment
+      view.render()
+      @$el.find(".responses").append(view.el)
+
+    addComment: =>
+      @model.comment()
+
+    toggleVote: (event) ->
+      event.preventDefault()
+      if window.user.voted(@model)
+        @unvote()
+      else
+        @vote()
+
+    toggleFollowing: (event) ->
+      $elem = $(event.target)
+      url = null
+      console.log "follow"
+      if not @model.get('subscribed')
+        @model.follow()
+        url = @model.urlFor("follow")
+      else
+        @model.unfollow()
+        url = @model.urlFor("unfollow")
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        url: url
+        type: "POST"
+
+    vote: ->
+      window.user.vote(@model)
+      url = @model.urlFor("upvote")
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-vote")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            @model.set(response)
+
+    unvote: ->
+      window.user.unvote(@model)
+      url = @model.urlFor("unvote")
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-vote")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            @model.set(response)
+
+    edit: ->
+
+    abbreviateBody: ->
+      abbreviated = DiscussionUtil.abbreviateString @model.get('body'), 140
+      @model.set('abbreviatedBody', abbreviated)
+
+    expandPost: (event) ->
+      @expanded = true
+      @$el.addClass('expanded')
+      @$el.find('.post-body').html(@model.get('body'))
+      @convertMath()
+      @$el.find('.expand-post').css('display', 'none')
+      @$el.find('.collapse-post').css('display', 'block')
+      @$el.find('.post-extended-content').show()
+      if @$el.find('.loading').length
+        @renderResponses()
+
+    collapsePost: (event) ->
+      @expanded = false
+      @$el.removeClass('expanded')
+      @$el.find('.post-body').html(@model.get('abbreviatedBody'))
+      @convertMath()
+      @$el.find('.collapse-post').css('display', 'none')
+      @$el.find('.post-extended-content').hide()
+      @$el.find('.expand-post').css('display', 'block')

lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee

+if Backbone?
+  class @DiscussionThreadShowView extends DiscussionContentView
+
+    events:
+      "click .discussion-vote": "toggleVote"
+      "click .action-follow": "toggleFollowing"
+      "click .action-edit": "edit"
+      "click .action-delete": "delete"
+      "click .action-openclose": "toggleClosed"
+
+    $: (selector) ->
+      @$el.find(selector)
+
+    initialize: ->
+      super()
+      @model.on "change", @updateModelDetails
+
+    renderTemplate: ->
+      @template = _.template($("#thread-show-template").html())
+      @template(@model.toJSON())
+
+    render: ->
+      @$el.html(@renderTemplate())
+      @delegateEvents()
+      @renderDogear()
+      @renderVoted()
+      @renderAttrs()
+      @$("span.timeago").timeago()
+      @convertMath()
+      @highlight @$(".post-body")
+      @highlight @$("h1,h3")
+      @
+
+    renderDogear: ->
+      if window.user.following(@model)
+        @$(".dogear").addClass("is-followed")
+
+    renderVoted: =>
+      if window.user.voted(@model)
+        @$("[data-role=discussion-vote]").addClass("is-cast")
+      else
+        @$("[data-role=discussion-vote]").removeClass("is-cast")
+
+    updateModelDetails: =>
+      @renderVoted()
+      @$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"])
+
+    convertMath: ->
+      element = @$(".post-body")
+      element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.html()
+      MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]]
+
+    toggleVote: (event) ->
+      event.preventDefault()
+      if window.user.voted(@model)
+        @unvote()
+      else
+        @vote()
+
+    toggleFollowing: (event) ->
+      $elem = $(event.target)
+      url = null
+      if not @model.get('subscribed')
+        @model.follow()
+        url = @model.urlFor("follow")
+      else
+        @model.unfollow()
+        url = @model.urlFor("unfollow")
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        url: url
+        type: "POST"
+
+    vote: ->
+      window.user.vote(@model)
+      url = @model.urlFor("upvote")
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-vote")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            @model.set(response, {silent: true})
+
+    unvote: ->
+      window.user.unvote(@model)
+      url = @model.urlFor("unvote")
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-vote")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            @model.set(response, {silent: true})
+
+    edit: (event) ->
+      @trigger "thread:edit", event
+
+    delete: (event) ->
+      @trigger "thread:delete", event
+
+    toggleClosed: (event) ->
+      $elem = $(event.target)
+      url = @model.urlFor('close')
+      closed = @model.get('closed')
+      data = { closed: not closed }
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        url: url
+        data: data
+        type: "POST"
+        success: (response, textStatus) =>
+          @model.set('closed', not closed)
+          @model.set('ability', response.ability)
+
+    toggleEndorse: (event) ->
+      $elem = $(event.target)
+      url = @model.urlFor('endorse')
+      endorsed = @model.get('endorsed')
+      data = { endorsed: not endorsed }
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        url: url
+        data: data
+        type: "POST"
+        success: (response, textStatus) =>
+          @model.set('endorsed', not endorsed)
+
+    highlight: (el) ->
+      if el.html()
+        el.html(el.html().replace(/&lt;mark&gt;/g, "<mark>").replace(/&lt;\/mark&gt;/g, "</mark>"))
+
+  class @DiscussionThreadInlineShowView extends DiscussionThreadShowView
+    renderTemplate: ->
+      @template = DiscussionUtil.getTemplate('_inline_thread_show')
+      params = @model.toJSON()
+      if @model.get('username')?
+        params = $.extend(params, user:{username: @model.username, user_url: @model.user_url})
+      Mustache.render(@template, params)

lms/static/coffee/src/discussion/views/discussion_thread_view.coffee

+if Backbone?
+  class @DiscussionThreadView extends DiscussionContentView
+
+    events:
+      "click .discussion-submit-post": "submitComment"
+
+      # TODO tags
+      # Until we decide what to do w/ tags, removing them.
+      #"click .thread-tag": "tagSelected"
+
+    $: (selector) ->
+      @$el.find(selector)
+
+    initialize: ->
+      super()
+      @createShowView()
+
+    renderTemplate: ->
+      @template = _.template($("#thread-template").html())
+      @template(@model.toJSON())
+
+    render: ->
+      @$el.html(@renderTemplate())
+      @$el.find(".loading").hide()
+      @delegateEvents()
+
+      @renderShowView()
+      @renderAttrs()
+
+      # TODO tags
+      # Until we decide what to do w/ tags, removing them.
+      #@renderTags()
+
+      @$("span.timeago").timeago()
+      @makeWmdEditor "reply-body"
+      @renderResponses()
+      @
+
+    cleanup: ->
+      if @responsesRequest?
+        @responsesRequest.abort()
+
+    # TODO tags
+    # Until we decide what to do w/ tags, removing them.
+    #renderTags: ->
+    #  # tags
+    #  for tag in @model.get("tags")
+    #    if !tags
+    #      tags = $('<div class="thread-tags">')
+    #    tags.append("<a href='#' class='thread-tag'>#{tag}</a>")
+    #  @$(".post-body").after(tags)
+
+    # TODO tags
+    # Until we decide what to do w tags, removing them.
+    #tagSelected: (e) ->
+    #  @trigger "tag:selected", $(e.target).html()
+
+    renderResponses: ->
+      setTimeout(=>
+        @$el.find(".loading").show()
+      , 200)
+      @responsesRequest = DiscussionUtil.safeAjax
+        url: DiscussionUtil.urlFor('retrieve_single_thread', @model.get('commentable_id'), @model.id)
+        success: (data, textStatus, xhr) =>
+          @responsesRequest = null
+          @$el.find(".loading").remove()
+          Content.loadContentInfos(data['annotated_content_info'])
+          comments = new Comments(data['content']['children'])
+          comments.each @renderResponse
+          @trigger "thread:responses:rendered"
+
+    renderResponse: (response) =>
+        response.set('thread', @model)
+        view = new ThreadResponseView(model: response)
+        view.on "comment:add", @addComment
+        view.on "comment:endorse", @endorseThread
+        view.render()
+        @$el.find(".responses").append(view.el)
+        view.afterInsert()
+
+    addComment: =>
+      @model.comment()
+
+    endorseThread: (endorsed) =>
+      is_endorsed = @$el.find(".is-endorsed").length
+      @model.set 'endorsed', is_endorsed
+
+    submitComment: (event) ->
+      event.preventDefault()
+      url = @model.urlFor('reply')
+      body = @getWmdContent("reply-body")
+      return if not body.trim().length
+      @setWmdContent("reply-body", "")
+      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), votes: { up_count: 0 }, endorsed: false, user_id: window.user.get("id"))
+      comment.set('thread', @model.get('thread'))
+      @renderResponse(comment)
+      @model.addComment()
+
+      DiscussionUtil.safeAjax
+        $elem: $(event.target)
+        url: url
+        type: "POST"
+        dataType: 'json'
+        data:
+          body: body
+        success: (data, textStatus) =>
+          comment.updateInfo(data.annotated_content_info)
+          comment.set(data.content)
+
+    edit: (event) =>
+      @createEditView()
+      @renderEditView()
+
+    update: (event) =>
+
+      newTitle = @editView.$(".edit-post-title").val()
+      newBody  = @editView.$(".edit-post-body textarea").val()
+
+      # TODO tags
+      # Until we decide what to do w/ tags, removing them.
+      #newTags  = @editView.$(".edit-post-tags").val()
+
+      url = DiscussionUtil.urlFor('update_thread', @model.id)
+
+      DiscussionUtil.safeAjax
+          $elem: $(event.target)
+          $loading: $(event.target) if event
+          url: url
+          type: "POST"
+          dataType: 'json'
+          async: false # TODO when the rest of the stuff below is made to work properly..
+          data:
+              title: newTitle
+              body: newBody
+
+              # TODO tags
+              # Until we decide what to do w/ tags, removing them.
+              #tags: newTags
+
+          error: DiscussionUtil.formErrorHandler(@$(".edit-post-form-errors"))
+          success: (response, textStatus) =>
+              # TODO: Move this out of the callback, this makes it feel sluggish
+              @editView.$(".edit-post-title").val("").attr("prev-text", "")
+              @editView.$(".edit-post-body textarea").val("").attr("prev-text", "")
+              @editView.$(".edit-post-tags").val("")
+              @editView.$(".edit-post-tags").importTags("")
+              @editView.$(".wmd-preview p").html("")
+
+              @model.set
+                title: newTitle
+                body: newBody
+                tags: response.content.tags
+
+              @createShowView()
+              @renderShowView()
+
+              # TODO tags
+              # Until we decide what to do w/ tags, removing them.
+              #@renderTags()
+
+    createEditView: () ->
+
+      if @showView?
+        @showView.undelegateEvents()
+        @showView.$el.empty()
+        @showView = null
+
+      @editView = new DiscussionThreadEditView(model: @model)
+      @editView.bind "thread:update", @update
+      @editView.bind "thread:cancel_edit", @cancelEdit
+
+    renderSubView: (view) ->
+      view.setElement(@$('.thread-content-wrapper'))
+      view.render()
+      view.delegateEvents()
+
+    renderEditView: () ->
+      @renderSubView(@editView)
+
+    createShowView: () ->
+
+      if @editView?
+        @editView.undelegateEvents()
+        @editView.$el.empty()
+        @editView = null
+
+      @showView = new DiscussionThreadShowView(model: @model)
+      @showView.bind "thread:delete", @delete
+      @showView.bind "thread:edit", @edit
+
+    renderShowView: () ->
+      @renderSubView(@showView)
+
+    cancelEdit: (event) =>
+      event.preventDefault()
+      @createShowView()
+      @renderShowView()
+
+
+    delete: (event) =>
+      url = @model.urlFor('delete')
+      if not @model.can('can_delete')
+        return
+      if not confirm "Are you sure to delete thread \"#{@model.get('title')}\"?"
+        return
+      @model.remove()
+      @showView.undelegateEvents()
+      @undelegateEvents()
+      @$el.empty()
+      $elem = $(event.target)
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>

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

+if Backbone?
+  class @DiscussionThreadInlineView extends DiscussionThreadView
+    expanded = false
+    events:
+      "click .discussion-submit-post": "submitComment"
+      "click .expand-post": "expandPost"
+      "click .collapse-post": "collapsePost"
+
+    initialize: ->
+      super()
+
+    initLocal: ->
+      @$local = @$el.children(".discussion-article").children(".local")
+      if not @$local.length
+        @$local = @$el
+      @$delegateElement = @$local
+
+    render: ->
+      @template = DiscussionUtil.getTemplate("_inline_thread")
+
+      if not @model.has('abbreviatedBody')
+        @abbreviateBody()
+      params = @model.toJSON()
+      @$el.html(Mustache.render(@template, params))
+      #@createShowView()
+
+      @initLocal()
+      @delegateEvents()
+      @renderShowView()
+      @renderAttrs()
+
+      # TODO tags commenting out til we decide what to do with tags
+      #@renderTags()
+
+      @$("span.timeago").timeago()
+      @$el.find('.post-extended-content').hide()
+      if @expanded
+        @makeWmdEditor "reply-body"
+        @renderResponses()
+      @
+    createShowView: () ->
+      
+      if @editView?
+        @editView.undelegateEvents()
+        @editView.$el.empty()
+        @editView = null
+      @showView = new DiscussionThreadInlineShowView(model: @model)
+      @showView.bind "thread:delete", @delete
+      @showView.bind "thread:edit", @edit
+
+    renderResponses: ->
+      #TODO: threadview
+      DiscussionUtil.safeAjax
+        url: "/courses/#{$$course_id}/discussion/forum/#{@model.get('commentable_id')}/threads/#{@model.id}"
+        $loading: @$el
+        success: (data, textStatus, xhr) =>
+          #          @$el.find(".loading").remove()
+          Content.loadContentInfos(data['annotated_content_info'])
+          comments = new Comments(data['content']['children'])
+          comments.each @renderResponse
+          @trigger "thread:responses:rendered"
+          @$('.loading').remove()
+
+
+    toggleClosed: (event) ->
+      #TODO: showview
+      $elem = $(event.target)
+      url = @model.urlFor('close')
+      closed = @model.get('closed')
+      data = { closed: not closed }
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        url: url
+        data: data
+        type: "POST"
+        success: (response, textStatus) =>
+          @model.set('closed', not closed)
+          @model.set('ability', response.ability)
+
+    toggleEndorse: (event) ->
+      #TODO: showview
+      $elem = $(event.target)
+      url = @model.urlFor('endorse')
+      endorsed = @model.get('endorsed')
+      data = { endorsed: not endorsed }
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        url: url
+        data: data
+        type: "POST"
+        success: (response, textStatus) =>
+          @model.set('endorsed', not endorsed)
+
+    abbreviateBody: ->
+      abbreviated = DiscussionUtil.abbreviateString @model.get('body'), 140
+      @model.set('abbreviatedBody', abbreviated)
+
+    expandPost: (event) =>
+      @expanded = true
+      @$el.addClass('expanded')
+      @$el.find('.post-body').html(@model.get('body'))
+      @showView.convertMath()
+      @$el.find('.expand-post').css('display', 'none')
+      @$el.find('.collapse-post').css('display', 'block')
+      @$el.find('.post-extended-content').show()
+      @makeWmdEditor "reply-body"
+      @renderAttrs()
+      if @$el.find('.loading').length
+        @renderResponses()
+
+    collapsePost: (event) ->
+      @expanded = false
+      @$el.removeClass('expanded')
+      @$el.find('.post-body').html(@model.get('abbreviatedBody'))
+      @showView.convertMath()
+      @$el.find('.collapse-post').css('display', 'none')
+      @$el.find('.post-extended-content').hide()
+      @$el.find('.expand-post').css('display', 'block')
+
+    createEditView: () ->
+      super()
+      @editView.bind "thread:update", @expandPost
+      @editView.bind "thread:update", @abbreviateBody
+      @editView.bind "thread:cancel_edit", @expandPost

lms/static/coffee/src/discussion/views/discussion_user_profile_view.coffee

+if Backbone?
+  class @DiscussionUserProfileView extends Backbone.View
+#    events:
+#      "":""
+    initialize: (options) ->
+      @renderThreads @$el, @collection
+    renderThreads: ($elem, threads) =>
+      #Content.loadContentInfos(response.annotated_content_info)
+      console.log threads
+      @discussion = new Discussion()
+      @discussion.reset(threads, {silent: false})
+      $discussion = $(Mustache.render $("script#_user_profile").html(), {'threads':threads})
+      console.log $discussion
+      $elem.append($discussion)
+      @threadviews = @discussion.map (thread) ->
+        new DiscussionThreadProfileView el: @$("article#thread_#{thread.id}"), model: thread
+      console.log @threadviews
+      _.each @threadviews, (dtv) -> dtv.render()
+
+    addThread: (thread, collection, options) =>
+      # TODO: When doing pagination, this will need to repaginate. Perhaps just reload page 1?
+      article = $("<article class='discussion-thread' id='thread_#{thread.id}'></article>")
+      @$('section.discussion > .threads').prepend(article)
+      threadView = new DiscussionThreadInlineView el: article, model: thread
+      threadView.render()
+      @threadviews.unshift threadView

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

+if Backbone?
+  class @NewPostInlineView extends Backbone.View
+
+    initialize: () ->
+
+      @topicId    = @$(".topic").first().data("discussion-id")
+
+      @maxNameWidth = 100
+
+      DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "new-post-body"
+
+      # TODO tags: commenting out til we know what to do with them
+      #@$(".new-post-tags").tagsInput DiscussionUtil.tagsInputOptions()
+
+    events:
+      "submit .new-post-form":            "createPost"
+
+    # Because we want the behavior that when the body is clicked the menu is
+    # closed, we need to ignore clicks in the search field and stop propagation.
+    # Without this, clicking the search field would also close the menu.
+    ignoreClick: (event) ->
+      event.stopPropagation()
+
+    createPost: (event) ->
+      event.preventDefault()
+      title   = @$(".new-post-title").val()
+      body    = @$(".new-post-body").find(".wmd-input").val()
+
+      # TODO tags: commenting out til we know what to do with them
+      #tags    = @$(".new-post-tags").val()
+
+      anonymous          = false || @$("input.discussion-anonymous").is(":checked")
+      anonymous_to_peers = false || @$("input.discussion-anonymous-to-peers").is(":checked")
+      follow    = false || @$("input.discussion-follow").is(":checked")
+
+      url = DiscussionUtil.urlFor('create_thread', @topicId)
+
+      DiscussionUtil.safeAjax
+        $elem: $(event.target)
+        $loading: $(event.target) if event
+        url: url
+        type: "POST"
+        dataType: 'json'
+        async: false # TODO when the rest of the stuff below is made to work properly..
+        data:
+          title: title
+          body: body
+          
+          # TODO tags: commenting out til we know what to do with them
+          #tags: tags
+          
+          anonymous: anonymous
+          anonymous_to_peers: anonymous_to_peers
+          auto_subscribe: follow
+        error: DiscussionUtil.formErrorHandler(@$(".new-post-form-errors"))
+        success: (response, textStatus) =>
+          # TODO: Move this out of the callback, this makes it feel sluggish
+          thread = new Thread response['content']
+          DiscussionUtil.clearFormErrors(@$(".new-post-form-errors"))
+          @$el.hide()
+          @$(".new-post-title").val("").attr("prev-text", "")
+          @$(".new-post-body textarea").val("").attr("prev-text", "")
+
+          # TODO tags, commenting out til we know what to do with them
+          #@$(".new-post-tags").val("")
+          #@$(".new-post-tags").importTags("")
+
+          @collection.add thread

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

+if Backbone?
+  class @NewPostView extends Backbone.View
+
+      initialize: () ->
+          @dropdownButton = @$(".topic_dropdown_button")
+          @topicMenu      = @$(".topic_menu_wrapper")
+
+          @menuOpen = @dropdownButton.hasClass('dropped')
+
+          @topicId    = @$(".topic").first().data("discussion_id")
+          @topicText  = @getFullTopicName(@$(".topic").first())
+
+          @maxNameWidth = 100
+          @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"
+          "click  .topic_menu_wrapper":       "setTopic"
+          "click  .topic_menu_search":        "ignoreClick"
+
+      # Because we want the behavior that when the body is clicked the menu is
+      # closed, we need to ignore clicks in the search field and stop propagation.
+      # Without this, clicking the search field would also close the menu.
+      ignoreClick: (event) ->
+          event.stopPropagation()
+
+      toggleTopicDropdown: (event) ->
+          event.stopPropagation()
+          if @menuOpen
+              @hideTopicDropdown()
+          else
+              @showTopicDropdown()
+
+      showTopicDropdown: () ->
+          @menuOpen = true
+          @dropdownButton.addClass('dropped')
+          @topicMenu.show()
+          $(".form-topic-drop-search-input").focus()
+
+          $("body").bind "keydown", @setActiveItem
+          $("body").bind "click", @hideTopicDropdown
+
+          # Set here because 1) the window might get resized and things could
+          # change and 2) can't set in initialize because the button is hidden
+          @maxNameWidth = @dropdownButton.width() * 0.9
+
+      # Need a fat arrow because hideTopicDropdown is passed as a callback to bind
+      hideTopicDropdown: () =>
+          @menuOpen = false
+          @dropdownButton.removeClass('dropped')
+          @topicMenu.hide()
+
+          $("body").unbind "keydown", @setActiveItem
+          $("body").unbind "click", @hideTopicDropdown
+
+      setTopic: (event) ->
+          $target = $(event.target)
+          if $target.data('discussion_id')
+              @topicText = $target.html()
+              @topicText  = @getFullTopicName($target)
+              @topicId   = $target.data('discussion_id')
+              @setSelectedTopic()
+
+      setSelectedTopic: ->
+          @dropdownButton.html(@fitName(@topicText) + ' <span class="drop-arrow">▾</span>')
+
+      getFullTopicName: (topicElement) ->
+          name = topicElement.html()
+          topicElement.parents('ul').not('.topic_menu').each ->
+              name = $(this).siblings('a').html() + ' / ' + name
+          return name
+
+      getNameWidth: (name) ->
+          test = $("<div>")
+          test.css
+              "font-size": @dropdownButton.css('font-size')
+              opacity: 0
+              position: 'absolute'
+              left: -1000
+              top: -1000
+          $("body").append(test)
+          test.html(name)
+          width = test.width()
+          test.remove()
+          return width
+
+      fitName: (name) ->
+          width = @getNameWidth(name)
+          if width < @maxNameWidth
+              return name
+          path = (x.replace /^\s+|\s+$/g, "" for x in name.split("/"))
+          while path.length > 1
+              path.shift()
+              partialName = "... / " + path.join(" / ")
+              if  @getNameWidth(partialName) < @maxNameWidth
+                  return partialName
+
+          rawName = path[0]
+
+          name = "... / " + rawName
+
+          while @getNameWidth(name) > @maxNameWidth
+              rawName = rawName[0...rawName.length-1]
+              name =  "... / " + rawName + " ..."
+
+          return name
+
+
+      createPost: (event) ->
+          event.preventDefault()
+          title   = @$(".new-post-title").val()
+          body    = @$(".new-post-body").find(".wmd-input").val()
+          tags    = @$(".new-post-tags").val()
+
+          anonymous          = false || @$("input.discussion-anonymous").is(":checked")
+          anonymous_to_peers = false || @$("input.discussion-anonymous-to-peers").is(":checked")
+          follow             = false || @$("input.discussion-follow").is(":checked")
+
+          $formTopicDropBtn.bind('click', showFormTopicDrop)
+          $formTopicDropMenu.bind('click', setFormTopic)
+
+          url = DiscussionUtil.urlFor('create_thread', @topicId)
+
+          DiscussionUtil.safeAjax
+              $elem: $(event.target)
+              $loading: $(event.target) if event
+              url: url
+              type: "POST"
+              dataType: 'json'
+              async: false # TODO when the rest of the stuff below is made to work properly..
+              data:
+                  title: title
+                  body: body
+                  tags: tags
+                  anonymous: anonymous
+                  anonymous_to_peers: anonymous_to_peers
+                  auto_subscribe: follow
+              error: DiscussionUtil.formErrorHandler(@$(".new-post-form-errors"))
+              success: (response, textStatus) =>
+                  # TODO: Move this out of the callback, this makes it feel sluggish
+                  thread = new Thread response['content']
+                  DiscussionUtil.clearFormErrors(@$(".new-post-form-errors"))
+                  @$el.hide()
+                  @$(".new-post-title").val("").attr("prev-text", "")
+                  @$(".new-post-body textarea").val("").attr("prev-text", "")
+                  @$(".new-post-tags").val("")
+                  @$(".new-post-tags").importTags("")
+                  @$(".wmd-preview p").html("")
+                  @collection.add thread
+
+      setActiveItem: (event) ->
+          if event.which == 13
+            $(".topic_menu_wrapper .focused").click()
+            return
+          if event.which != 40 && event.which != 38
+            return
+          event.preventDefault()
+
+          items = $.makeArray($(".topic_menu_wrapper a").not(".hidden"))
+          index = items.indexOf($('.topic_menu_wrapper .focused')[0])
+
+          if event.which == 40
+              index = Math.min(index + 1, items.length - 1)
+          if event.which == 38
+              index = Math.max(index - 1, 0)
+
+          $(".topic_menu_wrapper .focused").removeClass("focused")
+          $(items[index]).addClass("focused")
+
+          itemTop = $(items[index]).parent().offset().top
+          scrollTop = $(".topic_menu").scrollTop()
+          itemFromTop = $(".topic_menu").offset().top - itemTop
+          scrollTarget = Math.min(scrollTop - itemFromTop, scrollTop)
+          scrollTarget = Math.max(scrollTop - itemFromTop - $(".topic_menu").height() + $(items[index]).height() + 20, scrollTarget)
+          $(".topic_menu").scrollTop(scrollTarget)

lms/static/coffee/src/discussion/views/response_comment_show_view.coffee

+if Backbone?
+  class @ResponseCommentShowView extends DiscussionContentView
+
+    tagName: "li"
+
+    render: ->
+      @template = _.template($("#response-comment-show-template").html())
+      params = @model.toJSON()
+
+      @$el.html(@template(params))
+      @initLocal()
+      @delegateEvents()
+      @renderAttrs()
+      @markAsStaff()
+      @$el.find(".timeago").timeago()
+      @convertMath()
+      @addReplyLink()
+      @
+
+    addReplyLink: () ->
+      if @model.hasOwnProperty('parent')
+        name = @model.parent.get('username') ? "anonymous"
+        html = "<a href='#comment_#{@model.parent.id}'>@#{name}</a>:  "
+        p = @$('.response-body p:first')
+        p.prepend(html)
+
+    convertMath: ->
+      body = @$el.find(".response-body")
+      body.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight body.html()
+      MathJax.Hub.Queue ["Typeset", MathJax.Hub, body[0]]
+
+    markAsStaff: ->
+      if DiscussionUtil.isStaff(@model.get("user_id"))
+        @$el.find("a.profile-link").after('<span class="staff-label">staff</span>')

lms/static/coffee/src/discussion/views/response_comment_view.coffee

+if Backbone?
+  class @ResponseCommentView extends DiscussionContentView
+    tagName: "li"
+
+    $: (selector) ->
+      @$el.find(selector)
+
+    initialize: ->
+      super()
+      @createShowView()
+
+    render: ->
+      @renderShowView()
+      @
+
+    createShowView: () ->
+
+      if @editView?
+        @editView.undelegateEvents()
+        @editView.$el.empty()
+        @editView = null
+
+      @showView = new ResponseCommentShowView(model: @model)
+
+    renderSubView: (view) ->
+      view.setElement(@$el)
+      view.render()
+      view.delegateEvents()
+
+    renderShowView: () ->
+      @renderSubView(@showView)

lms/static/coffee/src/discussion/views/thread_response_edit_view.coffee

+if Backbone?
+  class @ThreadResponseEditView extends Backbone.View
+
+    events:
+      "click .post-update": "update"
+      "click .post-cancel": "cancel_edit"
+
+    $: (selector) ->
+      @$el.find(selector)
+
+    initialize: ->
+      super()
+
+    render: ->
+      @template = _.template($("#thread-response-edit-template").html())
+      @$el.html(@template(@model.toJSON()))
+      @delegateEvents()
+      DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "edit-post-body"
+      @
+
+    update: (event) ->
+      @trigger "response:update", event
+
+    cancel_edit: (event) ->
+      @trigger "response:cancel_edit", event

lms/static/coffee/src/discussion/views/thread_response_show_view.coffee

+if Backbone?
+  class @ThreadResponseShowView extends DiscussionContentView
+    events:
+        "click .vote-btn": "toggleVote"
+        "click .action-endorse": "toggleEndorse"
+        "click .action-delete": "delete"
+        "click .action-edit": "edit"
+
+    $: (selector) ->
+        @$el.find(selector)
+
+    initialize: ->
+        super()
+        @model.on "change", @updateModelDetails
+
+    renderTemplate: ->
+        @template = _.template($("#thread-response-show-template").html())
+        @template(@model.toJSON())
+
+    render: ->
+      @$el.html(@renderTemplate())
+      @delegateEvents()
+      if window.user.voted(@model)
+        @$(".vote-btn").addClass("is-cast")
+      @renderAttrs()
+      @$el.find(".posted-details").timeago()
+      @convertMath()
+      @markAsStaff()
+      @
+
+    convertMath: ->
+      element = @$(".response-body")
+      element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.html()
+      MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]]
+
+    markAsStaff: ->
+      if DiscussionUtil.isStaff(@model.get("user_id"))
+        @$el.addClass("staff")
+        @$el.prepend('<div class="staff-banner">staff</div>')
+
+    toggleVote: (event) ->
+      event.preventDefault()
+      @$(".vote-btn").toggleClass("is-cast")
+      if @$(".vote-btn").hasClass("is-cast")
+        @vote()
+      else
+        @unvote()
+
+    vote: ->
+      url = @model.urlFor("upvote")
+      @$(".votes-count-number").html(parseInt(@$(".votes-count-number").html()) + 1)
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-vote")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            @model.set(response)
+
+    unvote: ->
+      url = @model.urlFor("unvote")
+      @$(".votes-count-number").html(parseInt(@$(".votes-count-number").html()) - 1)
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-vote")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            @model.set(response)
+
+    edit: (event) ->
+        @trigger "response:edit", event
+
+    delete: (event) ->
+        @trigger "response:delete", event
+
+    toggleEndorse: (event) ->
+      event.preventDefault()
+      if not @model.can('can_endorse')
+        return
+      $elem = $(event.target)
+      url = @model.urlFor('endorse')
+      endorsed = @model.get('endorsed')
+      data = { endorsed: not endorsed }
+      @model.set('endorsed', not endorsed)
+      @trigger "comment:endorse", not endorsed
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        url: url
+        data: data
+        type: "POST"

lms/static/coffee/src/discussion/views/thread_response_view.coffee

+if Backbone?
+  class @ThreadResponseView extends DiscussionContentView
+    tagName: "li"
+
+    events:
+        "click .discussion-submit-comment": "submitComment"
+        "focus .wmd-input": "showEditorChrome"
+
+    $: (selector) ->
+      @$el.find(selector)
+
+    initialize: ->
+      @createShowView()
+
+    renderTemplate: ->
+      @template = _.template($("#thread-response-template").html())
+
+      templateData = @model.toJSON()
+      templateData.wmdId = @model.id ? (new Date()).getTime()
+      @template(templateData)
+
+    render: ->
+      @$el.html(@renderTemplate())
+      @delegateEvents()
+
+      @renderShowView()
+      @renderAttrs()
+
+      @renderComments()
+      @
+
+    afterInsert: ->
+      @makeWmdEditor "comment-body"
+      @hideEditorChrome()
+
+    hideEditorChrome: ->
+      @$('.wmd-button-row').hide()
+      @$('.wmd-preview').hide()
+      @$('.wmd-input').css({
+        height: '35px',
+        padding: '5px'
+      })
+      @$('.comment-post-control').hide()
+
+    showEditorChrome: ->
+      @$('.wmd-button-row').show()
+      @$('.wmd-preview').show()
+      @$('.comment-post-control').show()
+      @$('.wmd-input').css({
+        height: '125px',
+        padding: '10px'
+      })
+
+    renderComments: ->
+      comments = new Comments()
+      comments.comparator = (comment) ->
+        comment.get('created_at')
+      collectComments = (comment) ->
+        comments.add(comment)
+        children = new Comments(comment.get('children'))
+        children.each (child) ->
+          child.parent = comment
+          collectComments(child)
+      @model.get('comments').each collectComments
+      comments.each (comment) => @renderComment(comment, false, null)
+
+    renderComment: (comment) =>
+      comment.set('thread', @model.get('thread'))
+      view = new ResponseCommentView(model: comment)
+      view.render()
+      @$el.find(".comments .new-comment").before(view.el)
+      view
+
+    submitComment: (event) ->
+      event.preventDefault()
+      url = @model.urlFor('reply')
+      body = @getWmdContent("comment-body")
+      return if not body.trim().length
+      @setWmdContent("comment-body", "")
+      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), user_id: window.user.get("id"), id:"unsaved")
+      view = @renderComment(comment)
+      @hideEditorChrome()
+      @trigger "comment:add", comment
+
+      DiscussionUtil.safeAjax
+        $elem: $(event.target)
+        url: url
+        type: "POST"
+        dataType: 'json'
+        data:
+          body: body
+        success: (response, textStatus) ->
+          comment.set(response.content)
+          view.render() # This is just to update the id for the most part, but might be useful in general
+
+    delete: (event) =>
+      event.preventDefault()
+      if not @model.can('can_delete')
+        return
+      if not confirm "Are you sure to delete this response? "
+        return
+      url = @model.urlFor('delete')
+      @model.remove()
+      @$el.remove()
+      $elem = $(event.target)
+      DiscussionUtil.safeAjax
+        $elem: $elem
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+
+    createEditView: () ->
+      if @showView?
+        @showView.undelegateEvents()
+        @showView.$el.empty()
+        @showView = null
+
+      @editView = new ThreadResponseEditView(model: @model)
+      @editView.bind "response:update", @update
+      @editView.bind "response:cancel_edit", @cancelEdit
+
+    renderSubView: (view) ->
+      view.setElement(@$('.discussion-response'))
+      view.render()
+      view.delegateEvents()
+
+    renderEditView: () ->
+      @renderSubView(@editView)
+
+    hideCommentForm: () ->
+      @$('.comment-form').closest('li').hide()
+
+    showCommentForm: () ->
+      @$('.comment-form').closest('li').show()
+
+    createShowView: () ->
+
+      if @editView?
+        @editView.undelegateEvents()
+        @editView.$el.empty()
+        @editView = null
+
+      @showView = new ThreadResponseShowView(model: @model)
+      @showView.bind "response:delete", @delete
+      @showView.bind "response:edit", @edit
+
+    renderShowView: () ->
+      @renderSubView(@showView)
+
+    cancelEdit: (event) =>
+      event.preventDefault()
+      @createShowView()
+      @renderShowView()
+      @showCommentForm()
+
+    edit: (event) =>
+      @createEditView()
+      @renderEditView()
+      @hideCommentForm()
+
+    update: (event) =>
+
+      newBody  = @editView.$(".edit-post-body textarea").val()
+
+      url = DiscussionUtil.urlFor('update_comment', @model.id)
+
+      DiscussionUtil.safeAjax
+          $elem: $(event.target)
+          $loading: $(event.target) if event
+          url: url
+          type: "POST"
+          dataType: 'json'
+          async: false # TODO when the rest of the stuff below is made to work properly..
+          data:
+              body: newBody
+          error: DiscussionUtil.formErrorHandler(@$(".edit-post-form-errors"))
+          success: (response, textStatus) =>
+              # TODO: Move this out of the callback, this makes it feel sluggish
+              @editView.$(".edit-post-body textarea").val("").attr("prev-text", "")
+              @editView.$(".wmd-preview p").html("")
+
+              @model.set
+                body: newBody
+
+              @createShowView()
+              @renderShowView()
+              @showCommentForm()
+