Matthew Mongeau
83fdeea2bc
Hookup the CourseDescriptor stuff by fixing a fewt push -f dorm issues.
2012-07-06 18:23:22 -04:00
Matthew Mongeau
5109253378
Revert "workarounds for get_about_section"
...
This reverts commit 05e1bcf4f1
2012-07-06 17:23:56 -04:00
Matthew Mongeau
05e1bcf4f1
workarounds for get_about_section
2012-07-06 17:13:53 -04:00
Matthew Mongeau
7979248b4a
Courses on homepage and courses page should iterate over the context courses.
2012-07-06 10:57:30 -04:00
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
Galen Frechette
42c1695382
refines some visual design to course objects, changes university logos on homepage, starts adding about pages and layout
2012-07-05 17:59:22 -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
Calen Pennington
87e612f0f2
Don't swallow messages going to the root logger
2012-07-05 08:48:08 -04:00
Galen Frechette
733bb455f0
minor fixes to dashboard and typography, adds layout to jobs page
2012-07-03 18:25:51 -04:00
Kyle Fiedler
841fb8da0b
Added the wip calss back in
2012-07-03 16:26:56 -04:00
Kyle Fiedler
ffea8e3e7d
added more style for unit page, hovers, and buttons
2012-07-03 16:19:19 -04:00
Kyle Fiedler
20df117bfc
Added style for the calendar view and section view
2012-07-03 16:19:19 -04:00
Kyle Fiedler
3415e48be5
Added bug fix for speed selector
2012-07-03 16:03:29 -04:00
Matthew Mongeau
38239c73ab
Hook enroll back up.
2012-07-03 15:10:26 -04:00
Prem Sichanugrist
28cc64b9b1
Remove unused lms/problem.js
2012-07-03 15:00:41 -04:00
Prem Sichanugrist
cec1b23d7d
Remove mystery guest from the test
2012-07-03 14:53:57 -04:00
Prem Sichanugrist
0815f3498a
Cleanup Video Logger, update logging message
2012-07-03 14:35:40 -04:00
Prem Sichanugrist
8fb06ce194
Update code according to changes in 829e502
2012-07-03 14:33:24 -04:00
Prem Sichanugrist
de4d487402
Fix failing tests after jQuery upgrade
2012-07-03 14:33:23 -04:00
Prem Sichanugrist
e7e0fe1f3d
Fix element naming convention
2012-07-03 14:33:23 -04:00
Prem Sichanugrist
4e183dd6e1
Clean up events binding in Video Player
...
* Video Player now acting as a parent that always knowing the state of
their children.
* Events on the sub-controls are now triggered on itself, and binded by
the Video Player instead of triggering everything on the Video Player.
* A new helper class, SubView, has been introduced to cleanup repeat
logic on scoped jQuery selector, render() and bind()
2012-07-03 14:33:23 -04:00
Calen Pennington
207777fbe1
Fix up problem display to use the new metadata that's available
2012-07-03 14:20:11 -04:00
Calen Pennington
42cef5b788
Get rid of references to self.filename in capa_module, as it no longer exists
2012-07-03 14:19:51 -04:00
Matthew Mongeau
3ae48d19b4
Passes course around for courseware. Fix static assets.
2012-07-03 12:13:15 -04:00
Calen Pennington
68c155b268
Don't use __dict__ for namedtuples, because it doesn't work in python 2.7.1
2012-07-03 09:57:51 -04:00
Calen Pennington
92ea15b786
Merge pull request #155 from MITx/cpennington/cms-xml-export
...
This allows XModuleDescriptors to export themselves to XML
2012-07-02 17:08:36 -07:00
Calen Pennington
64a4a62cf5
Don't pass fileobjects to LoncapaProblem
2012-07-02 20:01:20 -04:00
Calen Pennington
3355f804d1
Add logging of filename when module file parsing fails
2012-07-02 20:01:01 -04:00
Calen Pennington
e172be3a26
Make XML import pass in an empty render_template function
2012-07-02 19:55:42 -04:00
Galen Frechette
506ee58b61
fixes template paths in course_about.html
2012-07-02 15:45:05 -04:00
Galen Frechette
c4bdfd9d6a
wip course info/profile page
2012-07-02 15:39:19 -04:00
Galen Frechette
11bf79a52e
cleans up course info/profile page
2012-07-02 15:38:21 -04:00
Galen Frechette
909f78c8ef
cleans up course info/profile page
2012-07-02 14:26:11 -04:00
Galen Frechette
4359a2544e
wip course info/profile page
2012-07-02 14:23:14 -04:00
Galen Frechette
e0f01aa828
cleans up course info/profile page
2012-07-02 14:11:25 -04:00
Calen Pennington
3b4fb61648
Push dependency on mitxmako up out of mako_module
2012-07-02 14:10:29 -04:00
ichuang
1509cdcced
Merge pull request #153 from MITx/cpennington/lms-descriptors
...
These changes make the LMS read from the XML course files using the ModuleStore interface.
Note that stable-edx4edx will now no longer be a clean merge. But this code has priority.
2012-07-02 10:52:22 -07:00
Calen Pennington
d7178e4a41
Add a set of rake tasks for checking settings importability
2012-07-02 13:26:31 -04:00
Calen Pennington
e56f8763ac
Point to the js files in package data
2012-07-02 13:26:14 -04:00
Calen Pennington
a0f550396c
Make xmodule fit the typical python installation setup
2012-07-02 13:19:27 -04:00
Calen Pennington
cc8ecb1891
Make xmodule tests pass again
2012-07-02 12:50:03 -04:00
Calen Pennington
8f59521660
Add a function to check round-trip export/import cycles
2012-07-02 12:25:48 -04:00
Calen Pennington
be40d8bb69
Make sure that xml_module definition xml doesn't have any metadata sprinkled in with it
2012-07-02 12:25:09 -04:00
Calen Pennington
c57833dab7
Define equality for XModuleDescriptors
2012-07-02 12:24:39 -04:00
Calen Pennington
f035d5602d
Keep abtest children in a consistent order (makes testing easier)
2012-07-02 12:24:07 -04:00
Calen Pennington
3a348e5713
Adjust xml export code for the type -> category conversion
2012-07-02 11:25:42 -04:00
Calen Pennington
d7dbced8e6
Store the top level course in the XMLModuleStore (since there is only one course per module store
2012-07-02 11:25:21 -04:00
Calen Pennington
85f294b3e3
Allow for no default_class in XMLModuleStore
2012-07-02 11:21:40 -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
