Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation

lms/static/coffee/src/customwmd.coffee

@@ -105,7 +105,6 @@ $ ->
     replaceMath: (text) ->
       text = text.replace /@@(\d+)@@/g, ($0, $1) => @math[$1]
       @math = null
-      console.log text
       text
 
     @replaceMathWrapper: (_this) ->
@@ -163,7 +162,6 @@ $ ->
               $('#file-upload').unbind('change').change(startUploadHandler)
               
       imageUploadHandler = (elem, input) ->
-        console.log "here"
         ajaxFileUpload(imageUploadUrl, input, imageUploadHandler)
 
       editor = new Markdown.Editor(

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

@@ -330,15 +330,36 @@ initializeFollowThread = (thread) ->
         handleDelete(this)
 
   initializeContent: (content) ->
+
+    unescapeHighlightTag = (text) ->
+      text.replace(/\&lt\;highlight\&gt\;/g, "<span class='search-highlight'>")
+          .replace(/\&lt\;\/highlight\&gt\;/g, "</span>")
+
+    stripLatexHighlight = (text) ->
+      text
+
+    markdownWithHighlight = (text) ->
+      converter = Markdown.getMathCompatibleConverter()
+      unescapeHighlightTag stripLatexHighlight converter.makeHtml text
+
     $content = $(content)
     initializeVote $content
     if $content.hasClass("thread")
       initializeFollowThread $content
     $local = Discussion.generateLocal($content.children(".discussion-content"))
+
+    $contentTitle = $local(".thread-title")
+
+    if $contentTitle.length
+      $contentTitle.html unescapeHighlightTag stripLatexHighlight $contentTitle.html()
+
     $contentBody = $local(".content-body")
-    raw_text = $contentBody.html()
-    converter = Markdown.getMathCompatibleConverter()
-    $contentBody.html(converter.makeHtml(raw_text))
+
+    console.log "raw html:"
+    console.log $contentBody.html()
+    
+    $contentBody.html markdownWithHighlight $contentBody.html()
+
     MathJax.Hub.Queue ["Typeset", MathJax.Hub, $contentBody.attr("id")]
     id = $content.attr("_id")
     if not Discussion.getContentInfo id, 'editable'

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/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>
@@ -13,8 +13,8 @@
       <label for="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board">Search within board</label>
     </div>
     <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
-    <%include file="_sort.html" />
   </div>
+  <%include file="_sort.html" />
   <div class="threads">
     % for thread in threads:
       ${renderer.render_thread(course_id, thread, show_comments=False)}

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')}
   |

lms/templates/discussion/_thread.html

@@ -42,7 +42,11 @@
       <div class="discussion-right-wrapper clearfix">
         ${render_title(content, type, **kwargs)}
         <div class="discussion-content-view">
-          <div class="content-body ${type}-body" id="content-body-${content['id']}">${content['body'] | h}</div>
+          % if content.get('highlighted_body', None):
+            <div class="content-body ${type}-body" id="content-body-${content['id']}">${content['highlighted_body'] | h}</div>
+          % else:
+            <div class="content-body ${type}-body" id="content-body-${content['id']}">${content['body'] | h}</div>
+          % endif
           <div class="content-raw-body ${type}-raw-body" style="display: none">${content['body'] | h}</div>
           ${render_tags(content, type, **kwargs)}
           ${render_bottom_bar(content, type, **kwargs)}
@@ -54,7 +58,11 @@
 
 <%def name="render_title(content, type, **kwargs)">
   % if type == "thread":
-    <a class="thread-title" name="${content['id']}" href="javascript:void(0)">${content['title'] | h}</a>
+    % if content.get('highlighted_title', None):
+      <a class="thread-title" name="${content['id']}" href="javascript:void(0)">${content['highlighted_title'] | h}</a>
+    % else:
+      <a class="thread-title" name="${content['id']}" href="javascript:void(0)">${content['title'] | h}</a>
+    % endif
   % endif
 </%def>
 
@@ -102,15 +110,19 @@
 </%def>
 
 <%def name="render_info(content)">
-  ${time_ago_in_words(parse(content['updated_at']))} ago by
-  % if content['anonymous']:
-    anonymous
-  % else:
-    user No.${content['user_id']}
-  % endif
-  % if content.get('comments_count', -1) >= 0:
-  , <a href="javascript:void(0)" class="discussion-show-comments"> Show ${content['comments_count']} comment(s)</a>
-  % endif
+  <div class="comment-time">
+    ${time_ago_in_words(parse(content['updated_at']))} ago by
+    % if content['anonymous']:
+      anonymous
+    % else:
+      user No.${content['user_id']}
+    % endif
+  </div>
+  <div class="comment-count">
+    % if content.get('comments_count', -1) >= 0:
+     <a href="javascript:void(0)" class="discussion-show-comments"> Show ${content['comments_count']} comment(s)</a>
+    % endif
+  </div>
 </%def>
 
 <%def name="render_link(cls, html)">

lms/templates/discussion/thread.html

@@ -79,15 +79,19 @@
 </%def>
 
 <%def name="render_info(content)">
-  ${time_ago_in_words(parse(content['updated_at']))} ago by
-  % if content['anonymous']:
-    anonymous
-  % else:
-    user No.${content['user_id']}
-  % endif
-  % if content.get('comments_count', -1) >= 0:
-    , ${content['comments_count']} comment(s)
-  % endif
+  <div class="comment-time">
+    ${time_ago_in_words(parse(content['updated_at']))} ago by
+    % if content['anonymous']:
+      anonymous
+    % else:
+      user No.${content['user_id']}
+    % endif
+  </div>
+  <div class="comment-count">
+    % if content.get('comments_count', -1) >= 0:
+      ${content['comments_count']} comment(s)
+    % endif
+  </div>
 </%def>
 
 <%def name="render_link(cls, html)">