Calen Pennington
d02abac820
Restrict the set of characters allowed in locations further
2012-06-29 12:38:10 -04:00
Calen Pennington
feef179e3e
Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing
...
Conflicts:
cms/envs/common.py
2012-06-29 12:11:35 -04:00
Calen Pennington
2fde7f4c6d
Minor fixes from pull request 131
2012-06-28 08:39:12 -04:00
ichuang
3f60c76fad
Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx
2012-06-27 19:14:32 -04:00
Calen Pennington
9983160995
Parse more module types as sequence modules
2012-06-26 14:29:30 -04:00
Calen Pennington
66ca31947a
Remove semantically meaningless sections from course.xml by moving their attributes onto the contained element. If there is more than one contained element, turn the section into a sequence. Also handles includes
2012-06-26 14:10:15 -04:00
Calen Pennington
f0cf323488
Handle chapters as sequence modules
2012-06-26 12:15:03 -04:00
Calen Pennington
e9a00ffc5a
Parse XModuleDescriptors on import using from_xml
...
Also:
Render all XModuleDescriptors in the cms the same way
Default them to editing raw xml, if there is no specific module for them
2012-06-26 11:56:21 -04:00
ichuang
a988452d4d
Merge pull request #132 from MITx/kf-problems
...
I'll go ahead and merge this, since it fixes nearly all the issues we had with problem and html css, and this should go in before more changes. The table borders can be fixed in another round.
2012-06-25 19:14:12 -07:00
ichuang
9cea3f971f
improved error handling - catch errors around lcp.get_html()
2012-06-24 12:40:56 -04:00
ichuang
7814805c1a
improve capa error handling a bit - for better user experience
...
- if no answer given, then symbolicresponse + customrepsonse now
give an error message, instead of doing nothing
- in capa_module if lcp.grade_answers fails, in DEBUG mode display
alert with useful error message
2012-06-23 16:23:27 -04:00
David Ormsbee
f041fc4a0b
Merge pull request #135 from MITx/cpennington/cms-editing
...
Roundtrip HTML module editing working in the CMS
2012-06-22 10:06:51 -07:00
Calen Pennington
ced9136973
Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing
2012-06-22 11:40:19 -04:00
Calen Pennington
72eef72d8b
Html Module can now be editing, saved, and re-opened
2012-06-22 10:58:18 -04:00
Calen Pennington
5bef1e14b2
Split problem metadata out from problem editing contents when rendering
2012-06-22 09:21:09 -04:00
Calen Pennington
17a4d7fd09
Call js module name dynamically, rather than statically calling the HTML module
2012-06-22 08:59:53 -04:00
ichuang
3cd02f6edc
Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx
2012-06-21 21:31:36 -04:00
ichuang
93b8ad3e4d
Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx
2012-06-21 16:46:56 -04:00
Kyle Fiedler
82023f6bd3
Added styles for more basic html elements and reworked design of textinput
2012-06-21 15:41:36 -04:00
Calen Pennington
69290c18c3
Live editing of html modules implemented, but no saving to the backend
2012-06-21 15:33:52 -04:00
Victor Shnayder
bf8e70f94e
check whether requestcontext exists before access
2012-06-21 11:28:02 -04:00
Victor Shnayder
cf2c5cba4f
bugfix: lcp score can apparently be 0/0
2012-06-21 10:59:48 -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
Victor Shnayder
13f24f4b02
Add scaffolding comments for progress tracking in video modules.
2012-06-21 10:59:47 -04:00
Victor Shnayder
cc8ebf3b08
minor edits to address Calen's comments.
2012-06-21 10:59:47 -04:00
Calen Pennington
8a48aaac03
Add note about optional revision in location
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
Victor Shnayder
fd48e49ae5
Add Progress class and tests
2012-06-21 10:59:47 -04:00
Calen Pennington
18b2a9dfe9
Rename test directory for consistancy
2012-06-21 10:59:46 -04:00
Calen Pennington
4ddf48e1b2
Add comment about None in Locations
2012-06-21 10:59:46 -04:00
Calen Pennington
1cca7948b6
Remove extra word in doc string
2012-06-21 10:59:46 -04:00
Calen Pennington
b2f23181aa
Change name of XModuleSystem to DescriptorSystem at usage sites
2012-06-21 10:59:46 -04:00
Calen Pennington
82898978fa
Cleanup intertwined descriptor and keystore code
2012-06-21 10:59:46 -04:00
Calen Pennington
e0ffd36ac4
Add documentation of mongo query syntax usage
2012-06-21 10:59:45 -04:00
Calen Pennington
369a11c43e
Remove unused code
2012-06-21 10:59:45 -04:00
Calen Pennington
3096c20e11
Cleanup and test Location, and add the ability to specify a revision
2012-06-21 10:59:45 -04:00
Calen Pennington
5878cb443d
Move libraries that can only be imported in the context of django into common/djangoapps
2012-06-21 10:59:44 -04:00
Calen Pennington
898e417f0b
Delay initializition of the MongoKeyStore until required
2012-06-21 10:59:44 -04:00
Calen Pennington
b6514fa5eb
Make tests pass when running on cms
2012-06-21 10:59:44 -04:00
Piotr Mitros
8516d631dc
Courseware can have same random seed in multiple problems for exam. Slight hack.
2012-06-21 10:59:43 -04:00
Calen Pennington
da71515bfa
Add categories and XModuleDescriptors for all module types that are used at the top level of a course
2012-06-21 10:59:43 -04:00
Calen Pennington
bb2910fce5
Read week headings from mongodb
2012-06-21 10:59:43 -04:00
ichuang
31871a0548
modify capa_problem to add <include file="foo"> functionality
2012-06-21 10:59:43 -04:00
Victor Shnayder
866c6a6a9e
add comment/explanation to eia.py
2012-06-21 10:59:40 -04:00
Victor Shnayder
807256f05f
added TODO comment
2012-06-21 10:59:40 -04:00
ichuang
6572a542e5
typo in correctmap
2012-06-21 10:59:39 -04:00
ichuang
6f35f4887f
private methods start with _ (in capa_problem)
2012-06-21 10:59:39 -04:00
ichuang
929bfc4085
capa_problem log.error + raise -> log.debug + # FIXME
2012-06-21 10:59:39 -04:00
ichuang
071170072a
util: tol.endswith
2012-06-21 10:59:39 -04:00
ichuang
0995116a83
responsetypes - minor edits
2012-06-21 10:59:39 -04:00
