Rocky Duan
8228bebc2a
Merge branch 'master' of github.com:MITx/mitx
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/envs/common.py
2012-07-30 17:41:19 -04:00
Victor Shnayder
59defd33b6
Formatting and little bugfixes
...
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
2012-07-27 16:09:25 -04:00
Rocky Duan
7a53bc52ae
Merge branch 'master' of github.com:MITx/mitx
2012-07-27 12:30:54 -04:00
David Ormsbee
72341569f9
Remove sections from ever getting appended in the first place if hide_from_toc is true
2012-07-27 01:22:07 -04:00
David Ormsbee
2671801f93
Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation).
2012-07-26 14:55:42 -04:00
Rocky Duan
aab9f8dc1c
make course id available in xmodule
2012-07-25 18:15:52 -04:00
Rocky Duan
b2da6eef9f
provide user_id for xmodules
2012-07-25 18:15:52 -04:00
Calen Pennington
408726e678
Standardize how JS XModules are instantiated
2012-07-24 16:14:04 -04:00
Calen Pennington
0fcaa01484
Allow anonymous users to check problems, but don't save any instance state for them
2012-07-24 16:14:04 -04:00
Victor Shnayder
a8c70d3531
add todo
2012-07-24 16:14:02 -04:00
Calen Pennington
19a3c14ab9
Split out code to replace /static urls in get_html into a separate module so that it can be used in CMS previews
2012-07-24 16:14:01 -04:00
Calen Pennington
a81015a91b
Move I4xSystem into xmodule so that the definition is available to the CMS
2012-07-24 15:05:07 -04:00
Calen Pennington
1d1a9173a4
Cleaning up pep8 violations
2012-07-23 14:44:40 -04:00
kimth
8c327eb07f
Moved imports to top of file
2012-07-17 14:44:20 -04:00
kimth
803b0c4fd0
Callback uses userid rather than username
2012-07-17 10:59:27 -04:00
kimth
093ac9d101
CorrectMap in LMS keeps track of problems as being queued
2012-07-16 16:19:35 -04:00
kimth
6d3516a754
CodeResponse for queued code checking
2012-07-13 13:45:38 -04:00
Calen Pennington
c468d47aa2
Minor change in comment about module type/category
2012-07-11 22:19:34 -04:00
Calen Pennington
e39e454ff2
Correct comments for get_module
2012-07-11 22:19:34 -04:00
Calen Pennington
920c397292
Be more specific about what the random number generator seed is
2012-07-11 22:19:34 -04:00
Calen Pennington
6dd141247d
Fixing github_sync to work with multiple course data directories
2012-07-10 14:58:27 -04:00
Calen Pennington
fdd9663699
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/modulestore/xml.py
lms/djangoapps/courseware/views.py
lms/templates/index.html
lms/templates/info.html
lms/templates/main.html
lms/templates/navigation.html
requirements.txt
2012-07-10 13:39:19 -04:00
Calen Pennington
5406b9bb40
Make /static/ urls work in the courseware
2012-07-10 12:54:47 -04:00
Matthew Mongeau
1fcc02579d
Pass a course to get_section
2012-07-09 17:49:49 -04:00
ichuang
9b90068e03
Merge branch 'stable-edx4edx' of github.com:MITx/mitx
...
Conflicts:
common/lib/xmodule/seq_module.py
common/lib/xmodule/xmodule/capa_module.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/djangoapps/multicourse/multicourse_settings.py
2012-07-08 16:52:36 -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
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
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
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
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
Matthew Mongeau
b8d50e51ee
Course navigation work
2012-06-26 17:23:16 -04: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
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
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
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
Victor Shnayder
25ac073fb8
add function docs to module_render.py
2012-06-21 10:59:40 -04:00
