Commit Graph

55 Commits

Author SHA1 Message Date
Victor Shnayder
1c3038ff3a Make accordion remember state
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
2012-08-09 19:47:08 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
8481937f59 Move Logger and *withPrefix javascript into a common location 2012-07-24 16:14:03 -04:00
Calen Pennington
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
Calen Pennington
5f86fcfbff Standardize how Problem and Video modules are loaded in the LMS and CMS preview pane 2012-07-24 16:14:00 -04:00
Calen Pennington
987fe17358 Load js fragments in order, so that Subview is loaded before the classes that use it 2012-07-24 16:14:00 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00
Calen Pennington
6bcc78f767 Make lms jasmine tests mostly pass 2012-07-24 16:13:59 -04:00
Matthew Mongeau
9c672f7bd0 Hook up forms for forgot password functionality. 2012-07-17 16:27:30 -04:00
Calen Pennington
9d1dc37b44 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
Conflicts:
	cms/djangoapps/contentstore/management/commands/import.py
	cms/djangoapps/contentstore/views.py
	cms/envs/common.py
	cms/envs/dev.py
	cms/envs/test.py
	cms/static/sass/README.txt
	cms/static/sass/_base.scss
	cms/static/sass/_calendar.scss
	cms/static/sass/base-style.scss
	cms/templates/base.html
	cms/templates/index.html
	cms/templates/widgets/header.html
	cms/templates/widgets/module-dropdown.html
	cms/templates/widgets/navigation.html
	cms/templates/widgets/problem-edit.html
	cms/urls.py
	common/djangoapps/pipeline_mako/__init__.py
	common/djangoapps/util/views.py
	common/lib/capa/capa_problem.py
	common/lib/capa/templates/textinput_dynamath.html
	common/lib/mitxmako/middleware.py
	common/lib/mitxmako/shortcuts.py
	common/lib/mitxmako/template.py
	common/lib/xmodule/capa_module.py
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/test_files/symbolicresponse.xml
	common/lib/xmodule/test_files/test_files/symbolicresponse.xml
	common/lib/xmodule/tests/__init__.py
	common/lib/xmodule/tests/test_files/symbolicresponse.xml
	common/lib/xmodule/vertical_module.py
	common/lib/xmodule/video_module.py
	common/lib/xmodule/x_module.py
	lms/djangoapps/courseware/content_parser.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/static/coffee/spec/helper.coffee
	lms/static/coffee/spec/modules/video/video_player_spec.coffee
	lms/static/coffee/spec/modules/video/video_volume_control_spec.coffee
	lms/static/coffee/src/modules/problem.coffee
	lms/static/coffee/src/modules/sequence.coffee
	lms/static/coffee/src/modules/video/video_player.coffee
	lms/static/coffee/src/modules/video/video_volume_control.coffee
	lms/static/js/vendor/jquery-1.6.2.min.js
	lms/static/js/vendor/jquery-ui-1.8.16.custom.min.js
	lms/static/sass/application.scss
	lms/static/sass/courseware/_sequence-nav.scss
	lms/static/sass/courseware/_video.scss
	lms/templates/main.html
	lms/urls.py
	rakefile
	requirements.txt
2012-07-05 16:22:50 -04:00
Prem Sichanugrist
cec1b23d7d Remove mystery guest from the test 2012-07-03 14:53:57 -04:00
Prem Sichanugrist
0815f3498a Cleanup Video Logger, update logging message 2012-07-03 14:35:40 -04:00
Prem Sichanugrist
8fb06ce194 Update code according to changes in 829e502 2012-07-03 14:33:24 -04:00
Prem Sichanugrist
de4d487402 Fix failing tests after jQuery upgrade 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
e7e0fe1f3d Fix element naming convention 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
4e183dd6e1 Clean up events binding in Video Player
* Video Player now acting as a parent that always knowing the state of
  their children.
* Events on the sub-controls are now triggered on itself, and binded by
  the Video Player instead of triggering everything on the Video Player.
* A new helper class, SubView, has been introduced to cleanup repeat
  logic on scoped jQuery selector, render() and bind()
2012-07-03 14:33:23 -04:00
Calen Pennington
c140fe8766 Get problem execution working with problems read from keystore 2012-06-29 12:42:48 -04:00
Calen Pennington
2011861444 Get capa problems to display from a keystore 2012-06-29 12:42:48 -04:00
Calen Pennington
de07b8b345 Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js 2012-06-29 12:40:50 -04:00
Prem Sichanugrist
4db0a70166 Fix code convention 2012-06-26 16:35:44 -04:00
Prem Sichanugrist
4580ef89d4 Queue up MathML conversion to be after render
From https://www.pivotaltracker.com/story/show/31700967
Fixes #137
2012-06-26 16:35:44 -04:00
Prem Sichanugrist
7475e415a4 Fix test failure after progress introduction 2012-06-26 16:35:44 -04:00
Prem Sichanugrist
05f4e4fb38 Scroll the caption upon video seeking 2012-06-25 12:22:37 -04:00
Victor Shnayder
a47459512d Progress tracking cleanup.
* use clearer names for the two status strings passed to js
* add functions to do canonical conversion of progress to js string
* fix updating bug in sequence.coffee
* add some todo comments and other docs to make future expansion easier
2012-06-21 10:59:48 -04:00
Calen Pennington
279332e217 Fix other references to jquery after update to latest version 2012-06-21 10:59:47 -04:00
Victor Shnayder
04dd8ee6d1 Initial progress display.
* add module_from_xml param to I4xSystem
* use it to implement xmodule.get_children()
* fix a few comments here and there
* Render-time progress display for seq and vertical modules.
  - Computes fraction of subproblems done.
