Calen Pennington
7ac8fecb38
Rename XModule[Descriptor].type to .category to be parallel to Location
2012-07-02 09:01:08 -04:00
ichuang
b3cc34c3d4
add debugging to courseware debug (tricky with https behind gunicorn)
2012-07-01 13:16:09 -04:00
ichuang
23128ced67
courseware views now goes to default chapter and section if unprovided
...
- uses multicourse settings (default_chapter and default_section)
- it would be nice to use course_settings instead, but that is not
currently compatible with multicourse
2012-07-01 12:51:14 -04:00
ichuang
7e25e30ac1
Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx
2012-07-01 12:26:04 -04:00
ichuang
0f1ae7f03b
Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx
2012-06-29 16:22:49 -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
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
0c4b6f3065
Merge branch 'dormsbee/multicourse' into multicourse_wiki
2012-06-29 12:18:30 -04:00
Bridger Maxwell
b69deb698d
Got the view page of the wiki rendering. Most of it is a styling mess.
2012-06-29 12:05:55 -04:00
Matthew Mongeau
bd4a9471bf
Display enrollments on dashboard. Add reverse to navigation and footer links.
2012-06-29 11:25:16 -04:00
Bridger Maxwell
cbe5c612b4
Used dictionary update for cleaner course settings code.
2012-06-28 14:04:50 -04:00
Bridger Maxwell
3386031fea
Moved more pieces of the about page to live in the course data directory.
2012-06-28 12:58:04 -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
3f60c76fad
Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx
2012-06-27 19:14:32 -04:00
Bridger Maxwell
dfc2a35442
First pass at putting dyanamic content from data on course about page.
2012-06-27 18:31:39 -04: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
Matthew Mongeau
b8d50e51ee
Course navigation work
2012-06-26 17:23:16 -04:00
ichuang
caa14922bb
edx4edx configuration running on content server. Notes:
...
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
- email backend set
- index page modified for edx4edx
2012-06-26 14:04:56 +00:00
ichuang
b59b80871a
add edit link to module pages with filenames (html & problem)
...
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
2012-06-24 14:46:02 -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
David Ormsbee
3f1c2e2aba
add corresponding view to new courseware url route :-P
2012-06-21 10:59:48 -04:00
David Ormsbee
bc8c077379
Add info page support with multiple courses
2012-06-21 10:59:48 -04:00
David Ormsbee
3859c2be19
Add scanning of data directory for courses.
...
These are then displayed at /courses.
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
91befca89c
Fix render of lms index with no chapter or section.
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
e6250f8114
remove obsolete comment
2012-06-21 10:59:47 -04:00
Victor Shnayder
762132b18c
Fix accordion rendering bug
...
* needed to clean the chapter and section vars before rendering
2012-06-21 10:59:46 -04:00
Victor Shnayder
d7a8679aae
put lambda function back in, as requested during code review
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
Victor Shnayder
6003fee9f9
Small cleanups in response to Calen + Piotr's comments
2012-06-21 10:59:43 -04:00
Victor Shnayder
b5536d98d7
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-21 10:59:43 -04:00
Victor Shnayder
792443ca80
clarify docstring for modx_dispatch
2012-06-21 10:59:40 -04:00
