Calen Pennington
a1f98e76cd
WIP: Merging multicourse and xmodule descriptor changes
...
The basic form has been fleshed out. Things still to do:
1) Extend get_course interface to the rest of modulestore
2) Make courses actually load
3) Make org/course/maybe others metadata attributes for course_module (see xml_module), so
that they are loaded/saved on import/export to xml
2012-07-05 21:56:52 -04:00
Matthew Mongeau
e729cc321a
Fix url confusion for course/info and course/about
2012-07-05 17:10:52 -04:00
Calen Pennington
9d1dc37b44
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
...
Conflicts:
cms/djangoapps/contentstore/management/commands/import.py
cms/djangoapps/contentstore/views.py
cms/envs/common.py
cms/envs/dev.py
cms/envs/test.py
cms/static/sass/README.txt
cms/static/sass/_base.scss
cms/static/sass/_calendar.scss
cms/static/sass/base-style.scss
cms/templates/base.html
cms/templates/index.html
cms/templates/widgets/header.html
cms/templates/widgets/module-dropdown.html
cms/templates/widgets/navigation.html
cms/templates/widgets/problem-edit.html
cms/urls.py
common/djangoapps/pipeline_mako/__init__.py
common/djangoapps/util/views.py
common/lib/capa/capa_problem.py
common/lib/capa/templates/textinput_dynamath.html
common/lib/mitxmako/middleware.py
common/lib/mitxmako/shortcuts.py
common/lib/mitxmako/template.py
common/lib/xmodule/capa_module.py
common/lib/xmodule/seq_module.py
common/lib/xmodule/setup.py
common/lib/xmodule/test_files/symbolicresponse.xml
common/lib/xmodule/test_files/test_files/symbolicresponse.xml
common/lib/xmodule/tests/__init__.py
common/lib/xmodule/tests/test_files/symbolicresponse.xml
common/lib/xmodule/vertical_module.py
common/lib/xmodule/video_module.py
common/lib/xmodule/x_module.py
lms/djangoapps/courseware/content_parser.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/static/coffee/spec/helper.coffee
lms/static/coffee/spec/modules/video/video_player_spec.coffee
lms/static/coffee/spec/modules/video/video_volume_control_spec.coffee
lms/static/coffee/src/modules/problem.coffee
lms/static/coffee/src/modules/sequence.coffee
lms/static/coffee/src/modules/video/video_player.coffee
lms/static/coffee/src/modules/video/video_volume_control.coffee
lms/static/js/vendor/jquery-1.6.2.min.js
lms/static/js/vendor/jquery-ui-1.8.16.custom.min.js
lms/static/sass/application.scss
lms/static/sass/courseware/_sequence-nav.scss
lms/static/sass/courseware/_video.scss
lms/templates/main.html
lms/urls.py
rakefile
requirements.txt
2012-07-05 16:22:50 -04:00
Matthew Mongeau
3ae48d19b4
Passes course around for courseware. Fix static assets.
2012-07-03 12:13:15 -04:00
ichuang
63aa451d67
use course = settings.COURSE_DEFAULT.replace('_',' ') for default accordion
2012-07-02 11:29:45 -04:00
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
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
