Matthew Mongeau
cfa389e357
Change url to use args instead of kwargs.
2012-07-09 18:33:51 -04:00
Matthew Mongeau
1fcc02579d
Pass a course to get_section
2012-07-09 17:49:49 -04:00
Matthew Mongeau
51c65e214a
Get initial courseware page displaying.
2012-07-09 15:01:10 -04:00
Matthew Mongeau
fe5fa7334b
Get textbook page rendering.
2012-07-09 14:23:45 -04:00
Matthew Mongeau
43e6bbb29f
Added info page content
2012-07-09 14:16:17 -04:00
Matthew Mongeau
c47cdc7f87
Fix some path problems.
2012-07-09 14:06:44 -04:00
Matthew Mongeau
3053caec7e
Get course about page working.
2012-07-09 13:48:18 -04:00
Matthew Mongeau
949efb62e9
Got courses page working... mostly.
2012-07-09 11:27:45 -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
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
Matthew Mongeau
3ae48d19b4
Passes course around for courseware. Fix static assets.
2012-07-03 12:13:15 -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
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
Matthew Mongeau
9d4043e40e
Redirect to dashboard when visiting the hoem page while signed in.
2012-06-29 13:38:28 -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
