Commit a2be6dd4 by Kevin Chugh

first cut of UI

parent 5644d081
...@@ -28,4 +28,5 @@ nosetests.xml ...@@ -28,4 +28,5 @@ nosetests.xml
cover_html/ cover_html/
.idea/ .idea/
.redcar/ .redcar/
chromedriver.log chromedriver.log
\ No newline at end of file /nbproject
...@@ -210,6 +210,9 @@ def forum_form_discussion(request, course_id): ...@@ -210,6 +210,9 @@ def forum_form_discussion(request, course_id):
user_cohort_id = get_cohort_id(request.user, course_id) user_cohort_id = get_cohort_id(request.user, course_id)
context = { context = {
'csrf': csrf(request)['csrf_token'], 'csrf': csrf(request)['csrf_token'],
'course': course, 'course': course,
......
...@@ -2442,4 +2442,39 @@ body.discussion { ...@@ -2442,4 +2442,39 @@ body.discussion {
color:#000; color:#000;
font-style: italic; font-style: italic;
background-color:#fff; background-color:#fff;
} }
\ No newline at end of file
.discussion-flag-abuse {
font-size: 12px;
float:right;
padding-right: 5px;
font-style: italic;
}
.notpinned .icon
{
display: inline-block;
width: 10px;
height: 14px;
padding-right: 3px;
background: transparent url('../images/notpinned.png') no-repeat 0 0;
}
.pinned .icon
{
display: inline-block;
width: 10px;
height: 14px;
padding-right: 3px;
background: transparent url('../images/pinned.png') no-repeat 0 0;
}
.pinned span {
color: #B82066;
font-style: italic;
}
.notpinned span {
color: #888;
font-style: italic;
}
\ No newline at end of file
...@@ -45,6 +45,11 @@ ...@@ -45,6 +45,11 @@
</header> </header>
<div class="post-body">${'<%- body %>'}</div> <div class="post-body">${'<%- body %>'}</div>
% if has_permission(user, 'create_comment', course.id):
<div class="discussion-flag-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
<i class="icon"></i><span class="pin-label">Pin Thread</span></div>
% endif
${'<% if (obj.courseware_url) { %>'} ${'<% if (obj.courseware_url) { %>'}
<div class="post-context"> <div class="post-context">
(this post is about <a href="${'<%- courseware_url%>'}">${'<%- courseware_title %>'}</a>) (this post is about <a href="${'<%- courseware_url%>'}">${'<%- courseware_title %>'}</a>)
......
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