Commit Graph

112 Commits

Author SHA1 Message Date
Calen Pennington
6612beab46 Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again 2012-07-02 11:15:37 -04:00
Calen Pennington
79987666df Lazily load module definition and metadata as needed, rather than immediately 2012-07-02 10:50:27 -04:00
Calen Pennington
51a790173f Only set the default etree parser options in the module that is starting the xml parsing 2012-07-02 10:35:40 -04:00
Calen Pennington
b5cd01841c Merge remote-tracking branch 'origin/master' into cpennington/lms-descriptors
Conflicts:
	lms/djangoapps/courseware/grades.py
2012-07-02 10:31:26 -04:00
Calen Pennington
3cf29af8fe Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content 2012-07-02 10:17:59 -04:00
Calen Pennington
7ac8fecb38 Rename XModule[Descriptor].type to .category to be parallel to Location 2012-07-02 09:01:08 -04:00
Calen Pennington
87d80835c0 Initialize StudentModule with the max_score 2012-06-29 12:45:46 -04:00
Calen Pennington
f25478b3d4 Consolidate access to metadata, and allow some of it to be inherited between modules 2012-06-29 12:45:46 -04:00
Calen Pennington
2a9eba3886 Removing content_parser 2012-06-29 12:45:46 -04:00
Calen Pennington
c7f95695c5 Fix check_course command 2012-06-29 12:45:46 -04:00
Calen Pennington
3a26b98027 Remove errant print line left over from debugging 2012-06-29 12:45:18 -04:00
Calen Pennington
3fdae56a27 Remove dead code 2012-06-29 12:45:18 -04:00
Calen Pennington
d7ee03874d Make staff histograms work again 2012-06-29 12:45:18 -04:00
Calen Pennington
c837cf797d Remove some unused code from content_parser 2012-06-29 12:45:18 -04:00
Calen Pennington
506c281bcc Make gradesheet work again 2012-06-29 12:45:18 -04:00
Calen Pennington
35af8101d7 Make grade graph on profile work correctly 2012-06-29 12:45:18 -04:00
Calen Pennington
23195e9d76 Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken 2012-06-29 12:45:17 -04:00
Calen Pennington
7d16dbbcb4 Clean up module_render.py 2012-06-29 12:42:48 -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
Bridger Maxwell
cbe5c612b4 Used dictionary update for cleaner course settings code. 2012-06-28 14:04:50 -04:00
Bridger Maxwell
201f093981 Removed old import. 2012-06-28 12:34:45 -04:00
Bridger Maxwell
621680e340 Removed old global course settings file. 2012-06-28 12:31:29 -04:00
Bridger Maxwell
51d6b3f096 Changed course settings to be a json file. Moved it to its own file. 2012-06-28 12:04:03 -04:00
Calen Pennington
2fde7f4c6d Minor fixes from pull request 131 2012-06-28 08:39:12 -04:00
ichuang
6f5e54b9de Merge pull request #147 from MITx/ps-fix-problem
Queue up MathML conversion to be after render
2012-06-27 16:21:17 -07:00
Bridger Maxwell
bf4f946f0d Put in a fix for the Profile page (a bug was showing up for new users). A basecamp discussion will be started on the issue. 2012-06-27 14:47:16 -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
Kyle Fiedler
6c95bfc175 Fix hover on textbook buttons 2012-06-26 15:18:17 -04:00
Kyle Fiedler
fc81cf75c1 fixed padding issue on seq nav 2012-06-26 14:56:28 -04:00
David Ormsbee
084c4875be Merge pull request #144 from MITx/kf-seq-nav
Added new styles for the sequence nav including completeness
2012-06-26 11:34:54 -07:00
David Ormsbee
2ec12f59c7 Merge pull request #145 from MITx/kf-sidebar-buttons
Added fix for the sidebar buttons in the courseware
2012-06-26 11:34:36 -07:00
Kyle Fiedler
10c1270b8a Added fix for the sidebar buttons in the courseware 2012-06-26 14:31:04 -04:00
Kyle Fiedler
aee2cf4ed5 Added new styles for the sequence nav including completeness 2012-06-26 14:09:57 -04:00
Prem Sichanugrist
3f9554f20b Merge pull request #141 from MITx/ps-player-slider
Scroll the caption upon video seeking
2012-06-26 07:32:06 -07: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
Prem Sichanugrist
05f4e4fb38 Scroll the caption upon video seeking 2012-06-25 12:22:37 -04:00
Kyle Fiedler
9e8f20104c added styles for ol in html units 2012-06-22 11:17:31 -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
Kyle Fiedler
184d0ab038 added styles for lists and paragraphs in problems 2012-06-21 15:41:36 -04:00
Victor Shnayder
0f52b31ac1 Make the LMS check_course command work again. 2012-06-21 15:23:47 -04:00
Victor Shnayder
da204cf5d8 Started update of check_course script. It runs again now.
TODO:
  - support picking a different course name
  - make it use current module rendering path, get that working.
2012-06-21 11:48:19 -04:00
Victor Shnayder
98d513ac80 bugfix and added comments
* wasn't passing namespace properly in parse_course_file
2012-06-21 11:45:49 -04:00
Victor Shnayder
63b3999ef1 Big refactor of content_parser
* Separate out all xml processing code from django code
* Preparing to move the content parsing parts into common/lib/xmodule (?)
2012-06-20 19:16:55 -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
Victor Shnayder
85bee9b42b Initial UI for sequence progress.
* change bottom border of links:
  red for not started
  yellow for in_progress
  green for done

* This should probably be designed at some point.
* Obvious problems: the yellow is not very visible, and lots of people are
  red/green color-blind.
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