merged brittany's branch & fixed stuff

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

@@ -27,7 +27,7 @@ initializeFollowDiscussion = (discussion) ->
   bindDiscussionEvents: (discussion) ->
 
     $discussion = $(discussion)
-    $discussionNonContent = $discussion.children(".discussion-non-content")
+    $discussionNonContent = $discussion.children(".discussion-local")
     $local = Discussion.generateLocal($discussionNonContent)
 
     id = $discussion.attr("_id")
@@ -127,5 +127,5 @@ initializeFollowDiscussion = (discussion) ->
       "click .discussion-sort-link": ->
         handleAjaxSort(this)
 
-    $discussion.children(".discussion-paginator").find(".discussion-inline-page-link").click ->
+    $discussion.children(".discussion-paginator").find(".discussion-page-link").click ->
       handleAjaxPage(this)

lms/static/sass/_discussion.scss

@@ -264,6 +264,11 @@ $discussion_input_width: 100%;
   //THREAD STYLES
   .thread {
     //display: none;
+    .search-highlight {
+      display: inline;
+      font-weight: bold;
+      background-color: lightyellow;
+    }
     .thread-title {
       @include discussion-font;
       @include discussion-clickable;

lms/templates/discussion/_forum.html

 <%namespace name="renderer" file="_thread.html"/>
 
 <section class="discussion inline-discussion" _id="${discussion_id}">
-  <div class="discussion-non-content">
+  <div class="discussion-non-content discussion-local">
     <div class="discussion-title-wrapper">
       <a class="discussion-title" href="javascript:void(0)">Discussion</a>
     </div>

lms/templates/discussion/_inline.html

 <%namespace name="renderer" file="_thread.html"/>
 
 <section class="discussion inline-discussion" _id="${discussion_id}">
-  <div class="discussion-non-content">
+  <div class="discussion-non-content discussion-local">
     <div class="search-wrapper-inline search-wrapper">
       <%include file="_search_bar.html" />
     </div>

lms/templates/discussion/_sort.html

@@ -23,7 +23,7 @@
   <a class="discussion-sort-link ${cls}" href="javascript:void(0)" sort-url="${url_for_sort(key, order)}">${title}</a>
 </%def>
     
-<div class="discussion-sort">
+<div class="discussion-sort discussion-local">
   Sort by:
   ${link_to_sort('date', 'date')}
   |