Bridger Maxwell
631cc8e874
Merge branch 'dormsbee/multicourse' into multicourse_wiki
2012-07-09 14:28:43 -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
Kyle Fiedler
82c68dd845
Removed table borders and declared inputs as inline instead of inline-block
2012-07-05 10:01:02 -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
Bridger Maxwell
c6d973bda9
Fixed the markdown extensions to work with wiki namespaces.
2012-07-03 12:40:39 -07: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
Matthew Mongeau
3ae48d19b4
Passes course around for courseware. Fix static assets.
2012-07-03 12:13:15 -04:00
Galen Frechette
c4bdfd9d6a
wip course info/profile page
2012-07-02 15:39:19 -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
Galen Frechette
38425e9b9c
adds styles back to courseware
2012-06-27 15:55:22 -04:00
Galen Frechette
4715c69c36
redesigns course item on home page and find courses page, refactors its implimentation and makes vrious other design improvements
2012-06-26 23:26:12 -04:00
Kyle Fiedler
6c95bfc175
Fix hover on textbook buttons
2012-06-26 15:18:17 -04:00
Kyle Fiedler
fc81cf75c1
fixed padding issue on seq nav
2012-06-26 14:56:28 -04:00
David Ormsbee
084c4875be
Merge pull request #144 from MITx/kf-seq-nav
...
Added new styles for the sequence nav including completeness
2012-06-26 11:34:54 -07:00
David Ormsbee
2ec12f59c7
Merge pull request #145 from MITx/kf-sidebar-buttons
...
Added fix for the sidebar buttons in the courseware
2012-06-26 11:34:36 -07:00
Kyle Fiedler
10c1270b8a
Added fix for the sidebar buttons in the courseware
2012-06-26 14:31:04 -04:00
Kyle Fiedler
aee2cf4ed5
Added new styles for the sequence nav including completeness
2012-06-26 14:09:57 -04:00
Galen Frechette
a63a93873f
various ui tweeks
2012-06-25 17:47:36 -04:00
Galen Frechette
915810d457
cleans up alignment of login and signup modals
2012-06-25 14:18:01 -04:00
Galen Frechette
1d7b30159b
adds signup modal
2012-06-25 13:53:10 -04:00
Kyle Fiedler
9e8f20104c
added styles for ol in html units
2012-06-22 11:17:31 -04:00
Galen Frechette
cd8051fb14
cleans up signed in users navigation
2012-06-21 17:51:37 -04:00
Kyle Fiedler
82023f6bd3
Added styles for more basic html elements and reworked design of textinput
2012-06-21 15:41:36 -04:00
Kyle Fiedler
184d0ab038
added styles for lists and paragraphs in problems
2012-06-21 15:41:36 -04:00
Galen Frechette
9bcdcec6ae
adds about and jobs pages, cleans up header and login modal
2012-06-21 14:47:04 -04:00
Galen Frechette
78b0e86334
cleans up login modal and adds js for toggling login modal
2012-06-20 18:37:07 -04:00
Galen Frechette
ec1510ca52
adds login modal
2012-06-20 16:20:31 -04:00
Victor Shnayder
85bee9b42b
Initial UI for sequence progress.
...
* change bottom border of links:
red for not started
yellow for in_progress
green for done
* This should probably be designed at some point.
* Obvious problems: the yellow is not very visible, and lots of people are
red/green color-blind.
2012-06-20 16:04:03 -04:00
Galen Frechette
94886643b0
gets app completly uptodate with prototype
2012-06-20 14:37:37 -04:00
Matthew Mongeau
86826f8688
Integrate more pages.
2012-06-14 11:27:47 -04:00
Kyle Fiedler
b97f82df8f
Added some styles to clean up volume slider
2012-06-13 15:32:38 -04:00
Prem Sichanugrist
7924e5c8f5
Add video volume control to video player
2012-06-13 15:32:38 -04:00
Matthew Mongeau
47126dc686
wip
2012-06-13 14:50:25 -04:00
Calen Pennington
5ba03130aa
Moving LMS code into subdirectory
2012-06-06 14:09:01 -04:00
