Commit Graph

2310 Commits

Author SHA1 Message Date
Kyle Fiedler
f9bb8a701a Added new readme info and started to rework some of the css 2012-06-22 09:42:22 -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
Kyle Fiedler
657fcd9984 Added new styles for html editing and removed a bunch of unused templates 2012-06-21 17:36:21 -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
Calen Pennington
1b7b7e91e4 Merge branch 'master' into cpennington/cms-editing 2012-06-20 15:07:15 -04:00
Calen Pennington
215085345c Fix other references to jquery after update to latest version 2012-06-20 15:06:49 -04:00
Calen Pennington
6ce68e19db Make cms start on a different port by default 2012-06-20 11:58:13 -04:00
Kyle Fiedler
28b570cf79 Added body class for layout 2012-06-20 11:39:55 -04:00
Calen Pennington
649b9bd92d Merge pull request #127 from MITx/victor/fix_accordion_again
Fix render of lms index with no chapter or section.
2012-06-20 08:37:25 -07:00
Victor Shnayder
b24c4d4626 Fix render of lms index with no chapter or section. 2012-06-20 11:31:21 -04:00
Calen Pennington
1853b99861 Work in progress editing. Committing to allow kfiedler to work in parallel 2012-06-20 11:14:25 -04:00
Calen Pennington
e9d5f85745 Merge pull request #115 from MITx/capa-include
modify capa_problem to add <include file="foo"> functionality
2012-06-20 07:34:19 -07:00
Calen Pennington
c317521468 Merge pull request #126 from MITx/victor/progress-tracking
Victor/progress tracking
2012-06-20 07:33:48 -07:00
Victor Shnayder
e872f31835 minor edits to address Calen's comments. 2012-06-20 10:31:37 -04: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
Calen Pennington
0ace2ee364 Merge pull request #122 from MITx/cpennington/cms-review-cleanup
Cleanup from https://github.com/MITx/mitx/pull/120
2012-06-20 05:34:36 -07:00
Calen Pennington
ed6a658afe Add note about optional revision in location 2012-06-20 08:33:46 -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
Victor Shnayder
a126935369 Add Progress class and tests 2012-06-19 18:25:13 -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
Calen Pennington
8e05116d02 Merge pull request #123 from MITx/ps-update-jquery
Update jQuery and jQuery-UI to latest version
2012-06-19 11:36:08 -07:00
Prem Sichanugrist
afaed83158 Update jQuery and jQuery-UI to latest version 2012-06-19 14:31:00 -04:00
Calen Pennington
e865b97269 Rename test directory for consistancy 2012-06-19 14:30:19 -04:00
Calen Pennington
cc22125971 Remove old pre-compiled css 2012-06-19 14:30:19 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
282372736d Add comment about None in Locations 2012-06-19 14:24:14 -04:00
Calen Pennington
47bf71ae10 Remove extra word in doc string 2012-06-19 14:17:05 -04:00
Calen Pennington
b91a1d48b6 Remove reference to instructor module 2012-06-19 11:44:54 -04:00
Calen Pennington
7914baccaa Change name of XModuleSystem to DescriptorSystem at usage sites 2012-06-19 11:36:22 -04:00
Calen Pennington
6fb35c4773 Cleanup intertwined descriptor and keystore code 2012-06-19 11:31:13 -04:00
Calen Pennington
5562def5b7 Add documentation of mongo query syntax usage 2012-06-19 11:29:48 -04:00
Calen Pennington
677c25ee68 Remove unused code 2012-06-19 11:29:14 -04:00
Calen Pennington
58085f8ed9 Remove unused urls 2012-06-19 11:29:14 -04:00
Calen Pennington
6daa0f1aa0 Fix string layout for readability 2012-06-19 11:29:14 -04:00
Calen Pennington
f1ffff1dc0 Cleanup and test Location, and add the ability to specify a revision 2012-06-19 11:29:13 -04:00
Calen Pennington
703103e767 Get rid of references to askbot 2012-06-19 11:25:41 -04:00
Calen Pennington
0379d1cb95 Search for course specifically in navigation view 2012-06-19 11:25:29 -04:00
Calen Pennington
199f94aa99 Conform to new TODO standards 2012-06-19 11:24:22 -04:00
Calen Pennington
fb0deb9971 Merge pull request #121 from MITx/pmitros/documentation
Rapid merge procedure
2012-06-19 08:01:53 -07:00
Piotr Mitros
25834412ce Documentation for rapid merge 2012-06-18 17:40:39 -04:00
Piotr Mitros
e108c2cd44 Rapid pull/history 2012-06-18 17:09:17 -04:00
Piotr Mitros
7700a9d082 Merge branch 'master' into pmitros/documentation 2012-06-18 17:06:35 -04:00
Piotr Mitros
8bad7dc99d Code standards 2012-06-18 17:06:17 -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
605b1ae0fd Remove old template that is no longer relevant 2012-06-18 14:24:45 -04:00
Calen Pennington
9ff0effd71 Remove copy/paste instructor module. It was a bad idea anyway. =) 2012-06-18 14:08:15 -04:00
Calen Pennington
f8434b3a6d Move libraries that can only be imported in the context of django into common/djangoapps 2012-06-18 13:48:26 -04:00