Skip to content

E
edx-platform
Commit 0e06f5f5 by Victor Shnayder
Options

Merge remote-tracking branch 'origin/feature/kevin/groups_ui_changes' into… 

Merge remote-tracking branch 'origin/feature/kevin/groups_ui_changes' into feature/victor/revert-revert-of-forums-ui
parents 6d9a9ec4 df0b6aca
Showing with 573 additions and 15 deletions
.redcar/lucene/_kk.cfs.REMOVED.git-id 0 → 100644
bc3d29f01b69d55ac4854d80061cfe1e8c5d8ae1
\ No newline at end of file
.redcar/lucene/_kl.cfs.REMOVED.git-id 0 → 100644
6b0009534a986740acb3962801d7c2374bdfddc3
\ No newline at end of file
.redcar/lucene/_no.cfs.REMOVED.git-id 0 → 100644
c9f553d4f7af7f08ff349f64af015dd592ecc633
\ No newline at end of file
.redcar/redcar.lock 0 → 100644
52650: Locked by 52650 at Tue Feb 05 20:20:57 -0500 2013
.redcar/storage/cursor_saver.yaml 0 → 100644
---
cursor_positions:
- :path: README
:cursor_offset: 0
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: doc/README
:cursor_offset: 190
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: doc/overview.md
:cursor_offset: 0
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: install.txt
:cursor_offset: 665
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: common/djangoapps/track/migrations/0002_auto__add_field_trackinglog_host__chg_field_trackinglog_event_type__ch.py
:cursor_offset: 0
:timestamp: 2013-01-14 18:59:17 -05:00
- :path: lms/djangoapps/django_comment_client/forum/views.pyc
:cursor_offset: 0
:timestamp: 2013-01-23 08:24:35 -05:00
- :path: lms/static/coffee/src/discussion/views/new_post_view.coffee
:cursor_offset: 837
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/djangoapps/courseware/models.py
:cursor_offset: 0
:timestamp: 2013-01-17 22:49:52 -05:00
- :path: lms/djangoapps/django_comment_client/urls.py
:cursor_offset: 0
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/djangoapps/django_comment_client/management/commands/seed_permissions_roles.py
:cursor_offset: 1307
:timestamp: 2013-01-24 09:55:25 -05:00
- :path: lms/djangoapps/lms_migration/management/commands/create_groups.py
:cursor_offset: 294
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/djangoapps/courseware/views.py
:cursor_offset: 1520
:timestamp: 2013-01-24 10:18:02 -05:00
- :path: lms/djangoapps/django_comment_client/helpers.py
:cursor_offset: 0
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/lib/comment_client/commentable.py
:cursor_offset: 0
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: common/test/data/toy/course.xml
:cursor_offset: 0
:timestamp: 2013-01-23 16:26:06 -05:00
- :path: lms/djangoapps/courseware/tests/tests.py
:cursor_offset: 0
:timestamp: 2013-01-23 16:26:06 -05:00
- :path: lms/lib/comment_client/__init__.py
:cursor_offset: 93
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: doc/development.md
:cursor_offset: 0
:timestamp: 2013-01-23 16:26:06 -05:00
- :path: lms/lib/comment_client/utils.py
:cursor_offset: 487
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/lib/comment_client/comment_client.py
:cursor_offset: 0
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/djangoapps/django_comment_client/forum/urls.py
:cursor_offset: 428
:timestamp: 2013-01-24 15:17:13 -05:00
- :path: lms/djangoapps/django_comment_client/base/urls.py
:cursor_offset: 2509
:timestamp: 2013-01-24 15:17:13 -05:00
- :path: lms/djangoapps/django_comment_client/permissions.py
:cursor_offset: 301
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/djangoapps/courseware/courses.py
:cursor_offset: 3488
:timestamp: 2013-01-24 15:17:13 -05:00
- :path: lms/envs/dev.py
:cursor_offset: 6251
:timestamp: 2013-01-23 16:26:06 -05:00
:selection_offset: 6256
:block_selection_mode: false
- :path: lms/envs/test.py
:cursor_offset: 4816
:timestamp: 2013-01-24 21:20:55 -05:00
- :path: nosetests.xml
:cursor_offset: 0
:timestamp: 2013-01-24 21:37:16 -05:00
- :path: lms/djangoapps/django_comment_client/tests.py
:cursor_offset: 1271
:timestamp: 2013-01-24 21:43:12 -05:00
- :path: doc/discussion.md
:cursor_offset: 91
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/static/coffee/src/discussion/views/new_post_view.js
:cursor_offset: 5241
:timestamp: 2013-01-25 15:11:10 -05:00
:selection_offset: 5247
:block_selection_mode: false
- :path: lms/static/coffee/src/discussion/views/new_post_inline_vew.js
:cursor_offset: 0
:timestamp: 2013-01-25 15:11:09 -05:00
- :path: doc/xml-format.md
:cursor_offset: 17517
:timestamp: 2013-01-29 18:07:31 -05:00
- :path: common/lib/xmodule/xmodule/course_module.py
:cursor_offset: 14459
:timestamp: 2013-01-29 18:07:31 -05:00
:selection_offset: 14465
:block_selection_mode: false
- :path: common/static/coffee/src/discussion/models/discussion_user.coffee
:cursor_offset: 350
:timestamp: 2013-01-29 18:07:31 -05:00
- :path: common/static/coffee/src/discussion/discussion.coffee
:cursor_offset: 0
:timestamp: 2013-01-29 18:07:31 -05:00
- :path: common/static/coffee/src/discussion/content.coffee
:cursor_offset: 384
:timestamp: 2013-01-29 18:07:31 -05:00
- :path: lms/lib/comment_client/comment.py
:cursor_offset: 0
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/lib/comment_client/models.py
:cursor_offset: 3281
:timestamp: 2012-12-10 23:45:37 -05:00
- :path: lms/djangoapps/django_comment_client/models.py
:cursor_offset: 0
:timestamp: 2013-01-29 18:07:31 -05:00
- :path: lms/lib/comment_client/thread.py
:cursor_offset: 878
:timestamp: 2013-02-04 14:22:11 -05:00
- :path: lms/templates/discussion/_content_renderer.html
:cursor_offset: 0
:timestamp: 2012-12-10 23:45:38 -05:00
- :path: lms/templates/discussion/_inline_new_post.html
:cursor_offset: 1055
:timestamp: 2013-02-04 16:30:58 -05:00
- :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
- :path: lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
:cursor_offset: 54
:timestamp: 2013-02-06 17:12:07 -05:00
- :path: lms/templates/discussion/mustache/_inline_thread.mustache
:cursor_offset: 54
:timestamp: 2013-02-05 22:15:01 -05:00
- :path: common/static/coffee/src/discussion/discussion_module_view.coffee
:cursor_offset: 2796
:timestamp: 2013-02-06 17:12:07 -05:00
- :path: lms/templates/discussion/_underscore_templates.html
:cursor_offset: 1315
:timestamp: 2013-02-06 17:31:19 -05:00
- :path: common/djangoapps/course_groups/cohorts.py
:cursor_offset: 2242
:timestamp: 2013-02-06 17:12:09 -05:00
- :path: common/djangoapps/course_groups/views.py
:cursor_offset: 754
:timestamp: 2013-02-06 17:12:09 -05:00
- :path: lms/templates/discussion/_discussion_module.html
:cursor_offset: 0
:timestamp: 2012-12-10 23:45:38 -05:00
- :path: lms/templates/index.html
:cursor_offset: 0
:timestamp: 2013-01-25 15:31:55 -05:00
- :path: lms/djangoapps/django_comment_client/forum/views.py
:cursor_offset: 9415
:timestamp: 2013-02-06 21:34:16 -05:00
:selection_offset: 9420
:block_selection_mode: false
- :path: lms/djangoapps/django_comment_client/base/views.py
:cursor_offset: 1716
:timestamp: 2013-02-06 18:25:59 -05:00
- :path: lms/djangoapps/django_comment_client/utils.py
:cursor_offset: 8664
:timestamp: 2013-02-06 17:12:09 -05:00
:selection_offset: 8672
:block_selection_mode: false
- :path: common/static/coffee/src/discussion/views/new_post_view.coffee
:cursor_offset: 727
:timestamp: 2013-02-06 21:58:14 -05:00
- :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
- :path: lms/templates/discussion/_inline.html
:cursor_offset: 318
:timestamp: 2012-12-10 23:45:38 -05:00
- :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
:selection_offset: 922
:block_selection_mode: false
- :path: common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee
:cursor_offset: 1244
:timestamp: 2013-02-06 17:12:07 -05:00
files_to_retain: 0
.redcar/storage/project_loader.yaml 0 → 100644
---
open_files:
- lms/djangoapps/django_comment_client/forum/views.py
.redcar/storage/sessions.yaml 0 → 100644
---
bounds:
x: 0
y: 22
width: 1366
height: 742
tree_width: 394
.redcar/tags 0 → 100644
1360352491
Ammeter /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Ammeter(x,y,rotation,color,offset)
Capacitor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Capacitor(n1,n2,v)
Capacitor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Capacitor(x,y,rotation,name,c)
Circuit /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Circuit()
Collapsible /home/kevin/mitx_all/mitx/lms/static/coffee/module/2-b4a4fc0509ca8fc099a4267b4103ee0e.js function Collapsible()
Collapsible /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-b4a4fc0509ca8fc099a4267b4103ee0e.js function Collapsible()
CombinedOpenEnded /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-2727c3cbfe53fab7a278dfa4d96109da.js function CombinedOpenEnded(element)
Component /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Component(type,x,y,rotation)
Conditional /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-cebb304c95779c66d533cbf301f43402.js function Conditional(element)
ConnectionPoint /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function ConnectionPoint(parent,x,y)
Courseware /home/kevin/mitx_all/mitx/lms/static/coffee/src/courseware.js function Courseware()
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/3-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/12-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/4-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/9-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/5-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/10-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/11-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/7-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/2-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/8-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Descriptor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-cbb943b7f9c6d0b1b331e9e2f727e179.js function Descriptor(element)
Device /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Device()
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()
ElOutput /home/kevin/mitx_all/mitx/lms/static/coffee/module/7-40fec654f1c6f76f154392f82caf37df.js function ElOutput(config, state)
Fet /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Fet(d,g,s,ratio,name,type)
GLabelElOutput /home/kevin/mitx_all/mitx/lms/static/coffee/module/8-4a19a2b354fe97d9386a88a5ad36fef4.js function GLabelElOutput(config, state)
Graph /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function Graph(gstId, config, state)
Ground /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Ground(x,y,rotation)
GstMain /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-8359c8840276bc9275c7da508e57ff39.js function GstMain(gstId)
HTMLModule /home/kevin/mitx_all/mitx/lms/static/coffee/module/2-80a3e7a7cbbdf47978d6c83938f0705a.js function HTMLModule(element)
Histogram /home/kevin/mitx_all/mitx/lms/static/coffee/src/histogram.js function Histogram(id, rawData)
ISource /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function ISource(npos,nneg,v)
ISource /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function ISource(x,y,rotation,name,value)
Inductor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Inductor(n1,n2,branch,v)
Inductor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Inductor(x,y,rotation,name,l)
InlineDiscussion /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-e54b5c7f7b657100c24d82263144a4fd.js function InlineDiscussion(element)
Inputs /home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2580d7c13fbc0d0e8506635308a49343.js function Inputs(gstId, gstClass, state)
JavascriptLoader /home/kevin/mitx_all/mitx/lms/static/coffee/module/2-53c44c016974a4e7b767192c8fa16fe0.js function JavascriptLoader()
JavascriptLoader /home/kevin/mitx_all/mitx/lms/static/coffee/module/3-53c44c016974a4e7b767192c8fa16fe0.js function JavascriptLoader()
JavascriptLoader /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-53c44c016974a4e7b767192c8fa16fe0.js function JavascriptLoader()
Label /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Label(x,y,rotation,label)
NFet /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function NFet(x,y,rotation,name,w_over_l)
Navigation /home/kevin/mitx_all/mitx/lms/static/coffee/src/navigation.js function Navigation()
OpAmp /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function OpAmp(x,y,rotation,name,A)
Opamp /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Opamp(np,nn,no,ng,branch,A,name)
PFet /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function PFet(x,y,rotation,name,w_over_l)
Part /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Part(sch)
PeerGrading /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-e6a1a5c97639ae229cc05aab05a43cf9.js function PeerGrading(element)
PeerGradingProblem /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-e33472a4db6b1b57dc05359769e90389.js function PeerGradingProblem(backend)
PeerGradingProblemBackend /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-e33472a4db6b1b57dc05359769e90389.js function PeerGradingProblemBackend(ajax_url, mock_backend)
Probe /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Probe(x,y,rotation,color,offset)
Problem /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-0945eaf7b5bd2991b12a9eb202df6684.js function Problem(element)
Resistor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Resistor(n1,n2,v)
Resistor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Resistor(x,y,rotation,name,r)
Rubric /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-2727c3cbfe53fab7a278dfa4d96109da.js function Rubric()
Schematic /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Schematic(input)
Sequence /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-24e07ca5300e1f6a0210716e28e8d4c0.js function Sequence(element)
Sliders /home/kevin/mitx_all/mitx/lms/static/coffee/module/4-80d80fae81a270e6509a48f20610b708.js function Sliders(gstId, state)
Source /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Source(x,y,rotation,name,type,value)
State /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function State(gstId, config)
Subview /home/kevin/mitx_all/mitx/lms/static/coffee/module/2-6c67559dda8ce46b7aa8939a7a130358.js function Subview(options)
Tab /home/kevin/mitx_all/mitx/lms/static/coffee/src/modules/tab.js function Tab(id, items)
Time /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-0b45db8d4ae67b439cff8d0c38d807a8.js function Time()
VSource /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function VSource(npos,nneg,branch,v)
VSource /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function VSource(x,y,rotation,name,value)
Video /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-ed01ac19c305207763defeb7e7538a03.js function Video(element)
VideoCaption /home/kevin/mitx_all/mitx/lms/static/coffee/module/3-ae3a8f704bfe7366649872bb0cee3863.js function VideoCaption()
VideoControl /home/kevin/mitx_all/mitx/lms/static/coffee/module/4-7d67198c049863d6c664dcbc6ad3bfd2.js function VideoControl()
VideoPlayer /home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2f8f384f2ff10dfe7b3afdcd72e8977f.js function VideoPlayer()
VideoProgressSlider /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-7682277e07e67ea91adaf3e720f359a6.js function VideoProgressSlider()
VideoQualityControl /home/kevin/mitx_all/mitx/lms/static/coffee/module/7-f9a8866267ea147495ef20561edda6a5.js function VideoQualityControl()
VideoSpeedControl /home/kevin/mitx_all/mitx/lms/static/coffee/module/8-05087a27dfff9d586de0bbf7d8ab712f.js function VideoSpeedControl()
VideoVolumeControl /home/kevin/mitx_all/mitx/lms/static/coffee/module/9-59ee7f1328aa8cbde9f2829e29cf697b.js function VideoVolumeControl()
Wire /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function Wire(x1,y1,x2,y2)
addDynamicEl /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function addDynamicEl(el, func, elId, updateOnEvent)
addFunction /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function addFunction()
add_schematic_handler /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function add_schematic_handler(other_onload)
arg_value /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function arg_value(args,index,default_v)
array_max /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function array_max(a)
array_min /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function array_min(a)
between /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function between(x,x1,x2)
bindUpdatePlotEvent /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function bindUpdatePlotEvent(newPlotDiv, callback)
bring_to_front /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function bring_to_front(win,insert)
build_input /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function build_input(type,size,value)
build_select /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function build_select(options,selected)
build_table /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function build_table(a)
callAddFunction /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function callAddFunction(obj)
canonicalize /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function canonicalize(r)
checkForTicksNames /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function checkForTicksNames(axisName)
checkForTicksNames /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function checkForTicksNames(axisName)
collinear /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function collinear(p1,p2,p3)
component_slider /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function component_slider(event,ui)
createFunctions /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function createFunctions()
createInput /home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2580d7c13fbc0d0e8506635308a49343.js function createInput(inputDiv, paramName)
createMarkingsFunctions /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function createMarkingsFunctions()
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/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()
ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/7-f9a8866267ea147495ef20561edda6a5.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2f8f384f2ff10dfe7b3afdcd72e8977f.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
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/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()
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)
engineering_notation /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function engineering_notation(n,nplaces,trim)
generateData /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function generateData()
generateHelperArrays /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function generateHelperArrays()
generateMarkings /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function generateMarkings()
generateMarkings /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function generateMarkings()
getAllParameterNames /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function getAllParameterNames()
getAllParameterValues /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function getAllParameterValues()
getBarAlign /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function getBarAlign()
getBarWidth /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function getBarWidth()
getParamObj /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function getParamObj(paramName)
getParameterValue /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function getParameterValue(paramName)
graph_mouse_move /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function graph_mouse_move(event)
image_input_click /home/kevin/mitx_all/mitx/lms/static/coffee/module/0-4d162d2de1aac3828ff8f47d82e5ed3c.js function image_input_click(id,event)
inputOnChange /home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2580d7c13fbc0d0e8506635308a49343.js function inputOnChange(event)
inside /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function inside(rect,x,y)
interp_coeffs /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function interp_coeffs(t, t0, t1, t2)
interpolate /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function interpolate(t,times,values)
intersect /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function intersect(r1,r2)
load_dc /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function load_dc(ckt,soln,rhs)
load_tran /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function load_tran(ckt,soln,rhs)
logme /home/kevin/mitx_all/mitx/lms/static/coffee/module/2-af111f211312d70325129ec128562a4c.js function logme()
mat_copy /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function mat_copy(src,dest)
mat_copy_transposed /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function mat_copy_transposed(src,dest)
mat_make /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function mat_make(N,M)
mat_rank /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function mat_rank(Mo)
mat_scale_add /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function mat_scale_add(A, B, scalea, scaleb, C)
mat_solve /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function mat_solve(M,rhs)
mat_solve_rq /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function mat_solve_rq(M, rhs)
mat_v_mult /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function mat_v_mult(M,x,b,scale)
onUpdatePlot /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function onUpdatePlot(event)
ord /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function ord(ch)
parse_number /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function parse_number(s,default_v)
parse_source /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function parse_source(v)
part_enter /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function part_enter(event)
part_leave /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function part_leave(event)
part_mouse_down /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function part_mouse_down(event)
part_mouse_up /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function part_mouse_up(event)
pick_step /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function pick_step(ckt, step_index)
plot_cursor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function plot_cursor(c,graph,cursor_x,left_margin)
plot_x /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function plot_x(x)
plot_y /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function plot_y(y)
plot_z /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function plot_z(z)
prepare_schematics /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function prepare_schematics()
processAsymptote /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function processAsymptote(asyObj)
processAsymptote /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function processAsymptote()
processFloat /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function processFloat(attrName, newAttrName)
processFuncObj /home/kevin/mitx_all/mitx/lms/static/coffee/module/8-4a19a2b354fe97d9386a88a5ad36fef4.js function processFuncObj(obj)
processFuncObj /home/kevin/mitx_all/mitx/lms/static/coffee/module/7-40fec654f1c6f76f154392f82caf37df.js function processFuncObj(obj)
processMovingLabel /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function processMovingLabel(obj)
processParameter /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function processParameter(obj)
processTicks /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function processTicks(ticksStr, ticksObj, unitsType)
pwl_source /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function pwl_source(src,tv_pairs,repeat)
redraw_plot /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function redraw_plot(graph)
roundToPrec /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function roundToPrec(num, prec)
schematic_double_click /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function schematic_double_click(event)
schematic_key_down /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function schematic_key_down(event)
schematic_key_up /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function schematic_key_up(event)
schematic_mouse_down /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function schematic_mouse_down(event)
schematic_mouse_enter /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function schematic_mouse_enter(event)
schematic_mouse_leave /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function schematic_mouse_leave(event)
schematic_mouse_move /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function schematic_mouse_move(event)
schematic_mouse_up /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function schematic_mouse_up(event)
schematic_mouse_wheel /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function schematic_mouse_wheel(event)
setGraphAxes /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function setGraphAxes()
setGraphXRange /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function setGraphXRange()
setParameterValue /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js function setParameterValue(paramName, paramValue, element, slider, updateOnEvent)
sliderOnChange /home/kevin/mitx_all/mitx/lms/static/coffee/module/4-80d80fae81a270e6509a48f20610b708.js function sliderOnChange(event, ui)
sliderOnSlide /home/kevin/mitx_all/mitx/lms/static/coffee/module/4-80d80fae81a270e6509a48f20610b708.js function sliderOnSlide(event, ui)
source_type_changed /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function source_type_changed(event)
tool_click /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function tool_click(event)
tool_enter /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function tool_enter(event)
tool_leave /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function tool_leave(event)
trim /home/kevin/mitx_all/mitx/lms/static/coffee/module/3-6e8bf396002ae78ecc4f7bd88b572323.js function trim(str)
updateMovingLabels /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function updateMovingLabels()
updatePlot /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function updatePlot()
updatePlot /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function updatePlot()
update_schematics /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function update_schematics()
view_limits /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function view_limits(vmin,vmax)
window_close /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function window_close(win)
window_close_button /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function window_close_button(event)
window_mouse_down /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function window_mouse_down(event)
window_mouse_move /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function window_mouse_move(event)
window_mouse_up /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function window_mouse_up(event)
xAxisTickFormatter /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function xAxisTickFormatter(val, axis)
yAxisTickFormatter /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js function yAxisTickFormatter(val, axis)
common/static/coffee/src/discussion/discussion.coffee
...@@ -39,6 +39,8 @@ if Backbone? ...@@ -39,6 +39,8 @@ if Backbone?
url = DiscussionUtil.urlFor 'threads' url = DiscussionUtil.urlFor 'threads'
when 'followed' when 'followed'
url = DiscussionUtil.urlFor 'followed_threads', options.user_id url = DiscussionUtil.urlFor 'followed_threads', options.user_id
if options['group_id']
data['group_id'] = options['group_id']
data['sort_key'] = sort_options.sort_key || 'date' data['sort_key'] = sort_options.sort_key || 'date'
data['sort_order'] = sort_options.sort_order || 'desc' data['sort_order'] = sort_options.sort_order || 'desc'
DiscussionUtil.safeAjax DiscussionUtil.safeAjax
......
common/static/coffee/src/discussion/discussion_module_view.coffee
...@@ -70,6 +70,7 @@ if Backbone? ...@@ -70,6 +70,7 @@ if Backbone?
DiscussionUtil.loadRoles(response.roles) DiscussionUtil.loadRoles(response.roles)
allow_anonymous = response.allow_anonymous allow_anonymous = response.allow_anonymous
allow_anonymous_to_peers = response.allow_anonymous_to_peers allow_anonymous_to_peers = response.allow_anonymous_to_peers
cohorts = response.cohorts
# $elem.html("Hide Discussion") # $elem.html("Hide Discussion")
@discussion = new Discussion() @discussion = new Discussion()
@discussion.reset(response.discussion_data, {silent: false}) @discussion.reset(response.discussion_data, {silent: false})
...@@ -78,8 +79,12 @@ if Backbone? ...@@ -78,8 +79,12 @@ if Backbone?
#determined in the coffeescript based on whether or not there's a #determined in the coffeescript based on whether or not there's a
#group id #group id
$discussion = $(Mustache.render $("script#_inline_discussion").html(), {'threads':response.discussion_data, 'discussionId': discussionId, 'allow_anonymous_to_peers': allow_anonymous_to_peers, 'allow_anonymous': allow_anonymous}) if response.is_cohorted
source = "script#_inline_discussion_cohorted"
else
source = "script#_inline_discussion"
$discussion = $(Mustache.render $(source).html(), {'threads':response.discussion_data, 'discussionId': discussionId, 'allow_anonymous_to_peers': allow_anonymous_to_peers, 'allow_anonymous': allow_anonymous, 'cohorts':cohorts})
if @$('section.discussion').length if @$('section.discussion').length
@$('section.discussion').replaceWith($discussion) @$('section.discussion').replaceWith($discussion)
else else
......
common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
...@@ -9,6 +9,7 @@ if Backbone? ...@@ -9,6 +9,7 @@ if Backbone?
"click .browse-topic-drop-search-input": "ignoreClick" "click .browse-topic-drop-search-input": "ignoreClick"
"click .post-list .list-item a": "threadSelected" "click .post-list .list-item a": "threadSelected"
"click .post-list .more-pages a": "loadMorePages" "click .post-list .more-pages a": "loadMorePages"
"change .cohort-options": "chooseCohort"
'keyup .browse-topic-drop-search-input': DiscussionFilter.filterDrop 'keyup .browse-topic-drop-search-input': DiscussionFilter.filterDrop
initialize: -> initialize: ->
...@@ -128,10 +129,20 @@ if Backbone? ...@@ -128,10 +129,20 @@ if Backbone?
switch @mode switch @mode
when 'search' when 'search'
options.search_text = @current_search options.search_text = @current_search
if @group_id
options.group_id = @group_id
when 'followed' when 'followed'
options.user_id = window.user.id options.user_id = window.user.id
options.group_id = "all"
when 'commentables' when 'commentables'
options.commentable_ids = @discussionIds options.commentable_ids = @discussionIds
if @group_id
options.group_id = @group_id
when 'all'
if @group_id
options.group_id = @group_id
@collection.retrieveAnotherPage(@mode, options, {sort_key: @sortBy}) @collection.retrieveAnotherPage(@mode, options, {sort_key: @sortBy})
renderThread: (thread) => renderThread: (thread) =>
...@@ -263,13 +274,21 @@ if Backbone? ...@@ -263,13 +274,21 @@ if Backbone?
if discussionId == "#all" if discussionId == "#all"
@discussionIds = "" @discussionIds = ""
@$(".post-search-field").val("") @$(".post-search-field").val("")
@$('.cohort').show()
@retrieveAllThreads() @retrieveAllThreads()
else if discussionId == "#following" else if discussionId == "#following"
@retrieveFollowed(event) @retrieveFollowed(event)
@$('.cohort').hide()
else else
discussionIds = _.map item.find(".board-name[data-discussion_id]"), (board) -> $(board).data("discussion_id").id discussionIds = _.map item.find(".board-name[data-discussion_id]"), (board) -> $(board).data("discussion_id").id
@retrieveDiscussions(discussionIds) @retrieveDiscussions(discussionIds)
chooseCohort: (event) ->
@group_id = @$('.cohort-options :selected').val()
@collection.current_page = 0
@collection.reset()
@loadMorePages(event)
retrieveDiscussion: (discussion_id, callback=null) -> retrieveDiscussion: (discussion_id, callback=null) ->
url = DiscussionUtil.urlFor("retrieve_discussion", discussion_id) url = DiscussionUtil.urlFor("retrieve_discussion", discussion_id)
DiscussionUtil.safeAjax DiscussionUtil.safeAjax
......
common/static/coffee/src/discussion/views/new_post_view.coffee
...@@ -17,6 +17,11 @@ if Backbone? ...@@ -17,6 +17,11 @@ if Backbone?
@$(".new-post-tags").tagsInput DiscussionUtil.tagsInputOptions() @$(".new-post-tags").tagsInput DiscussionUtil.tagsInputOptions()
if @$($(".topic_menu li a")[0]).attr('cohorted') != "True"
$('.choose-cohort').hide();
events: events:
"submit .new-post-form": "createPost" "submit .new-post-form": "createPost"
"click .topic_dropdown_button": "toggleTopicDropdown" "click .topic_dropdown_button": "toggleTopicDropdown"
......
lms/djangoapps/django_comment_client/forum/views.py
...@@ -61,13 +61,27 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG ...@@ -61,13 +61,27 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
cc_user.save() cc_user.save()
#if the course-user is cohorted, then add the group id #there are 2 dimensions to consider when executing a search with respect to group id
group_id = get_cohort_id(request.user, course_id) #is user a moderator
#did the user request a group
#if you're an instructor, show everything #if the user requested a group explicitly, give them that group, othewrise, if mod, show all, else if student, use cohort
if group_id and not cached_has_permission(request.user, "see_all_cohorts", course_id):
group_id = request.GET.get('group_id')
if group_id == "all":
group_id = None
if not group_id:
if not cached_has_permission(request.user, "see_all_cohorts", course_id):
group_id = get_cohort_id(request.user, course_id)
if group_id:
default_query_params["group_id"] = group_id default_query_params["group_id"] = group_id
#so by default, a moderator sees all items, and a student sees his cohort
query_params = merge_dict(default_query_params, query_params = merge_dict(default_query_params,
strip_none(extract(request.GET, strip_none(extract(request.GET,
['page', 'sort_key', ['page', 'sort_key',
...@@ -76,7 +90,6 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG ...@@ -76,7 +90,6 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
threads, page, num_pages = cc.Thread.search(query_params) threads, page, num_pages = cc.Thread.search(query_params)
#now add the group name if the thread has a group id #now add the group name if the thread has a group id
for thread in threads: for thread in threads:
if thread.get('group_id'): if thread.get('group_id'):
...@@ -119,11 +132,12 @@ def inline_discussion(request, course_id, discussion_id): ...@@ -119,11 +132,12 @@ def inline_discussion(request, course_id, discussion_id):
#since inline is all one commentable, only show or allow the choice of cohorts #since inline is all one commentable, only show or allow the choice of cohorts
#if the commentable is cohorted, otherwise everything is not cohorted #if the commentable is cohorted, otherwise everything is not cohorted
#and no one has the option of choosing a cohort #and no one has the option of choosing a cohort
is_cohorted = is_course_cohorted(course_id) and is_commentable_cohorted(course_id, discussion_id) is_cohorted = is_course_cohorted(course_id) and is_commentable_cohorted(course_id, discussion_id)
cohorts_list = list() cohorts_list = list()
if is_cohorted: if is_cohorted:
cohorts_list.append({'name':'All Groups','id':None})
#if you're a mod, send all cohorts and let you pick #if you're a mod, send all cohorts and let you pick
if cached_has_permission(request.user, "see_all_cohorts", course_id): if cached_has_permission(request.user, "see_all_cohorts", course_id):
...@@ -139,9 +153,7 @@ def inline_discussion(request, course_id, discussion_id): ...@@ -139,9 +153,7 @@ def inline_discussion(request, course_id, discussion_id):
user_cohort_id = user_cohort.id user_cohort_id = user_cohort.id
else: else:
user_cohort_name = user_cohort_id = None user_cohort_name = user_cohort_id = None
cohorts_list.append({'name':'All Groups','id':None})
if user_cohort: if user_cohort:
cohorts_list.append({'name':user_cohort_name, 'id':user_cohort_id}) cohorts_list.append({'name':user_cohort_name, 'id':user_cohort_id})
else: else:
...@@ -158,7 +170,7 @@ def inline_discussion(request, course_id, discussion_id): ...@@ -158,7 +170,7 @@ def inline_discussion(request, course_id, discussion_id):
'allow_anonymous_to_peers': allow_anonymous_to_peers, 'allow_anonymous_to_peers': allow_anonymous_to_peers,
'allow_anonymous': allow_anonymous, 'allow_anonymous': allow_anonymous,
'cohorts': cohorts_list, 'cohorts': cohorts_list,
'is_cohorted': is_cohorted 'is_cohorted': is_cohorted
}) })
...@@ -229,9 +241,9 @@ def forum_form_discussion(request, course_id): ...@@ -229,9 +241,9 @@ def forum_form_discussion(request, course_id):
'is_course_cohorted': is_course_cohorted(course_id) 'is_course_cohorted': is_course_cohorted(course_id)
} }
# print "start rendering.." # print "start rendering.."
return render_to_response('discussion/index.html', context) return render_to_response('discussion/index.html', context)
@login_required @login_required
def single_thread(request, course_id, discussion_id, thread_id): def single_thread(request, course_id, discussion_id, thread_id):
course = get_course_with_access(request.user, course_id, 'load') course = get_course_with_access(request.user, course_id, 'load')
......
lms/templates/discussion/_inline_new_post.html
<article class="new-post-article"> <article class="new-post-article">
<div class="inner-wrapper"> <div class="inner-wrapper">
<div class="new-post-form-errors"> <div class="new-post-form-errors">
</div> </div>
<form class="new-post-form"> <form class="new-post-form">
<div class="left-column"> <div class="left-column">
...@@ -12,6 +12,24 @@ ...@@ -12,6 +12,24 @@
%elif course.metadata.get("allow_anonymous_to_peers", False): %elif course.metadata.get("allow_anonymous_to_peers", False):
<input type="checkbox" name="anonymous_to_peers" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label> <input type="checkbox" name="anonymous_to_peers" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label>
%endif %endif
%if is_course_cohorted:
<div class="form-group-label choose-cohort">
Make visible to:
<select class="group-filter-select new-post-group" name = "group_id">
<option value="">All Groups</option>
%if is_moderator:
%for c in cohorts:
<option value="${c.id}">${c.name}</option>
%endfor
%else:
%if user_cohort:
<option value="${user_cohort}">My Cohort</option>
%endif
%endif
</select>
</div>
%endif
</div> </div>
</div> </div>
<div class="right-column"> <div class="right-column">
......
lms/templates/discussion/_new_post.html
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<input type="checkbox" name="anonymous_to_peers" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label> <input type="checkbox" name="anonymous_to_peers" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label>
%endif %endif
%if is_course_cohorted: %if is_course_cohorted:
<div class="form-group-label choose-cohort" style = "display:none"> <div class="form-group-label choose-cohort">
Make visible to: Make visible to:
<select class="group-filter-select new-post-group" name = "group_id"> <select class="group-filter-select new-post-group" name = "group_id">
<option value="">All Groups</option> <option value="">All Groups</option>
......
lms/templates/discussion/_thread_list_template.html
...@@ -18,6 +18,17 @@ ...@@ -18,6 +18,17 @@
<li><a href="#" data-sort="votes">votes</a></li> <li><a href="#" data-sort="votes">votes</a></li>
<li><a href="#" data-sort="comments">comments</a></li> <li><a href="#" data-sort="comments">comments</a></li>
</ul> </ul>
%if is_course_cohorted and is_moderator:
<span class="group-filter-label cohort">Show:</span>
<select class="group-filter-select cohort-options cohort">
<option value="all">All Groups</option>
%for c in cohorts:
<option value="${c.id}">${c.name} and public</option>
%endfor
</select>
%endif
</div> </div>
<div class="post-list-wrapper"> <div class="post-list-wrapper">
<ul class="post-list"> <ul class="post-list">
......
lms/templates/discussion/mustache/_inline_discussion_cohorted.mustache 0 → 100644
<section class="discussion" data-discussion-id="{{discussionId}}">
<article class="new-post-article">
<span class="topic" data-discussion-id="{{discussionId}}" />
<div class="inner-wrapper">
<div class="new-post-form-errors">
</div>
<form class="new-post-form">
<div class="form-row">
<input type="text" class="new-post-title" name="title" placeholder="Title">
</div>
<div class="form-row">
<div class="new-post-body" name="body" placeholder="Enter your question or comment&hellip;"></div>
<!---<div class="new-post-preview"><span class="new-post-preview-label">Preview</span></div>-->
</div>
{{! TODO tags: Getting rid of tags for now. }}
{{!<div class="form-row">}}
{{! <input type="text" class="new-post-tags" name="tags" placeholder="Tags">}}
{{!</div>}}
<input type="submit" class="submit" value="Add post">
<a href="#" class="new-post-cancel">Cancel</a>
<div class="options">
<input type="checkbox" name="follow" class="discussion-follow" class="discussion-follow" id="new-post-follow" checked><label for="new-post-follow">follow this post</label>
<br>
{{#allow_anonymous}}
<input type="checkbox" name="anonymous" class="discussion-anonymous" id="new-post-anonymous"><label for="new-post-anonymous">post anonymously</label>
{{/allow_anonymous}}
{{#allow_anonymous_to_peers}}
<input type="checkbox" name="anonymous" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label>
{{/allow_anonymous_to_peers}}
<div class="form-group-label choose-cohort">
Make visible to:
<select class="group-filter-select new-post-group" name = "group_id">
{{#cohorts}}
<option value="{{id}}">{{name}}</option>
{{/cohorts}}
</select>
</div>
</div>
</form>
</div>
</article>
<section class="threads">
{{#threads}}
<article class="discussion-thread" id="thread_{{id}}">
</article>
{{/threads}}
</section>
<section class="pagination">
</section>
</section>
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