diff --git a/.redcar/lucene/segments.gen b/.redcar/lucene/segments.gen index 8d63e66e19..2cc90a6103 100644 Binary files a/.redcar/lucene/segments.gen and b/.redcar/lucene/segments.gen differ diff --git a/.redcar/lucene_last_updated b/.redcar/lucene_last_updated index 11617ff437..cd8951957d 100644 --- a/.redcar/lucene_last_updated +++ b/.redcar/lucene_last_updated @@ -1 +1 @@ -1360362070 +1360364478 diff --git a/.redcar/storage/cursor_saver.yaml b/.redcar/storage/cursor_saver.yaml index 29f44e99c7..4e51681cf7 100644 --- a/.redcar/storage/cursor_saver.yaml +++ b/.redcar/storage/cursor_saver.yaml @@ -135,9 +135,6 @@ cursor_positions: - :path: common/static/coffee/src/discussion/utils.coffee :cursor_offset: 316 :timestamp: 2013-02-05 21:29:02 -05:00 - - :path: lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache - :cursor_offset: 2158 - :timestamp: 2013-02-05 21:17:52 -05:00 - :path: lms/templates/discussion/_single_thread.html :cursor_offset: 308 :timestamp: 2013-02-06 17:12:07 -05:00 @@ -184,9 +181,6 @@ cursor_positions: - :path: lms/templates/discussion/index.html :cursor_offset: 408 :timestamp: 2012-12-10 23:45:38 -05:00 - - :path: lms/templates/discussion/_new_post.html - :cursor_offset: 2472 - :timestamp: 2013-02-06 21:29:38 -05:00 - :path: common/static/coffee/src/discussion/views/new_post_inline_vew.js :cursor_offset: 0 :timestamp: 2013-02-06 18:31:50 -05:00 @@ -196,9 +190,6 @@ cursor_positions: - :path: lms/templates/discussion/mustache/_inline_discussion.mustache :cursor_offset: 1994 :timestamp: 2013-02-07 19:39:13 -05:00 - - :path: common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee - :cursor_offset: 9947 - :timestamp: 2013-02-07 19:14:08 -05:00 - :path: common/static/coffee/src/discussion/views/new_post_inline_vew.coffee :cursor_offset: 917 :timestamp: 2013-02-06 17:12:07 -05:00 @@ -210,4 +201,20 @@ cursor_positions: - :path: .gitignore :cursor_offset: 330 :timestamp: 2013-02-08 15:08:21 -05:00 + - :path: lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache + :cursor_offset: 2147 + :timestamp: 2013-02-08 14:41:31 -05:00 + - :path: lms/templates/discussion/_new_post.html + :cursor_offset: 464 + :timestamp: 2013-02-07 10:06:27 -05:00 + :selection_offset: 405 + :block_selection_mode: false + - :path: lms/templates/discussion/_thread_list_template.html + :cursor_offset: 1257 + :timestamp: 2013-02-08 15:40:40 -05:00 + - :path: common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee + :cursor_offset: 10449 + :timestamp: 2013-02-08 17:21:06 -05:00 + :selection_offset: 10438 + :block_selection_mode: false files_to_retain: 0 diff --git a/.redcar/tags b/.redcar/tags index 9bb04a7fc7..82dcf7eb18 100644 --- a/.redcar/tags +++ b/.redcar/tags @@ -1,4 +1,4 @@ -1360362070 +1360364478 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() @@ -46,7 +46,6 @@ Device /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f56286775 Diode /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Diode(n1,n2,v,type) Diode /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Diode(x,y,rotation,name,area,type) DiscussionModuleView /home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/discussion_module_view.js function DiscussionModuleView() -DiscussionThreadListView /home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/views/discussion_thread_list_view.js function DiscussionThreadListView() E /home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js function E() E /home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js function E(){var b=document.getElementsByTagName(mb);for(var c=0,d=b.length;c=0){continue}if(f==qb){g=e.getAttribute(rb);if(g){var h,i=g.indexOf(sb);if(i>=0){f=g.substring(0,i);h=g.substring(i+1)}else{f=g;h=P}u[f]=h}}else if(f==tb){g=e.getAttribute(rb);if(g){try{A=eval(g)}catch(a){alert(ub+g+vb)}}}else if(f==wb){g=e.getAttribute(rb);if(g){try{z=eval(g)}catch(a){alert(ub+g+xb) ElOutput /home/kevin/mitx_all/mitx/lms/static/coffee/module/7-40fec654f1c6f76f154392f82caf37df.js function ElOutput(config, state) @@ -146,7 +145,6 @@ 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) diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index 267b66b466..ffd0471dbb 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -281,11 +281,11 @@ if Backbone? @$('.cohort').hide() 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(); + @retrieveDiscussions(discussionIds, "function(){$('.cohort').show();}") + else + @retrieveDiscussions(discussionIds, "function(){$('.cohort').show();}") chooseCohort: (event) -> @group_id = @$('.cohort-options :selected').val() diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index a914751280..9a9ec74907 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -977,7 +977,7 @@ body.discussion { } .sort-bar { - height: 27px; + height: auto; border-bottom: 1px solid #a3a3a3; @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)); background-color: #aeaeae;