Commit Graph

5315 Commits

Author SHA1 Message Date
Galen Frechette
b833f52d9c adds autoplaying to modal videos when opened, stops video playback when modal closes 2012-07-13 13:57:50 -04:00
Galen Frechette
cd345ae3bb converts modals to use jquery leanModal 2012-07-13 13:57:50 -04:00
Galen Frechette
3fca8a9dd0 cleans up rss feed on home page, still wip 2012-07-13 13:57:34 -04:00
Galen Frechette
296ae34e34 wip news feed on home page 2012-07-13 13:57:25 -04:00
Galen Frechette
35c5de8128 cleans up home page header design, adds social sharing to header, adds tos, privacy policy, honor code, help and copyright pages, add liks to those pages in footer, finished contact page 2012-07-13 13:57:02 -04:00
Galen Frechette
1ea8bd2666 imporves visual design of course info/profile page 2012-07-13 13:56:44 -04:00
Galen Frechette
8a5e3bf4d2 adds pressrelease page, breaks about content into seperate pages, imporvoves some visual elements of about and jobs pages 2012-07-13 13:56:14 -04:00
Calen Pennington
305cd30da9 The path user by url is based on the output css file, which ends up in static/sass, so only use ../, rather than ../../, to reference images 2012-07-12 16:03:12 -04:00
bridger
28007b280c Merge pull request #168 from MITx/multicourse_wiki
Multicourse wiki
2012-07-12 07:35:17 -07:00
Bridger Maxwell
5bf6c73259 Merge with master. 2012-07-11 15:26:26 -04:00
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
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
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
Bridger Maxwell
e122583440 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-03 09:59:37 -07:00
Bridger Maxwell
064274a756 Most of the wiki pages are now loading without errors. 2012-07-03 09:50:58 -07: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