Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move discussion board to the Pattern Library

Browse Source 
TNL-4622
This commit is contained in:
Andy Armstrong
2016-05-20 23:08:32 -04:00
parent ed798bb945
commit 7e2a174eec
55 changed files with 1091 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/static/coffee/spec/discussion/view/discussion_thread_view_spec.coffee
View File

@@ -133,8 +133,8 @@ describe "DiscussionThreadView", ->
checkVoteDisplay = (originallyClosed, mode) ->
view = createDiscussionThreadView(originallyClosed, mode)
expect(view.$('.forum-thread-main-wrapper .action-vote').is(":visible")).toBe(not originallyClosed)
expect(view.$('.forum-thread-main-wrapper .display-vote').is(":visible")).toBe(originallyClosed)
expect(view.$('.thread-main-wrapper .action-vote').is(":visible")).toBe(not originallyClosed)
expect(view.$('.thread-main-wrapper .display-vote').is(":visible")).toBe(originallyClosed)
view.$(".action-close").click()
expect(view.$('.action-vote').is(":visible")).toBe(originallyClosed)
expect(view.$('.display-vote').is(":visible")).toBe(not originallyClosed)

2
common/static/common/templates/discussion/discussion-home.underscore
View File

@@ -1,6 +1,6 @@
<div class="discussion-article view-discussion-home">
<section class="home-header">
<span class="label"><%- gettext("DISCUSSION HOME:") %></span>
<span class="label"><%- gettext("Discussion Home") %></span>
<% if (window.courseName) { %>
<h1 class="home-title"><%- window.courseName %></h1>
<% } %>

13
common/static/common/templates/discussion/thread.underscore
View File

@@ -1,21 +1,20 @@
<article class="discussion-article" data-id="<%- id %>" tabindex="-1">
<div class="thread-wrapper">
<div class="forum-thread-main-wrapper">
<div class="thread-main-wrapper">
<div class="thread-content-wrapper"></div>
<div class="post-extended-content">
<ol class="responses js-marked-answer-list"></ol>
</div>
</div>
<div class="post-extended-content">
<div class="response-count"/>
<div class="post-extended-content thread-responses-wrapper">
<% if (!readOnly) { %>
<div class="add-response">
<button class="button add-response-btn">
<span class="icon fa fa-reply" aria-hidden="true"></span>
<span class="add-response-btn-text"><%- gettext("Add a Response") %></span>
<button class="btn-brand btn-small add-response-btn">
<%- gettext("Add a Response") %>
</button>
</div>
<% } %>
<div class="response-count"/>
<ol class="responses js-response-list"/>
<div class="response-pagination"/>
<div class="post-status-closed bottom-post-status" style="display: none">
@@ -23,7 +22,7 @@
</div>
<% if (can_create_comment && !readOnly) { %>
<form class="discussion-reply-new" data-id="<%- id %>">
<h4><%- gettext("Post a response:") %></h4>
<h4><%- gettext("Add a response:") %></h4>
<ul class="discussion-errors"></ul>
<div class="reply-body" data-id="<%- id %>"></div>
<div class="reply-post-control">