Commit Graph

4251 Commits

Author SHA1 Message Date
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
2013-10-08 15:29:17 -04:00
Don Mitchell
44d0494d33 Segregate the mongo db config from the modulestore config
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
2013-10-08 15:01:48 -04:00
Carlos Andrés Rocha
7749bbbe51 Add module grade to problem_check tracking log event 2013-10-08 13:53:35 -04:00
Ned Batchelder
a03a11e0e7 Merge pull request #1253 from edx/ned/use-assertisinstance
Use assertIsInstance where we can
2013-10-08 07:47:21 -07:00
Valera Rozuvan
2cc25873e9 Fixing Jean Michel access. bug. 2013-10-08 16:52:21 +03:00
Valera Rozuvan
deb0ad492a Enabling showing of captions always when mouse is over CC. 2013-10-08 12:00:08 +03:00
polesye
f57d5a61d3 Tidy up the code. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
92494ccdd4 Fixing minor typo. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
60c528a9be Minor tweak. 2013-10-08 12:00:08 +03:00
Valera Rozuvan
b3a9f63de6 Furthe addressing comments on PR. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
95b74930f6 Fixing JS.
There were previous merge conflicts in the file.
2013-10-08 12:00:07 +03:00
Valera Rozuvan
fc43a81dbe Updated fixtures for Jasmine tests. 2013-10-08 12:00:06 +03:00
Valera Rozuvan
74cbe11934 Added functionality to show captions on "CC" button mousemove.
When auto-show/auto-hide is disabled, the captions will be shown when
the user will move the mouse over the "CC" button. They will then
auto-hide after a while if the user doesn't continue to move the
mouse over the "CC" button, or over the captions themselves, or use
the keyboard to select a specific caption. If the mouse pointer is not
over the captions or the "CC" button, they will hide after a while.

This is the key in the fix for bug BLD-355: Transcript hovers over
over videoplayer itself for PKU videos.
2013-10-08 12:00:06 +03:00
Valera Rozuvan
812b085b84 Added hard-coded flag to video.html that turns on/off autohiding of captions.
Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.
2013-10-08 12:00:06 +03:00
Valera Rozuvan
62c445d001 Updated code fomat in test Jasmine. 2013-10-08 12:00:06 +03:00
Valera Rozuvan
38dfde1296 Work in progress. 2013-10-08 12:00:06 +03:00
Ned Batchelder
a4bf549af4 Use assertIsInstance instead of assertTrue(type(x) == y) 2013-10-07 18:20:31 -04:00
Ned Batchelder
9103fa393c Use assertIsInstance. 2013-10-07 18:17:40 -04:00
jmclaus
4bb9dcf190 Merge pull request #1220 from edx/jmclaus/bugfix_bypass_captions
Captions are now removed from tab order when hidden
2013-10-04 15:02:45 -07:00
Nick Parlante
5d995ddb5c Merge pull request #1228 from edx/nick/fix-customization-visibility
Bug fix - text_customization should not show in settings
2013-10-04 13:50:49 -07:00
jmclaus
4f59e6bbee Captions are now removed from tab order when hidden 2013-10-04 22:16:59 +02:00
Nick Parlante
ad7c3f932b Bug fix - text_customization should not show in settings
Also change test to not expect text_customization
2013-10-04 12:55:28 -07:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Frances Botsford
6fa642fc65 a11y adjustment to new video and transcript links styles 2013-10-04 08:50:38 -04:00
Nick Parlante
32bf5b93b2 Merge pull request #1106 from edx/nick/customization
Targeted string customization in the lms UI
2013-10-03 14:41:36 -07:00
Frances Botsford
55d8a72395 adding a little ux to the download video and transcript links 2013-10-03 16:51:39 -04:00
Nick Parlante
cca6876a3c Targeted string customization in the LMS UI
Add the text_customization dict in advanced settings, which contains
customizations checked in specific spots. Here it is used to enable
the customization of the "Check" and "Final Check" button titles
under the keys custom_check and custom_final_check.
2013-10-03 11:31:40 -07:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Ned Batchelder
2a11ff0bdb Merge pull request #1198 from edx/ned/fix-calling-classmethods
No need to invoke classmethods through self.__class__
2013-10-03 10:28:39 -07:00
Ned Batchelder
a1be970153 Merge pull request #1194 from edx/ned/quiet-tests
Quiet down exceptions at startup, and during tests
2013-10-03 08:21:37 -07:00
jmclaus
38642d2888 Merge pull request #1175 from edx/jmclaus_bugfix_video_player_controls_a11y
Bug fix video player controls a11y
2013-10-02 13:53:48 -07:00
Don Mitchell
0521bec4e2 Merge pull request #1203 from edx/dhm/bug_publish
Fix publishing in old mongo
2013-10-02 13:23:51 -07:00
Don Mitchell
5e1f03bb52 Publish removes deleted children 2013-10-02 16:06:58 -04:00
Don Mitchell
18c45879bc Test reproducing orphaning of children
when draft is deleted and then parent published.
ensure moving doesn't cause deletion
2013-10-02 16:06:58 -04:00
polesye
960c2ec472 Fix acceptance tests. 2013-10-02 20:23:42 +03:00
jmclaus
9d418755a6 Added changes made to video.html to fixtures. Addressed latest PR comments 2013-10-02 16:54:48 +02:00
Ned Batchelder
3bbdd2f4c3 No need to invoke classmethods through self.__class__ 2013-10-02 10:35:58 -04:00
jmclaus
d201ce1035 Addressed PR comments 2013-10-02 15:55:23 +02:00
jmclaus
eeb38302d3 Fixed failing test. 2013-10-02 15:55:22 +02:00
jmclaus
332bfa9627 Added more explanatory states to the Volume, Fullscreen, HD, and CC controls 2013-10-02 15:55:22 +02:00
jmclaus
a3db5da994 Code cleanup 2013-10-02 15:55:22 +02:00
jmclaus
cd12492e08 Disabled one test in video_quality_control 2013-10-02 15:55:22 +02:00
jmclaus
e5895adb2b Progress slider announces its nabe and value to screen readers 2013-10-02 15:55:22 +02:00
jmclaus
a9b2f2dea0 Volume slider announces its name and value to screen readers 2013-10-02 15:55:22 +02:00
jmclaus
ce976a80c8 All buttons have an ARIA role, name , and state 2013-10-02 15:55:22 +02:00
jmclaus
dfe45d5bd6 First pass at ARIA. Video player buttons announce themselves as button when used with a screen reader 2013-10-02 15:55:22 +02:00
Ned Batchelder
50aa37be57 Quiet down exceptions at startup, and during tests
There's no need to display a traceback for every failed content load,
the comment before the log line even says so.

The exceptions shown before tests are run are because of the eager
initialization of the modulestores.  They don't need to be initialized
then, that just speeds the responsiveness of servers.  Putting off the
initialization means they get inited as needed, and the log lines get
2013-10-01 18:13:06 -04:00
marco
81a2ac413d Merge branch 'release'
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
2013-10-01 17:05:02 -04:00
Ned Batchelder
0bb11335b2 We aren't ready to use XBlock.load_class, there are duplicate entry point names, and simply choosing the first one leads to unpredictability. 2013-10-01 13:53:59 -04:00
Ned Batchelder
cdb80bb8ed Fix the new tests to use the new way to make XBlocks. 2013-09-30 21:09:44 -04:00