Merge branch 'discussion_ui' of github.com:dementrock/mitx

lms/static/css/course/old/marketing-ie.css

+body {
+  margin: 0;
+  padding: 0; }
+
+.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer {
+  margin: 0;
+  overflow: hidden; }
+
+div#enroll form {
+  display: none; }

lms/static/sass/_discussion.scss

@@ -6,7 +6,7 @@ $comment_info_size: 0.75em;
 $discussion_input_width: 60%;
 
 @mixin discussion-font {
-  font-family: "Comic Sans MS", cursive, sans-serif !important;
+  font-family: inherit;
 }
 
 @mixin discussion-clickable {

lms/static/sass/_news.scss

 @mixin news-font {
-  font-family: "Comic Sans MS", cursive, sans-serif !important;
+  font-family: inherit;
 }
 
 .notifications {

lms/templates/discussion/index.html

@@ -23,9 +23,8 @@
     });
   </script>
 
-  <!-- This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
-       It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of
-       MathJax extension libraries -->
+  ## This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
+  ## It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of MathJax extension libraries
   <script type="text/javascript" src="/static/js/vendor/mathjax-MathJax-c9db6ac/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>
   <script type="text/javascript" src="${static.url('js/vendor/split.js')}"></script>
   <script type="text/javascript" src="${static.url('js/vendor/jquery.ajaxfileupload.js')}"></script>
@@ -47,12 +46,12 @@
         <h2>Discussion Boards</h2>
         <a href="#">close</a>
       </header>
+
       <div id="accordion" style="display:none">
         <nav>
           ${accordion}
         </nav>
       </div>
-
     </section>
 
     <section class="course-content">

lms/templates/discussion/search_bar.html

@@ -6,8 +6,8 @@ def url_for_search():
 %>
 
 <form action="${url_for_search()}" method="get" class="discussion-search-form">
-  <input type="text" class="discussion-search-text" value="${text}"/>
-  <label for="discussion-search-within-board-${discussion_id}">search within board</label>
-  <input type="checkbox" id="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board" checked/>
+  <input class="searchInput" type="text" value="${text}" id="keywords" autocomplete="off"/>
   <a class="discussion-link discussion-search" href="javascript:void(0)">Search</a>
+  <input type="checkbox" id="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board" checked/>
+  <label for="discussion-search-within-board-${discussion_id}">Search within board</label>
 </form>

lms/templates/discussion/thread.html

@@ -98,6 +98,7 @@
   %>
   <div class="discussion-votes" title="Current votes: ${content['votes']['point']}">
     <a class="discussion-vote discussion-vote-up" href="javascript:void(0)" title="Current votes: ${content['votes']['point']}">${upvote}</a>
+    ${content['votes']['point']}
     <a class="discussion-vote discussion-vote-down" href="javascript:void(0)" title="Current votes: ${content['votes']['point']}">${downvote}</a>
   </div>
 </%def>