Commit Graph

101 Commits

Author SHA1 Message Date
John Jarvis
a21d37e23b adding html5shiv.js to static/js 2012-07-11 15:26:18 -04:00
Calen Pennington
100422a7f3 Make collectstatic run to completion 2012-07-11 10:14:51 -04:00
Calen Pennington
2d56a21f92 Removing old js files that used to be used by the LMS 2012-07-11 08:53:57 -04:00
Galen Frechette
7a5d645b9f removes user avatar, imporves dashboard design 2012-07-10 19:59:51 -04:00
Galen Frechette
7f4de5df30 simplifies jobs page 2012-07-10 19:59:51 -04:00
Galen Frechette
597c1db585 updates basic html structure and base color 2012-07-10 19:59:51 -04:00
Galen Frechette
d8d3eb144c type tweeks in modals 2012-07-10 19:59:51 -04:00
Galen Frechette
8faa539a1a makes some tweeks to global nav style, home page header and font styles 2012-07-10 19:59:51 -04:00
Galen Frechette
f7a1873aee adds banner images to and refines header on find courses pages, various visual tweeks and imporvements 2012-07-10 19:59:50 -04:00
Galen Frechette
1be9196d3c wip header, wip header refactoring, improves course object visual design, improves footer 2012-07-10 19:59:50 -04:00
David Ormsbee
897a89c5ca remove out of repo symlinks from static 2012-07-10 18:39:06 -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
c4ebfe1bd4 Actually add the schematic.js file used in the main.html template 2012-07-10 12:58:25 -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
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
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
Calen Pennington
c140fe8766 Get problem execution working with problems read from keystore 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
cddf4cf6cf Wip on sign up form. 2012-06-28 15:38:39 -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
Prem Sichanugrist
4db0a70166 Fix code convention 2012-06-26 16:35:44 -04:00
Prem Sichanugrist
4580ef89d4 Queue up MathML conversion to be after render
From https://www.pivotaltracker.com/story/show/31700967
Fixes #137
2012-06-26 16:35:44 -04:00
Prem Sichanugrist
7475e415a4 Fix test failure after progress introduction 2012-06-26 16:35:44 -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
Prem Sichanugrist
3f9554f20b Merge pull request #141 from MITx/ps-player-slider
Scroll the caption upon video seeking
2012-06-26 07:32:06 -07: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
Prem Sichanugrist
05f4e4fb38 Scroll the caption upon video seeking 2012-06-25 12:22:37 -04:00