From 39ae9343e8a858c7f6e78af431edd642e065bab0 Mon Sep 17 00:00:00 2001
From: Rocky Duan <dementrock@gmail.com>
Date: Mon, 6 Aug 2012 16:15:36 -0400
Subject: [PATCH] merged brittany's branch & fixed stuff

---
 lms/static/coffee/src/discussion/discussion.coffee | 4 ++--
 lms/static/sass/_discussion.scss                   | 5 +++++
 lms/templates/discussion/_forum.html               | 2 +-
 lms/templates/discussion/_inline.html              | 2 +-
 lms/templates/discussion/_sort.html                | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lms/static/coffee/src/discussion/discussion.coffee b/lms/static/coffee/src/discussion/discussion.coffee
index 0b0b1e4bf1..0ee7ba0583 100644
--- a/lms/static/coffee/src/discussion/discussion.coffee
+++ b/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)
diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 47962bfdda..90e183c0a2 100644
--- a/lms/static/sass/_discussion.scss
+++ b/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;
diff --git a/lms/templates/discussion/_forum.html b/lms/templates/discussion/_forum.html
index 481c50838a..62ae3adb67 100644
--- a/lms/templates/discussion/_forum.html
+++ b/lms/templates/discussion/_forum.html
@@ -1,7 +1,7 @@
 <%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>
diff --git a/lms/templates/discussion/_inline.html b/lms/templates/discussion/_inline.html
index 66db888fe8..97573a91c1 100644
--- a/lms/templates/discussion/_inline.html
+++ b/lms/templates/discussion/_inline.html
@@ -1,7 +1,7 @@
 <%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>
diff --git a/lms/templates/discussion/_sort.html b/lms/templates/discussion/_sort.html
index f71fab2cc3..e23d87b718 100644
--- a/lms/templates/discussion/_sort.html
+++ b/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')}
   |