Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2

lms/static/sass/_discussion.scss

@@ -188,6 +188,9 @@ $discussion_input_width: 100%;
     font-size: $comment_body_size;
     float: right;
     margin-top: -2.5%;
+    .discussion-sort-link.sorted {
+      font-weight: bold;
+    }
   }
   .discussion-content-edit, .discussion-reply-new, .new-post-form {
     .new-post-control, .edit-post-control {

lms/templates/discussion/_forum.html

@@ -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" />
   % for thread in threads:
     ${renderer.render_thread(course_id, thread, edit_thread=False, show_comments=False)}
   % endfor

lms/templates/discussion/_sort.html

@@ -28,10 +28,10 @@
 </%def>
     
 <div class="discussion-sort">
-  Sort by: 
-  ${link_to_sort('date', 'Date')}
+  Sort by:
+  ${link_to_sort('date', 'date')}
   |
-  ${link_to_sort('votes', 'Votes')}
+  ${link_to_sort('votes', 'votes')}
   |
-  ${link_to_sort('comments', 'Comments')}
+  ${link_to_sort('comments', 'comments')}
 </div>