From 5e9dfabfda5efe2d185a04b3395aacd02187c115 Mon Sep 17 00:00:00 2001
From: Brittany Cheng <bcheng42@gmail.com>
Date: Mon, 6 Aug 2012 14:33:37 -0400
Subject: [PATCH] comment info

---
 lms/static/sass/_discussion.scss      | 10 +++++++++-
 lms/templates/discussion/_thread.html | 22 +++++++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 30be69bfcc..442d251b81 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -307,7 +307,15 @@ $discussion_input_width: 100%;
       color: gray;
       font-size: $comment_info_size;
       font-style: italic;
-     .discussion-reply {
+      .comment-time {
+        display: inline;
+        float: right;
+        margin-right: -4%;
+      }
+      .comment-count {
+        display: inline;
+      }
+      .discussion-reply {
         margin-left: 4px;
       }
       .discussion-link {
diff --git a/lms/templates/discussion/_thread.html b/lms/templates/discussion/_thread.html
index 1b9fcbadc3..bbe08ec352 100644
--- a/lms/templates/discussion/_thread.html
+++ b/lms/templates/discussion/_thread.html
@@ -90,15 +90,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)">