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

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

lms/templates/discussion/_thread.html

@@ -98,15 +98,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)">