Skip to content

E
edx-platform
Commit 3ec658df by Brittany Cheng
Options

merge tom's styles, warning: LOTS OF STUFF BROKE

parents 1f1ea8ad dc5b8b51
Showing with 371 additions and 216 deletions
lms/static/sass/_discussion.scss
$comment_margin_left: 30px; $comment_margin_left: 30px;
$discussion_title_size: 1.6em; $discussion_title_size: 1.6em;
$comment_title_size: 1.0em; $comment_title_size: 1.0em;
$comment_body_size: 0.9em; $post_font_size: 0.9em;
$comment_info_size: 0.75em; $comment_info_size: 0.75em;
$comment_font_size: 0.8em;
$discussion_input_width: 100%; $discussion_input_width: 100%;
$tag_background_color: #e7ecdd;
$tag_border_color: #babdb3;
$tag_text_color: #5b614f;
@mixin discussion-font { @mixin discussion-font {
font-family: inherit; font-family: inherit;
} }
...@@ -16,66 +23,95 @@ $discussion_input_width: 100%; ...@@ -16,66 +23,95 @@ $discussion_input_width: 100%;
} }
} }
form label { @mixin standard-discussion-link {
@include discussion-font; text-decoration: none;
font-size: 14px; &:hover {
font-style: normal; color: #1C71DD;
font-weight: normal; text-decoration: none;
text-shadow: none; }
} }
div.recent-activity { .discussion {
margin: 20% 4%;
div.recent-activity-title { #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; font-weight: bold;
} }
a.recent-active-post { .sidebar-new-post-button {
@include button;
display: block; display: block;
font-size: $comment_body_size; box-sizing: border-box;
line-height: 120%; width: 100%;
margin-top: 8px; margin: 20px 0;
padding: 11px;
font-size: 1.1em;
text-align: center;
&:hover { &:hover {
color: #1C71DD;
text-decoration: none; text-decoration: none;
font-weight: normal;
} }
} }
}
div.trending-tags { .sidebar-view-all {
font-weight: bold; float: right;
margin: 15% 0 0 0; font-size: 0.9em;
line-height: 1.6em;
@include standard-discussion-link;
}
.trending-tag { .discussion-sidebar-following-list {
margin-top: 5px; li {
@include clearfix;
margin-bottom: 8px;
} }
.trending-tag-link { a {
@include discussion-font; @include standard-discussion-link;
background: #CDE69C; }
border: 1px solid #A5D24A; }
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
color: #638421;
display: block;
float: left;
font-size: 13px;
margin-right: 4px;
padding: 5px 7px;
text-decoration: none;
&:hover { .discussion-sidebar-tags-list li {
border-color: #1E4612; @include clearfix;
color: #1E4612;
text-decoration: none;
} }
.sidebar-tag-count {
color: #9a9a9a;
font-size: .85em;
line-height: 3em;
} }
}
.discussion { .sidebar-following-name {
float: left;
width: 80%;
}
.sidebar-vote-count {
float: right;
width: 20%;
text-align: right;
color: #9a9a9a;
}
}
.discussion-non-content { .discussion-non-content {
margin-left: flex-gutter(); margin-left: flex-gutter();
...@@ -109,10 +145,21 @@ div.trending-tags { ...@@ -109,10 +145,21 @@ div.trending-tags {
.discussion-sort { .discussion-sort {
float: right; float: right;
font-size: $comment_body_size; font-size: 0.8em;
margin-top: -2.5%; margin-top: -36px;
.discussion-label {
display: block;
float: left;
padding: 0 14px;
line-height: 34px;
}
.discussion-sort-link { .discussion-sort-link {
display: block;
float: left;
padding: 0 14px;
line-height: 34px;
&:hover { &:hover {
color: #1C71DD; color: #1C71DD;
...@@ -121,8 +168,8 @@ div.trending-tags { ...@@ -121,8 +168,8 @@ div.trending-tags {
} }
.discussion-sort-link.sorted { .discussion-sort-link.sorted {
color: #1C71DD; color: #000;
font-weight: bold; border-bottom: 2px solid #000;
} }
} }
...@@ -135,13 +182,17 @@ div.trending-tags { ...@@ -135,13 +182,17 @@ div.trending-tags {
width: 80%; width: 80%;
} }
.search-wrapper {
height: 110px;
}
.discussion-search-form { .discussion-search-form {
display: inline-block; display: inline-block;
margin-bottom: 1%; margin-bottom: 1%;
width: flex-grid(12); width: flex-grid(12);
.discussion-link { .discussion-link {
@include button; @include button(simple, #999);
color: white; color: white;
display: inline-block; display: inline-block;
font-size: inherit; font-size: inherit;
...@@ -159,7 +210,9 @@ div.trending-tags { ...@@ -159,7 +210,9 @@ div.trending-tags {
float: left; float: left;
font: inherit; font: inherit;
font-style: normal; font-style: normal;
width: 72%; // width: 72%;
width: flex-grid(8);
margin-left: flex-grid(1);
} }
} }
...@@ -170,7 +223,7 @@ div.trending-tags { ...@@ -170,7 +223,7 @@ div.trending-tags {
.discussion-search-within-board { .discussion-search-within-board {
font: inherit; font: inherit;
font-size: $comment_body_size; font-size: $post_font_size;
font-style: normal; font-style: normal;
} }
...@@ -218,77 +271,80 @@ div.trending-tags { ...@@ -218,77 +271,80 @@ div.trending-tags {
//FOLLOW BUTTON //FOLLOW BUTTON
.follow-wrapper { .follow-wrapper {
float: right; display: inline;
.discussion-link {
@include button;
background-color: #BEBEBE;
background-image: none;
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
display: inline-block;
font-size: $comment_info_size;
padding: 5px 8px;
text-decoration: none;
text-shadow: none;
&:hover {
background-color: #AAA;
background-image: none;
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
}
} }
//VOTES //VOTES
.discussion-votes { .discussion-votes {
float: left; float: left;
height: flex-grid(3); width: 60px;
margin: 1% 2%; margin-top: 18px;
text-align: center; text-align: center;
.discussion-vote-count { .discussion-vote {
@include discussion-font;
font-size: $comment_body_size;
}
a.discussion-vote {
color: black;
display: block; display: block;
width: 50px;
height: 17px;
margin: auto;
background: url(../images/vote-arrows.png) no-repeat;
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
color: black;
@include hide-text;
@include transition(all, 0, easeOut);
}
.discussion-vote-up {
margin-bottom: 5px;
background-position: -50px -3px;
&:hover { &:hover {
color: #1C71DD; background-position: -50px -5px;
text-decoration: none; @include transition-duration(0.05s);
} }
&.discussion-vote-up { &.voted {
margin-bottom: 3px; background-position: 0 -3px;
color: #1C71DD;
@include transition-duration(0);
} }
}
.discussion-vote-down {
margin-top: 7px;
background-position: -50px -30px;
&.discussion-vote-down { &:hover {
margin-top: 5px; background-position: -50px -28px;
@include transition-duration(0.05s);
} }
&.voted { &.voted {
background-position: 0 -30px;
color: #1C71DD; color: #1C71DD;
@include transition-duration(0);
} }
} }
.discussion-vote-count {
@include discussion-font;
font-size: $post_font_size;
}
.discussion-votes-point {
font-size: 1.1em;
font-weight: bold;
color: #9a9a9a;
}
} }
//CREATE NEW AND EDIT POSTS //CREATE NEW AND EDIT POSTS
.discussion-right-wrapper { .discussion-right-wrapper {
float: left;
min-height: 40px; min-height: 40px;
width: 90%; // width: flex-grid(11);
margin: 24px 0 24px 68px;
} }
.new-post-form, .discussion-thread-edit { .new-post-form, .discussion-thread-edit {
...@@ -300,25 +356,10 @@ div.trending-tags { ...@@ -300,25 +356,10 @@ div.trending-tags {
width: $discussion_input_width !important; width: $discussion_input_width !important;
} }
.new-post-similar-posts-wrapper { .discussion-errors {
@include border-radius(3px); color: #8F0E0E;
border: 1px solid #EEE;
font-size: $comment_body_size;
line-height: 150%;
margin-top: 1%;
padding: 1% 1.5%;
}
.hide-similar-posts {
float: right;
}
.new-post-similar-posts {
font: inherit;
.similar-post {
display: block; display: block;
line-height: 150%; margin-left: -5%;
}
} }
.new-post-body { .new-post-body {
...@@ -352,7 +393,7 @@ div.trending-tags { ...@@ -352,7 +393,7 @@ div.trending-tags {
color: #8F0E0E; color: #8F0E0E;
display: block; display: block;
font: inherit; font: inherit;
font-size: $comment_body_size; font-size: $post_font_size;
list-style: none; list-style: none;
margin-left: -3%; margin-left: -3%;
padding-left: 2em; padding-left: 2em;
...@@ -363,13 +404,38 @@ div.trending-tags { ...@@ -363,13 +404,38 @@ div.trending-tags {
text-decoration: none; text-decoration: none;
}; };
&.collapsed {
.wmd-button-row {
height: 0;
}
.wmd-input {
height: 100px;
@include border-radius(3px);
}
.wmd-preview {
height: 0;
padding: 0;
border-width: 0;
}
.post-options {
height: 0;
}
.reply-post-control {
height: 0;
}
}
.new-post-control { .new-post-control {
margin-left: 80%; margin-left: 80%;
margin-top: 1%; margin-top: 1%;
} }
.reply-post-control { .reply-post-control {
margin-left: 73%; // margin-left: 73%;
} }
.edit-post-control { .edit-post-control {
...@@ -380,12 +446,12 @@ div.trending-tags { ...@@ -380,12 +446,12 @@ div.trending-tags {
.control-button { .control-button {
@include button; @include button;
@include discussion-font; @include discussion-font;
margin-right: 16px;
padding-top: 9px;
color: white; color: white;
display: inline-block; display: inline-block;
font-size: inherit; font-size: inherit;
font-weight: bold; font-weight: bold;
margin-left: 5%;
padding-top: 9px;
text-decoration: none; text-decoration: none;
width: inherit; width: inherit;
...@@ -393,6 +459,13 @@ div.trending-tags { ...@@ -393,6 +459,13 @@ div.trending-tags {
color: white; color: white;
} }
} }
label {
font-family: $sans-serif;
font-size: .8em;
font-style: normal;
font-weight: 400;
}
} }
.new-post-form { .new-post-form {
...@@ -406,6 +479,25 @@ div.trending-tags { ...@@ -406,6 +479,25 @@ div.trending-tags {
} }
} }
.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 STYLES
.thread { .thread {
...@@ -421,44 +513,25 @@ div.trending-tags { ...@@ -421,44 +513,25 @@ div.trending-tags {
@include discussion-font; @include discussion-font;
@include discussion-clickable; @include discussion-clickable;
display: block; display: block;
margin-bottom: $body-line-height;
font-size: $comment_title_size; font-size: $comment_title_size;
font-weight: bold; font-weight: bold;
line-height: 1.4em;
} }
.thread-body, .content-body { .thread-body, .content-body {
@include discussion-font; @include discussion-font;
font-size: $comment_body_size; font-size: $post_font_size;
margin-bottom: 4px; margin-bottom: 4px;
margin-top: 3px; margin-top: 3px;
min-height: 35px;
p { p {
@include discussion-font; @include discussion-font;
margin: 0;
} }
} }
.thread-tags { .thread-tags {
display: inline-block; display: inline-block;
.thread-tag {
@include discussion-font;
background: #CDE69C;
border: 1px solid #A5D24A;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
color: #638421;
float: left;
font-size: 13px;
margin: 5px 7px 5px 0;
padding: 5px 7px;
text-decoration: none;
&:hover {
border-color: #1E4612;
color: #1E4612;
}
}
} }
.info { .info {
...@@ -468,37 +541,39 @@ div.trending-tags { ...@@ -468,37 +541,39 @@ div.trending-tags {
font-style: italic; font-style: italic;
margin-top: 2%; margin-top: 2%;
a { a:hover {
&:hover {
text-decoration: none; text-decoration: none;
color: #1C71DD; color: #1C71DD;
} }
}
.comment-time { .comment-time {
display: inline; display: inline;
float: right; float: right;
margin-right: -4%;
} }
.comment-count { .comment-count {
display: inline; display: inline;
margin-right: 20px;
} }
.discussion-reply { .discussion-actions {
margin-left: 4px; display: inline;
margin: 0;
padding: 0;
li {
display: inline;
margin-right: 20px;
}
} }
.discussion-link { .discussion-link {
@include discussion-font; @include discussion-font;
color: #1d9dd9; color: #1d9dd9;
display: inline; display: inline;
margin-left: 2px;
&:hover { &.discussion-unfollow-thread {
text-decoration: none; color: #dea03e;
color: #1C71DD;
} }
} }
} }
...@@ -506,16 +581,16 @@ div.trending-tags { ...@@ -506,16 +581,16 @@ div.trending-tags {
.discussion-content { .discussion-content {
border-top: lightgray 1px solid; border-top: lightgray 1px solid;
overflow: hidden; overflow: hidden;
padding: 1.5% 0; // padding: 1.5% 0;
.discussion-reply-new { .discussion-reply-new {
@include discussion-font; @include discussion-font;
margin-left: 5%; margin-left: 68px;
.reply-body { .reply-body {
@include discussion-font; @include discussion-font;
display: block; display: block;
font-size: $comment_body_size; font-size: $post_font_size;
margin-top: 10px; margin-top: 10px;
width: 95%; width: 95%;
} }
...@@ -526,23 +601,33 @@ div.trending-tags { ...@@ -526,23 +601,33 @@ div.trending-tags {
.comments { .comments {
//display: none; //display: none;
margin-left: $comment_margin_left; // margin-left: $comment_margin_left;
// margin-left: flex-grid(1);
margin-left: 68px;
overflow: hidden; overflow: hidden;
.discussion-votes {
margin-top: 8px;
}
.discussion-right-wrapper {
margin: 10px 0 10px 68px;
}
.comment { .comment {
.comment-body, .content-body { .comment-body, .content-body {
@include discussion-font; @include discussion-font;
color: black; color: black;
display: block; display: block;
font-size: $comment_body_size; font-size: $comment_font_size;
margin-top: 3px; margin-top: 3px;
} }
&.endorsed { &.endorsed {
> .discussion-content { > .discussion-content {
background-color: lightyellow; background-color: #fcfcea;
} }
} }
} }
...@@ -552,7 +637,7 @@ div.trending-tags { ...@@ -552,7 +637,7 @@ div.trending-tags {
//PAGES //PAGES
.discussion-paginator { .discussion-paginator {
font-size: $comment_body_size; font-size: $post_font_size;
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 20px; margin-top: 20px;
text-align: center; text-align: center;
...@@ -580,6 +665,21 @@ div.trending-tags { ...@@ -580,6 +665,21 @@ div.trending-tags {
} }
} }
} }
&.inline-discussion {
.new-post-form {
margin: 24px 60px;
.post-options {
margin: 8px 0 16px 0;
overflow: hidden;
}
.reply-post-control {
overflow: hidden;
}
}
}
} }
//EDITOR STYLES //EDITOR STYLES
...@@ -596,22 +696,50 @@ div.trending-tags { ...@@ -596,22 +696,50 @@ div.trending-tags {
background-color: Silver; background-color: Silver;
} }
.wmd-input .wmd-input {
{
height: 150px; height: 150px;
width: 100%; width: 100%;
background-color: Gainsboro; background-color: #e9e9e9;
border: 1px solid DarkGray; border: 1px solid #c8c8c8;
font: inherit; font-family: Monaco, 'Lucida Console', monospace;
font-style: normal;
font-size: 0.8em;
line-height: 1.6em;
@include border-radius(3px 3px 0 0);
&::-webkit-input-placeholder {
color: #888;
}
} }
.wmd-preview .wmd-preview {
{ position: relative;
background-color: #c0e0ff; font-family: $sans-serif;
padding: 25px 20px 10px 20px;
margin-bottom: 5px;
box-sizing: border-box;
border: 1px solid #c8c8c8;
border-top-width: 0;
@include border-radius(0 0 3px 3px);
overflow: hidden;
@include transition(all, .2s, easeOut);
&:before {
content: 'PREVIEW';
position: absolute;
top: 3px;
left: 5px;
font-size: 11px;
color: #bbb;
}
p {
font-family: $sans-serif;
}
background-color: #fafafa;
} }
.wmd-button-row .wmd-button-row {
{
position: relative; position: relative;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
...@@ -619,6 +747,8 @@ div.trending-tags { ...@@ -619,6 +747,8 @@ div.trending-tags {
margin-top: 10px; margin-top: 10px;
padding: 0px; padding: 0px;
height: 20px; height: 20px;
overflow: hidden;
@include transition(all, .2s, easeOut);
} }
.wmd-spacer .wmd-spacer
......
lms/templates/discussion/_accordion.html
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<% <article class="sidebar-module">
def url_for(commentable): <a href="#" class="sidebar-new-post-button">New Post</a>
return reverse('django_comment_client.forum.views.forum_form_discussion', args=[course.id, commentable['discussion_id']]) </article>
%>
<%def name="make_category(category, commentables)"> <article class="discussion-sidebar-following sidebar-module">
<h3><a href="#">${category}</a></h3> <header>
<h4>Following</h4>
<a href="#" class="sidebar-view-all">view all &rsaquo;</a>
</header>
<ol class="discussion-sidebar-following-list">
<li><a href="#"><span class="sidebar-following-name">Hints on HW4</span> <span class="sidebar-vote-count">1348</span></a></li>
<li><a href="#"><span class="sidebar-following-name">Answers to Mi-term</span> <span class="sidebar-vote-count">-37</span></a></li>
<li><a href="#"><span class="sidebar-following-name">Summaries for Lectures 1 to 12 (more added, links fixed)</span> <span class="sidebar-vote-count">128</span></a></li>
<ol>
</article>
<ul> <article class="discussion-sidebar-tags sidebar-module">
% for commentable in commentables: <header>
<li${' class="active"' if active == commentable['discussion_id'] else ''}> <h4>Recent Tags</h4>
<a href="${url_for(commentable)}"> <a href="#" class="sidebar-view-all">view all &rsaquo;</a>
<p>${commentable['title']}</p> </header>
</a> <ol class="discussion-sidebar-tags-list">
% endfor <li><a href="#" class="thread-tag">week-1</a><span class="sidebar-tag-count">&times;1348</span></li>
</ul> <li><a href="#" class="thread-tag">S2V8: Method 3</a><span class="sidebar-tag-count">&times;37</span></li>
</%def> <li><a href="#" class="thread-tag">artificial-intelligence</a><span class="sidebar-tag-count">&times;128</span></li>
<ol>
% for category, commentables in discussion_info.items(): </article>
${make_category(category, commentables)} \ No newline at end of file
% endfor
lms/templates/discussion/_forum.html
<%namespace name="renderer" file="_thread.html"/> <%namespace name="renderer" file="_thread.html"/>
<section class="discussion inline-discussion" _id="${discussion_id}"> <section class="discussion inline-discussion" _id="${discussion_id}">
<div class="discussion-non-content discussion-local">
<div class="discussion-title-wrapper"> <div class="discussion-non-content">
<a class="discussion-title" href="javascript:void(0)">Discussion</a>
</div>
<div class="search-wrapper"> <div class="search-wrapper">
<%include file="_search_bar.html" /> <%include file="_search_bar.html" />
</div> </div>
<div class="search-within">
<input type="checkbox" id="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board" checked/>
<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>
</div> </div>
% if len(threads) == 0: % if len(threads) == 0:
<div class="blank"> <div class="blank">
......
lms/templates/discussion/_inline.html
<%namespace name="renderer" file="_thread.html"/> <%namespace name="renderer" file="_thread.html"/>
<script type="text/javascript">
$('#wmd-input-reply-body').bind('focus', function(e) {
$('.new-post-form').removeClass('collapsed');
});
</script>
<section class="discussion inline-discussion" _id="${discussion_id}"> <section class="discussion inline-discussion" _id="${discussion_id}">
<div class="discussion-non-content discussion-local">
<div class="search-wrapper-inline search-wrapper"> <div class="discussion-non-content">
<%include file="_search_bar.html" /> <form class="new-post-form collapsed" id="new-post-form" style="display: block; ">
<ul class="discussion-errors"></ul>
<div class="reply-body"><div class="wmd-panel"><div id="wmd-button-bar-reply-body-502021ba30e78e7d4d00031d"><ul id="wmd-button-row-reply-body-502021ba30e78e7d4d00031d" class="wmd-button-row"><li class="wmd-button" style="left: 0px; " id="wmd-bold-button-reply-body-502021ba30e78e7d4d00031d" title="Strong &lt;strong&gt; Ctrl+B"><span style="background-position: 0px 0px; "></span></li><li class="wmd-button" style="left: 25px; " id="wmd-italic-button-reply-body-502021ba30e78e7d4d00031d" title="Emphasis &lt;em&gt; Ctrl+I"><span style="background-position: -20px 0px; "></span></li><li class="wmd-spacer wmd-spacer1" id="wmd-spacer1-reply-body-502021ba30e78e7d4d00031d"></li><li class="wmd-button" style="left: 75px; " id="wmd-link-button-reply-body-502021ba30e78e7d4d00031d" title="Hyperlink &lt;a&gt; Ctrl+L"><span style="background-position: -40px 0px; "></span></li><li class="wmd-button" style="left: 100px; " id="wmd-quote-button-reply-body-502021ba30e78e7d4d00031d" title="Blockquote &lt;blockquote&gt; Ctrl+Q"><span style="background-position: -60px 0px; "></span></li><li class="wmd-button" style="left: 125px; " id="wmd-code-button-reply-body-502021ba30e78e7d4d00031d" title="Code Sample &lt;pre&gt;&lt;code&gt; Ctrl+K"><span style="background-position: -80px 0px; "></span></li><li class="wmd-button" style="left: 150px; " id="wmd-image-button-reply-body-502021ba30e78e7d4d00031d" title="Image &lt;img&gt; Ctrl+G"><span style="background-position: -100px 0px; "></span></li><li class="wmd-spacer wmd-spacer2" id="wmd-spacer2-reply-body-502021ba30e78e7d4d00031d"></li><li class="wmd-button" style="left: 200px; " id="wmd-olist-button-reply-body-502021ba30e78e7d4d00031d" title="Numbered List &lt;ol&gt; Ctrl+O"><span style="background-position: -120px 0px; "></span></li><li class="wmd-button" style="left: 225px; " id="wmd-ulist-button-reply-body-502021ba30e78e7d4d00031d" title="Bulleted List &lt;ul&gt; Ctrl+U"><span style="background-position: -140px 0px; "></span></li><li class="wmd-button" style="left: 250px; " id="wmd-heading-button-reply-body-502021ba30e78e7d4d00031d" title="Heading &lt;h1&gt;/&lt;h2&gt; Ctrl+H"><span style="background-position: -160px 0px; "></span></li><li class="wmd-button" style="left: 275px; " id="wmd-hr-button-reply-body-502021ba30e78e7d4d00031d" title="Horizontal Rule &lt;hr&gt; Ctrl+R"><span style="background-position: -180px 0px; "></span></li><li class="wmd-spacer wmd-spacer3" id="wmd-spacer3-reply-body-502021ba30e78e7d4d00031d"></li><li class="wmd-button" style="left: 325px; " id="wmd-undo-button-reply-body-502021ba30e78e7d4d00031d" title="Undo - Ctrl+Z"><span style="background-position: -200px -20px; "></span></li><li class="wmd-button" style="left: 350px; " id="wmd-redo-button-reply-body-502021ba30e78e7d4d00031d" title="Redo - Ctrl+Shift+Z"><span style="background-position: -220px -20px; "></span></li></ul></div><textarea class="wmd-input" id="wmd-input-reply-body" placeholder="Post a question or comment…"></textarea><div id="wmd-preview-reply-body-502021ba30e78e7d4d00031d" class="wmd-panel wmd-preview"></div></div></div>
<div class="post-options">
<input type="checkbox" class="discussion-post-anonymously" id="discussion-post-anonymously-502021ba30e78e7d4d00031d">
<label for="discussion-post-anonymously-502021ba30e78e7d4d00031d">post anonymously</label>
<input type="checkbox" class="discussion-auto-watch" id="discussion-autowatch-502021ba30e78e7d4d00031d" checked="">
<label for="discussion-auto-watch-502021ba30e78e7d4d00031d">follow this thread</label>
</div> </div>
<div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div> <div class="reply-post-control">
<a class="discussion-submit-post control-button" href="javascript:void(0)">Submit</a>
</div> </div>
% if len(threads) == 0: </form>
<div class="blank">
<%include file="_blank_slate.html" />
</div> </div>
<div class="threads"></div>
% else:
<%include file="_sort.html" />
<div class="threads"> <div class="threads">
% for thread in threads: % for thread in threads:
${renderer.render_thread(course_id, thread, show_comments=False)} ${renderer.render_thread(course_id, thread, show_comments=False)}
% endfor % endfor
</div> </div>
<%include file="_paginator.html" /> <%include file="_paginator.html" />
% endif
</section> </section>
<%! <%!
...@@ -36,3 +48,5 @@ ...@@ -36,3 +48,5 @@
} }
$$annotated_content_info = $.extend($$annotated_content_info, JSON.parse("${annotated_content_info | escape_quotes}")); $$annotated_content_info = $.extend($$annotated_content_info, JSON.parse("${annotated_content_info | escape_quotes}"));
</script> </script>
lms/templates/discussion/_sort.html
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<%def name="link_to_sort(key, title)"> <%def name="link_to_sort(key, title)">
% if key == sort_key: % if key == sort_key:
% if sort_order.lower() == 'desc': % if sort_order.lower() == 'desc':
${_link_to_sort(key, 'asc', title + ' &#x25BC;', 'sorted')} ${_link_to_sort(key, 'asc', title + '', 'sorted')}
% else: % else:
${_link_to_sort(key, 'desc', title + ' &#x25B2;', 'sorted')} ${_link_to_sort(key, 'desc', title + '', 'sorted')}
% endif % endif
% else: % else:
${_link_to_sort(key, 'desc', title)} ${_link_to_sort(key, 'desc', title)}
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
<a class="discussion-sort-link ${cls}" href="javascript:void(0)" sort-url="${url_for_sort(key, order)}">${title}</a> <a class="discussion-sort-link ${cls}" href="javascript:void(0)" sort-url="${url_for_sort(key, order)}">${title}</a>
</%def> </%def>
<div class="discussion-sort discussion-local"> <div class="discussion-sort">
Sort by: <span class="discussion-label">Sort by:</span>
${link_to_sort('top', 'top')}
${link_to_sort('date', 'date')} ${link_to_sort('date', 'date')}
|
${link_to_sort('activity', 'activity')}
|
${link_to_sort('votes', 'votes')} ${link_to_sort('votes', 'votes')}
|
${link_to_sort('comments', 'comments')} ${link_to_sort('comments', 'comments')}
</div> </div>
lms/templates/discussion/_thread.html
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
<%def name="render_content(content, type, **kwargs)"> <%def name="render_content(content, type, **kwargs)">
<div class="discussion-content"> <div class="discussion-content">
<div class="discussion-content-wrapper clearfix"> <div class="discussion-content-wrapper clearfix">
<div class="follow-wrapper">
</div>
${render_vote(content)} ${render_vote(content)}
<div class="discussion-right-wrapper clearfix"> <div class="discussion-right-wrapper clearfix">
${render_title(content, type, **kwargs)} ${render_title(content, type, **kwargs)}
<div class="discussion-content-view"> <div class="discussion-content-view">
% if content.get('highlighted_body', None): % if content.get('highlighted_body', None):
...@@ -85,8 +85,11 @@ ...@@ -85,8 +85,11 @@
<%def name="render_bottom_bar(content, type, **kwargs)"> <%def name="render_bottom_bar(content, type, **kwargs)">
<div class="info"> <div class="info">
${render_info(content)} ${render_info(content)}
${render_link("discussion-link discussion-reply discussion-reply-" + type, "Reply")} <ul class="discussion-actions">
${render_link("discussion-link discussion-edit", "Edit")} <li>${render_link("discussion-link discussion-reply discussion-reply-" + type, "Reply")}</li>
<li><div class="follow-wrapper"></div></li>
<li>${render_link("discussion-link discussion-edit", "Edit")}</li>
<li>
% if type == "comment" and request.user.is_staff: % if type == "comment" and request.user.is_staff:
% if content['endorsed']: % if content['endorsed']:
<input type="checkbox" checked="checked" class="discussion-link discussion-endorse" id="discussion-endorse-${content['id']}"> <input type="checkbox" checked="checked" class="discussion-link discussion-endorse" id="discussion-endorse-${content['id']}">
...@@ -95,6 +98,8 @@ ...@@ -95,6 +98,8 @@
% endif % endif
<label class="discussion-link" for="discussion-endorse-${content['id']}">Endorsed</label> <label class="discussion-link" for="discussion-endorse-${content['id']}">Endorsed</label>
% endif % endif
</li>
</ul>
</div> </div>
</%def> </%def>
...@@ -109,7 +114,13 @@ ...@@ -109,7 +114,13 @@
</div> </div>
<div class="comment-count"> <div class="comment-count">
% if content.get('comments_count', -1) >= 0: % if content.get('comments_count', -1) >= 0:
<a href="javascript:void(0)" class="discussion-show-comments"> Show ${content['comments_count']} comment(s)</a> <a href="javascript:void(0)" class="discussion-show-comments">
% if content.get('comments_count', -1) >= 2:
Show ${content['comments_count']} comments
% else:
Show ${content['comments_count']} comment
% endif
</a>
% endif % endif
</div> </div>
</%def> </%def>
...@@ -120,8 +131,8 @@ ...@@ -120,8 +131,8 @@
<%def name="render_vote(content)"> <%def name="render_vote(content)">
<div class="discussion-votes"> <div class="discussion-votes">
${render_link("discussion-vote discussion-vote-up", "&#x2C4;")} ${render_link("discussion-vote discussion-vote-up", "&#9650;")}
<div class="discussion-votes-point">${content['votes']['point']}</div> <div class="discussion-votes-point">${content['votes']['point']}</div>
${render_link("discussion-vote discussion-vote-down", "&#x2C5;")} ${render_link("discussion-vote discussion-vote-down", "&#9660;")}
</div> </div>
</%def> </%def>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment