Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,311 Commits 1 Branch 0 Tags
72eef72d8b60ed737b06401bd9bdaee42a940e2f
Commit Graph

63 Commits

Author SHA1 Message Date
Calen Pennington
215085345c Fix other references to jquery after update to latest version 2012-06-20 15:06:49 -04:00
Victor Shnayder
b24c4d4626 Fix render of lms index with no chapter or section. 2012-06-20 11:31:21 -04:00
Calen Pennington
c317521468 Merge pull request #126 from MITx/victor/progress-tracking 
Victor/progress tracking
 2012-06-20 07:33:48 -07:00
Calen Pennington
7710e7a6a4 Merge pull request #125 from MITx/victor/fix_accordion 
Fix accordion rendering bug
 2012-06-20 05:36:41 -07:00
Calen Pennington
65d02819e8 Merge pull request #124 from MITx/cpennington/cms-pipeline 
Switch cms over to django pipeline
 2012-06-20 05:35:49 -07: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
Victor Shnayder
39c57af849 remove obsolete comment 2012-06-19 16:37:33 -04:00
Victor Shnayder
a6fc27acd6 Fix accordion rendering bug 
* needed to clean the chapter and section vars before rendering
 2012-06-19 16:19:45 -04:00
Prem Sichanugrist
afaed83158 Update jQuery and jQuery-UI to latest version 2012-06-19 14:31:00 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
ef6630d733 Merge pull request #120 from MITx/cpennington/cms 
CMS Beginnings
 2012-06-18 13:01:39 -07:00
Calen Pennington
34a696cdf6 Merge branch 'master' into cpennington/cms 
Conflicts:
	rakefile
	requirements.txt
 2012-06-18 13:46:33 -04:00
Calen Pennington
51cd7566a0 Merge pull request #119 from MITx/victor/render-path-cleanup 
put lambda function back in, as requested during code review
 2012-06-18 10:21:41 -07:00
Calen Pennington
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -04:00
Victor Shnayder
7e73f0ede0 put lambda function back in, as requested during code review 2012-06-18 13:12:47 -04:00
Calen Pennington
4ce08cc358 Merge pull request #118 from MITx/victor/render-path-cleanup 
Small cleanups in response to Calen + Piotr's comments
 2012-06-18 09:12:55 -07:00
Piotr Mitros
f391e9c51c Courseware can have same random seed in multiple problems for exam. Slight hack. 2012-06-18 12:10:44 -04:00
Victor Shnayder
96cbb3d33b Small cleanups in response to Calen + Piotr's comments 2012-06-18 12:04:10 -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
Calen Pennington
b344e51c0f Merge pull request #116 from MITx/victor/render-path-cleanup 
Victor/render path cleanup
 2012-06-18 08:59:10 -07:00
Victor Shnayder
e061e86424 Clean and refactor courseware/views.py and module_render.py 
* Refactor index() so that it makes sense to me and hopefully others :)
* Rename preloaded cache of student modules to student_module_cache
* Fix line length and whitespace throughout
* add docstrings and other comments
* a few behavior-preserving tweaks to the code to make it clearer.
* Separate codepaths for with-module and without-module in index view
* Remove default chapter + section, since they don't exist anyway in course.xml
 2012-06-15 18:29:04 -04:00
Victor Shnayder
5ad2824c59 fix typo in comment in student view 2012-06-15 18:28:54 -04:00
Prem Sichanugrist
01ca43346f Use existential operator 2012-06-14 12:16:29 -04:00
Kyle Fiedler
ed69957f62 Added volume images 2012-06-13 15:32:39 -04:00
Kyle Fiedler
b97f82df8f Added some styles to clean up volume slider 2012-06-13 15:32:38 -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
Victor Shnayder
c3a1d7788c clarify docstring for modx_dispatch 2012-06-13 10:18:54 -04:00
Victor Shnayder
9f38ccb65d add README.md for dogfood 2012-06-13 10:18:54 -04:00
Victor Shnayder
17af925a8a add function docs to module_render.py 2012-06-13 10:18:54 -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
Prem Sichanugrist
eb70ef4c07 Directly call toggleArrow in sequence render 
There might be a chance that an error got thrown after 'contentChanged'
event was fired and stop the `toggleArrow()` method to be called. This
will make sure that the navigation will still be working even some
element in the content is failed.
 2012-06-11 16:03:22 -04:00
Matthew Mongeau
d0819071c7 PROJECT_ROOT is needed for coffeescript paths 2012-06-11 13:57:37 -04:00
ichuang
628ca00252 fix dogfood -> use CorrectMap 2012-06-10 22:56:16 -04:00
ichuang
6f14acee9e add MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] flag to settings 2012-06-10 22:34:30 -04:00
ichuang
989a74ba3f django pipeline working now (with new pip -e git+git...) 2012-06-10 20:05:33 -04:00
ichuang
58e359e7ec problem.coffee change: show answer -> also show solution_* & do mathjax typeset 2012-06-10 20:04:30 -04:00
ichuang
46b45969d0 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-09 18:36:27 -04:00
Calen Pennington
dc85e46315 Allow login in the cms, and read a particular course from mongo 2012-06-08 16:55:38 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00
Calen Pennington
05436e591b Make mitxmako available to both the lms and the cms 2012-06-08 11:27:22 -04:00
Prem Sichanugrist
ac4f09ac4e Replace dynamite code with tested version 2012-06-08 11:16:03 -04:00
ichuang
9d0dfd2f02 fix dogfood wrt lms / xmodule reorg; fix textinput_dynamath call 2012-06-07 22:03:47 -04:00
David Ormsbee
bd2a44ade9 Merge pull request #90 from MITx/cpennington/capa_django_deps 
Removing references to django.conf.settings from capa/responsetypes.py
 2012-06-07 16:18:08 -07:00
David Ormsbee
2991eba1d5 Merge pull request #45 from MITx/problem_tests 
Problem testing utility, reducing courseware/capa dependencies on Django
 2012-06-07 16:16:39 -07:00