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

make cohort filter visibility conditional on selected commentable cohortedness

Browse Source
This commit is contained in:
Your Name
2013-02-08 17:22:29 -05:00
parent bcf9dfc2b3
commit 7761f6cb04
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.redcar/lucene/segments.gen
View File

Binary file not shown.

2
.redcar/lucene_last_updated
View File

@@ -1 +1 @@
1360356243
1360362070

4
.redcar/tags
View File

@@ -1,4 +1,4 @@
1360356243
1360362070
Ammeter /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Ammeter(x,y,rotation,color,offset)
B /home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js function B()
B /home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js function B(){var b=false;try{var c=m.location.search;return (c.indexOf(U)!=-1||(c.indexOf(V)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(W)==-1}catch(a){}B=function()
@@ -138,7 +138,6 @@ createMarkingsFunctions /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4
createMovingLabelFunctions /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function createMovingLabelFunctions()
createSlider /home/kevin/mitx_all/mitx/lms/static/coffee/module/4-80d80fae81a270e6509a48f20610b708.js function createSlider(sliderDiv, paramName)
ctor /home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/discussion_module_view.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
ctor /home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/views/discussion_thread_list_view.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/8-05087a27dfff9d586de0bbf7d8ab712f.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/9-59ee7f1328aa8cbde9f2829e29cf697b.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/4-7d67198c049863d6c664dcbc6ad3bfd2.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
@@ -147,6 +146,7 @@ ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2f8f384f2ff10dfe7b3afd
ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/3-ae3a8f704bfe7366649872bb0cee3863.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-7682277e07e67ea91adaf3e720f359a6.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-e54b5c7f7b657100c24d82263144a4fd.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
ctor /home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/views/discussion_thread_list_view.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
dialog_cancel /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function dialog_cancel(event)
dialog_check_for_ENTER /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function dialog_check_for_ENTER(event)
dialog_okay /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function dialog_okay(event)

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

@@ -282,6 +282,10 @@ if Backbone?
else
discussionIds = _.map item.find(".board-name[data-discussion_id]"), (board) -> $(board).data("discussion_id").id
@retrieveDiscussions(discussionIds)
if $(event.target).attr('cohorted') == "True"
$('.cohort').show();
else
$('.cohort').hide();
chooseCohort: (event) ->
@group_id = @$('.cohort-options :selected').val()

2
lms/static/sass/_discussion.scss
View File

@@ -977,7 +977,7 @@ body.discussion {
}
.sort-bar {
height: auto;
height: 27px;
border-bottom: 1px solid #a3a3a3;
@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
background-color: #aeaeae;

2
lms/templates/discussion/_filter_dropdown.html
View File

@@ -11,7 +11,7 @@
</%def>
<%def name="render_entry(entries, entry)">
<li><a href="#"><span class="board-name" data-discussion_id='${json.dumps(entries[entry])}'>${entry}</span></a></li>
<li><a href="#"><span class="board-name" data-discussion_id='${json.dumps(entries[entry])}' cohorted = "${entries[entry]['id'] in cohorted_commentables}">${entry}</span></a></li>
</%def>
<%def name="render_category(categories, category)">