Merge branch 'brittany' of github.com:dementrock/mitx into profile &

small fix

Conflicts:
	lms/templates/discussion/user_profile.html

lms/djangoapps/django_comment_client/base/views.py

@@ -117,6 +117,7 @@ def _create_comment(request, course_id, thread_id=None, parent_id=None):
     if request.is_ajax():
         context = {
             'comment': comment.to_dict(),
+            'course_id': course_id,
         }
         html = render_to_string('discussion/ajax_create_comment.html', context)
         annotated_content_info = utils.get_annotated_content_info(course_id, 
@@ -312,6 +313,7 @@ def update_moderator_status(request, course_id, user_id):
         discussion_user = cc.User(id=user_id, course_id=course_id)
         context = {
             'course': course, 
+            'course_id': course_id,
             'user': request.user,
             'django_user': user,
             'discussion_user': discussion_user.to_dict(),

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

@@ -326,7 +326,7 @@ initializeFollowThread = (thread) ->
           handleVote($elem, "down")
 
       "click .admin-endorse": ->
-        handleEndorse(this, true)#, $(this).is(":checked"))
+        handleEndorse(this, not $content.hasClass("endorsed"))
 
       "click .discussion-openclose": ->
         handleOpenClose(this, $(this).text())

lms/static/sass/_discussion.scss

@@ -131,6 +131,30 @@ $tag-text-color: #5b614f;
       text-align: right;
       color: #9a9a9a;
     }
+
+//user profile
+
+    .sidebar-username {
+      font-size: 1.5em;
+      font-weight: bold;
+      line-height: 1.5em;
+    }
+
+    .sidebar-user-roles {
+      color: darkGray;
+      font-style: italic;
+      margin-bottom: 15px;
+    }
+
+    .sidebar-threads-count, .sidebar-comments-count {
+      
+      span {
+        font-size: 1.5em;
+        font-weight: bold;
+        line-height: 1.5em;
+        margin-right: 10px;
+      }
+    }
   }
 
   .discussion-non-content {
@@ -424,7 +448,6 @@ $tag-text-color: #5b614f;
 
   .search-wrapper-inline {
     display: inline-block;
-    margin-bottom: 6%;
     margin-top: 3%;
     width: 80%;
   }
@@ -770,7 +793,7 @@ $tag-text-color: #5b614f;
 
   &.inline-discussion, .forum-discussion {
     .new-post-form {
-      margin: 24px 60px;
+      margin: -30px 60px 24px 60px;
 
       .post-options {
         margin: 8px 0 16px 0;
@@ -778,11 +801,13 @@ $tag-text-color: #5b614f;
 
         label {
           margin-right: 15px;
+          display: inline;
         }
       }
 
       .post-control {
         overflow: hidden;
+        margin: 0 0 5% 0;
       }
     }
   }

lms/templates/discussion/_thread.html

@@ -98,16 +98,6 @@
     <ul class="discussion-actions">
       <li>${render_link("discussion-link discussion-reply discussion-reply-" + type, "Reply")}</li>
       <li><div class="follow-wrapper"></div></li>
-      <li>
-      % if type == "comment" and request.user.is_staff:
-        % if content['endorsed']:
-          <input type="checkbox" checked="checked" class="discussion-link discussion-endorse" id="discussion-endorse-${content['id']}">
-        % else:
-          <input type="checkbox" class="discussion-link discussion-endorse" id="discussion-endorse-${content['id']}">
-        % endif
-        <label class="discussion-link" for="discussion-endorse-${content['id']}">Endorsed</label>
-      % endif
-      </li>
     </ul>
   </div>
 </%def>

lms/templates/discussion/_user_profile.html

@@ -10,8 +10,8 @@
   <div class="sidebar-user-roles">
     ${", ".join(role_names)}
   </div>
-  <div class="sidebar-threads-count">${discussion_user['threads_count']} ${pluralize('discussion', discussion_user['threads_count'])} started</div>
-  <div class="sidebar-comments-count">${discussion_user['comments_count']} ${pluralize('comment', discussion_user['comments_count'])}</div>
+  <div class="sidebar-threads-count"><span>${discussion_user['threads_count']}</span> ${pluralize('discussion', discussion_user['threads_count'])} started</div>
+  <div class="sidebar-comments-count"><span>${discussion_user['comments_count']}</span> ${pluralize('comment', discussion_user['comments_count'])}</div>
   % if check_permissions_by_view(user, course.id, content=None, name='update_moderator_status'):
     % if "Moderator" in role_names:
       <a href="javascript:void(0)" class="sidebar-revoke-moderator-button">Revoke Moderator provileges</a>