diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 190716eb5b..c848ab95cf 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -23,7 +23,95 @@ $tag_text_color: #5b614f; } } +@mixin standard-discussion-link { + text-decoration: none; + &:hover { + color: #1C71DD; + text-decoration: none; + } +} + .discussion { + #open_close_accordion { + display: none; + } + + .sidebar-module { + @include clearfix; + padding: 0 24px 24px 0; + margin-bottom: 24px; + border-bottom: 1px solid #d3d3d3; + font-size: 0.8em; + + header { + margin-bottom: 14px; + @include clearfix; + } + + h4 { + float: left; + font-size: 1.1em; + font-weight: bold; + } + + .sidebar-new-post-button { + @include button; + display: block; + box-sizing: border-box; + width: 100%; + margin: 20px 0; + padding: 11px; + font-size: 1.1em; + text-align: center; + + &:hover { + text-decoration: none; + } + } + + .sidebar-view-all { + float: right; + font-size: 0.9em; + line-height: 1.6em; + @include standard-discussion-link; + } + + .discussion-sidebar-following-list { + li { + @include clearfix; + margin-bottom: 8px; + } + + a { + @include standard-discussion-link; + } + } + + .discussion-sidebar-tags-list li { + @include clearfix; + } + + .sidebar-tag-count { + color: #9a9a9a; + font-size: .85em; + line-height: 3em; + } + + .sidebar-following-name { + float: left; + width: 80%; + } + + .sidebar-vote-count { + float: right; + width: 20%; + text-align: right; + color: #9a9a9a; + } + + + } + .discussion-non-content { margin-left: flex-gutter(); } @@ -239,6 +327,7 @@ $tag_text_color: #5b614f; color: #9a9a9a; } } + //CREATE NEW AND EDIT POSTS .discussion-right-wrapper { min-height: 40px; @@ -302,6 +391,14 @@ $tag_text_color: #5b614f; padding: 0; border-width: 0; } + + .post-options { + height: 0; + } + + .reply-post-control { + height: 0; + } } .new-post-control { @@ -321,12 +418,12 @@ $tag_text_color: #5b614f; .control-button { @include button; @include discussion-font; + margin-right: 16px; + padding-top: 9px; color: white; display: inline-block; font-size: inherit; font-weight: bold; - margin-left: 5%; - padding-top: 9px; text-decoration: none; width: inherit; } @@ -349,6 +446,25 @@ $tag_text_color: #5b614f; } } + .thread-tag { + background: $tag_background_color; + border: 1px solid $tag_border_color; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + color: $tag_text_color; + float: left; + font-size: 13px; + margin: 5px 7px 5px 0; + padding: 5px 7px; + text-decoration: none; + + &:hover { + border-color: #7b8761; + color: #2f381c; + text-decoration: none; + } + } + //THREAD STYLES .thread { //display: none; @@ -376,25 +492,6 @@ $tag_text_color: #5b614f; .thread-tags { display: inline-block; - - .thread-tag { - @include discussion-font; - background: $tag_background_color; - border: 1px solid $tag_border_color; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - color: $tag_text_color; - float: left; - font-size: 13px; - margin: 5px 7px 5px 0; - padding: 5px 7px; - text-decoration: none; - - &:hover { - border-color: #7b8761; - color: #2f381c; - } - } } .info { @@ -526,9 +623,16 @@ $tag_text_color: #5b614f; } &.inline-discussion { - .discussion-new-post-inline { - textarea { + .new-post-form { + margin: 24px 60px; + .post-options { + margin: 8px 0 16px 0; + overflow: hidden; + } + + .reply-post-control { + overflow: hidden; } } } @@ -558,7 +662,6 @@ $tag_text_color: #5b614f; font-size: 0.8em; line-height: 1.6em; @include border-radius(3px 3px 0 0); - // @include box-shadow(none); } .wmd-preview { @@ -571,7 +674,7 @@ $tag_text_color: #5b614f; border-top-width: 0; @include border-radius(0 0 3px 3px); overflow: hidden; - @include transition(all, .1s, easeOut); + @include transition(all, .2s, easeOut); &:before { content: 'PREVIEW'; @@ -581,7 +684,6 @@ $tag_text_color: #5b614f; font-size: 11px; color: #bbb; } - p { font-family: $sans-serif; @@ -598,7 +700,7 @@ $tag_text_color: #5b614f; padding: 0px; height: 20px; overflow: hidden; - @include transition(all, .1s, easeOut); + @include transition(all, .2s, easeOut); } .wmd-spacer diff --git a/lms/templates/discussion/_accordion.html b/lms/templates/discussion/_accordion.html index c072705d55..c5db48e43b 100644 --- a/lms/templates/discussion/_accordion.html +++ b/lms/templates/discussion/_accordion.html @@ -1,23 +1,29 @@ <%! from django.core.urlresolvers import reverse %> -<% -def url_for(commentable): - return reverse('django_comment_client.forum.views.forum_form_discussion', args=[course.id, commentable['discussion_id']]) -%> +
+ New Post +
-<%def name="make_category(category, commentables)"> -

${category}

+
+
+

Following

+ view all › +
+
    +
  1. Hints on HW4 1348
    2. +
  2. Answers to Mi-term -37
    3. +
  3. Summaries for Lectures 1 to 12 (more added, links fixed) 128
    4. +
      +
- - - -% for category, commentables in discussion_info.items(): - ${make_category(category, commentables)} -% endfor +
+
+

Recent Tags

+ view all › +
+
    +
  1. week-1×1348
    2. +
  2. S2V8: Method 3×37
    3. +
  3. artificial-intelligence×128
    4. +
      +
\ No newline at end of file diff --git a/lms/templates/discussion/_inline.html b/lms/templates/discussion/_inline.html index ccd9eb30c2..72bf6a0e9a 100644 --- a/lms/templates/discussion/_inline.html +++ b/lms/templates/discussion/_inline.html @@ -1,16 +1,36 @@ <%namespace name="renderer" file="_thread.html"/> + + + +
-
- -
+
+
% for thread in threads: ${renderer.render_thread(course_id, thread, show_comments=False)} % endfor
+ <%include file="_paginator.html" />
@@ -27,3 +47,5 @@ } $$annotated_content_info = $.extend($$annotated_content_info, JSON.parse("${annotated_content_info | escape_quotes}")); + +