* Pass problem state back to js during ajax calls.
* general cleanup in capa_module.py
* add progress_changed and progress fields to json returned from each ajax handler

* Coffeescript changes to hook up sequence tracking of problem progress

* net result: sequence 'a' tags now have a progress class
* properly set css class on initial load
* fire event when progress changes after ajax calls
* also save state in 'progress' property of problems-wrapper tag
* event handler finds those tags, computes updated progress
2012-06-21 10:59:47 -04:00
Prem Sichanugrist
432a8e5fd8 Use existential operator 2012-06-21 10:59:42 -04:00
Prem Sichanugrist
6facc631a2 Make sure we don't show volume control on iOS 2012-06-21 10:59:42 -04:00
Prem Sichanugrist
f2cc2fc54c Add video volume control to video player 2012-06-21 10:59:41 -04:00
Prem Sichanugrist
7159041947 Be specific on video progress slider handle
Using `.ui-slider-handle` was too broad.
2012-06-21 10:59:41 -04:00
Prem Sichanugrist
dd0c41cd15 Create Calculator and Feedback form on every page 2012-06-21 10:59:41 -04:00
Prem Sichanugrist
66f8225763 Cleanup show answer code 2012-06-21 10:59:39 -04:00
ichuang
73c1255198 problem.coffee : queue mathjax typesetting just once 2012-06-21 10:59:39 -04:00
ichuang
a093b86841 problem.coffee change: show answer -> also show solution_* & do mathjax typeset 2012-06-21 10:59:37 -04:00
ichuang
f1a12a2604 first pass in capa cleanup:
- responsetype used to be instantiated multiple times(!) in capa_problem
     now it is instantiated once, and stored in self.responders
   - responsetypes.GenericResponse restructured; each superclass
     show now provide setup_response (and not __init__), and may
     provide get_max_score(); general __init__ provided to
     clean up superclasses.
2012-06-21 10:59:36 -04:00
Matthew Mongeau
6dd47547c7 wip modal 2012-06-21 09:51:03 -04:00
Victor Shnayder
5e7535fbfb Progress tracking cleanup.
* use clearer names for the two status strings passed to js
* add functions to do canonical conversion of progress to js string
* fix updating bug in sequence.coffee
* add some todo comments and other docs to make future expansion easier
2012-06-20 16:04:03 -04:00
Calen Pennington
215085345c Fix other references to jquery after update to latest version 2012-06-20 15:06:49 -04:00
Victor Shnayder
b963d8b534 Initial progress display.
* add module_from_xml param to I4xSystem
* use it to implement xmodule.get_children()
* fix a few comments here and there
* Render-time progress display for seq and vertical modules.
  - Computes fraction of subproblems done.
* Pass problem state back to js during ajax calls.
* general cleanup in capa_module.py
* add progress_changed and progress fields to json returned from each ajax handler

* Coffeescript changes to hook up sequence tracking of problem progress

* net result: sequence 'a' tags now have a progress class
* properly set css class on initial load
* fire event when progress changes after ajax calls
* also save state in 'progress' property of problems-wrapper tag
* event handler finds those tags, computes updated progress
2012-06-19 18:28:45 -04:00
Calen Pennington
40a950f152 Merge pull request #105 from MITx/ps-video-volume
Add video volume control to video player
2012-06-18 09:02:02 -07:00
Matthew Mongeau
e048b3251d Get dropdown working 2012-06-14 14:19:47 -04:00
Prem Sichanugrist
01ca43346f Use existential operator 2012-06-14 12:16:29 -04:00
Prem Sichanugrist
98ed738490 Make sure we don't show volume control on iOS 2012-06-13 15:32:38 -04:00
Prem Sichanugrist
7924e5c8f5 Add video volume control to video player 2012-06-13 15:32:38 -04:00
Prem Sichanugrist
e14563954a Be specific on video progress slider handle
Using `.ui-slider-handle` was too broad.
2012-06-13 15:32:38 -04:00
Prem Sichanugrist
0f073f70c4 Create Calculator and Feedback form on every page 2012-06-13 14:56:48 -04:00
Calen Pennington
967a6ee2e7 Merge pull request #94 from MITx/capa-cleanup
Capa cleanup
2012-06-12 12:26:49 -07:00
Prem Sichanugrist
8e98e59cfa Cleanup show answer code 2012-06-12 14:10:00 -04:00
ichuang
35202817d5 problem.coffee : queue mathjax typesetting just once 2012-06-12 14:07:48 -04:00
Prem Sichanugrist
b4ed14f4f7 Handle the case where histogram score can be null
This will leave out the student that never attempt the question and
fixes the error with histogram rendering.
2012-06-11 16:07:09 -04:00