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

updates

Browse Source
This commit is contained in:
Your Name
2013-03-13 16:40:04 -04:00
parent a2f9e4d565
commit 08bc073fa5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
View File

@@ -15,7 +15,7 @@ if Backbone?
initialize: ->
@displayedCollection = new Discussion(@collection.models, pages: @collection.pages)
@collection.on "change", @reloadDisplayedCollection
@sortBy = "pinned"
@sortBy = "date"
@discussionIds=""
@collection.on "reset", (discussion) =>
board = $(".current-board").html()

9
lms/templates/discussion/_underscore_templates.html
View File

@@ -46,11 +46,14 @@
<div class="post-body">${'<%- body %>'}</div>
% if has_permission(user, 'create_commentx', course.id):
% if has_permission(user, 'change_permission', course.id):
<div class="admin-pin discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
<i class="icon"></i><span class="pin-label">Pin Thread</span></div>
elif pinned:
THIS ONE IS PINNED
%else:
${"<% if (pinned) { %>"}
<div class="discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
<i class="icon"></i><span class="pin-label">Pin Thread</span></div>
${"<% } %>"}
% endif