Commit Graph

162 Commits

Author SHA1 Message Date
Prem Sichanugrist
fe849dedd9 Do not display play/pause button on iOS Device
iOS devices has a restriction that user has to click on the video
element to initiate playback. By visually disable the button, user will
be forced to click on the video itself, and everything will be worked as
expected.

Fixes https://www.pivotaltracker.com/story/show/30334381
2012-06-04 15:30:55 -04:00
Piotr Mitros
16f0da19b0 Merge branch 'master' into pmitros/dexml 2012-06-01 16:00:48 -04:00
Calen Pennington
0cb316353d Merge pull request #79 from MITx/ps-fix-page-jumping
Fix page jumping bug when click on the speeds list
2012-06-01 12:46:56 -07:00
Calen Pennington
83b0c84e45 Merge pull request #78 from MITx/ps-fix-youtube-click
Trigger a pause event when user click Youtube logo
2012-06-01 12:46:23 -07:00
Prem Sichanugrist
d7043ea27f Fix page jumping bug when click on the speeds list 2012-06-01 13:36:14 -04:00
Prem Sichanugrist
bb18c854f7 Trigger a pause event when user click Youtube logo
This will make sure that the play button is in the paused state.

Fixes https://www.pivotaltracker.com/story/show/26236143
2012-06-01 13:33:27 -04:00
Piotr Mitros
be1e308dc9 Cale's fix for eval/extra json encode 2012-06-01 12:56:20 -04:00
Prem Sichanugrist
d20147932e Fix problem with sequence navigation on iOS
* Add `touch-based-device` class to the <body> when running on iOS.
* Do not show the tooltip if we're on the iOS.
2012-06-01 12:06:31 -04:00
Prem Sichanugrist
92971127b3 Minor code style and assets fix
* Change looping code style in seq_module
* Clone and keep the latest version of jasmine-jquery locally
* Use django-pipeline asset tags
2012-05-31 13:24:25 -04:00
Prem Sichanugrist
0baa6293b5 Fix some failing spec after sequence module change 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
6d83534863 Fix bug on flashing speed selector 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
89194892e6 Move CoffeeScripts to asset pipeline 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
60094a1772 Add test coverage for JavaScript 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
8a87a4ba8b Make staff problem histogram work again 2012-05-31 13:24:25 -04:00
Prem Sichanugrist
fc4d4c8295 Fix section convention and code highlight 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
2bc68c0f25 Add path prefix to all AJAX requests
This will handle the case where the site was deployed under a
path prefix.
2012-05-31 13:24:24 -04:00
Prem Sichanugrist
59b453488a Rewrite Tab module, refactor Sequence module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
1abe15d4d9 Rewrite Problem module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
8e7bf4c182 Fix broken test case 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
823843cd2f Make sure video is working in sequence module 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
b0149541a3 Preserve window.postJSON for now 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
dfb05bbb01 Refactor and removed unused code 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
80c97c6592 Refactor module loading using class detection 2012-05-31 13:24:23 -04:00
Prem Sichanugrist
8624927fc4 Rewritten video module 2012-05-31 13:24:23 -04:00
Calen Pennington
8a89309338 Merge branch 'master' into asset-pipeline
Conflicts:
	static/js/application.js
2012-05-21 14:53:16 -04:00
Edward Loveall
4b842e7ac8 Adds ARIA labels to page elements
This includes calculator open/close button, navigation, profile, and
book's table of content.
2012-05-21 11:23:55 -04:00
Calen Pennington
d2ec58c06e Don't pipeline in dev environment, which means that there is no need to run collectstatic either. Hooray\! 2012-05-18 15:37:57 -04:00
Calen Pennington
6b15303d89 Make collectstatic compile .coffee files, and preserve the askbot workflow using guard 2012-05-18 15:10:10 -04:00
Kyle Fiedler
ba8fb95d72 added fix for lists in updates 2012-05-17 16:55:44 -04:00
Calen Pennington
bc823d3bfe Merge branch 'master' into asset-pipeline
Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss
2012-05-17 16:32:39 -04:00
Prem Sichanugrist
5c82af3a5c Update files after use guard to compile sources 2012-05-17 15:41:47 -04:00
Galen Frechette
cb8224cbcd cleans up visual style of accordion and sidebar links and fixes border alignment issues 2012-05-17 11:47:28 -04:00
Galen Frechette
2bb7a77d01 changes the border and box-shadow of headings in courseware content so bottom border is not hidden 2012-05-17 09:08:51 -04:00
Galen Frechette
1652ec38de changes text color of highlited section in courseware index from red to black 2012-05-17 09:06:16 -04:00
Galen Frechette
2d7e36b409 improves communication of current selection in the courseware index sidebar 2012-05-17 09:06:16 -04:00
Galen Frechette
2b4437c951 handles the case of no title or sub title in the courseware index links 2012-05-17 09:06:16 -04:00
Galen Frechette
12eb7cf6f3 wip more defined week headings 2012-05-17 09:06:15 -04:00
Galen Frechette
825cf0e03e wip better communication of current page in course ware 2012-05-17 09:06:15 -04:00
Kyle Fiedler
e45eb9fbe1 minor fixes for IE bugs 2012-05-16 17:16:40 -04:00
Edward Loveall
5148746d0a Fixes border radius overflow issue on course content wrapper 2012-05-16 14:48:53 -04:00
Kyle Fiedler
b17d83a459 Cleaned up unused functions now in bourbon and unused variables 2012-05-16 10:45:31 -04:00
Kyle Fiedler
60bd63a594 Removed print.scss, moved index to marketing, started to alphabatize 2012-05-15 16:55:53 -04:00
Galen Frechette
d0a7326738 refactors some of the sequence nav styles 2012-05-15 16:34:21 -04:00
Galen Frechette
709faa4718 makes the sequence nav more semantic and replaces js hover with css 2012-05-15 16:00:27 -04:00
Kyle Fiedler
89afc98f76 Made links in sidebar all in p> 2012-05-14 16:39:44 -04:00
Isaac Chuang
232e758c7a Integrating some of Ike's courseware changes 2012-05-13 19:36:01 -04:00
Piotr Mitros
0028b3345e jsonify in postJSON from multiple choice did -- indeed -- break things. Removed. 2012-05-11 14:02:09 -04:00
Lyla Fischer
a4dae57751 merge with master 2012-05-10 12:25:33 -04:00
Lyla Fischer
eb95ea9e2f Merge branch 'master' into MC 2012-05-07 22:17:37 -04:00
Lyla Fischer
13a095fc1e checkboxes 2012-05-07 21:04:10 -04:00