Commit Graph

349 Commits

Author SHA1 Message Date
Valera Rozuvan
27015578f2 Removed an inclusion of t-copy-sub1 in SCSS.
This line was not doing anything and simply causing a warning while
SASS was compiling. The following is the warning:

---
WARNING on line 35 of /home/valera/edx_all/edx-platform/common/static
/xmodule/descriptors/css/_000-5df8e10160f918d31f2b2e8be3ce247d.scss:
".xmodule_edit.xmodule_VideoDescriptor .editor-with-tabs .edit-header
.component-name" failed to @extend ".t-copy-sub1".

  The selector ".t-copy-sub1" was not found.
  Use "@extend .t-copy-sub1 !optional" if the extend should be able to
    fail.
---
2013-09-13 10:11:45 +03:00
Valera Rozuvan
dd5506eeb7 Adding styles to fix issue BLD-221.
If you make the window smaller, and keep reducing it's size, at some
point the controls will not fit, and some will be bumped to the next row.
When the widnow is resized below the width 1024, extra styling rules
will kick in to fix this issue. The word "Speed" from the speeds control
will be temporarirly hidden.
2013-09-11 10:29:32 +03:00
Valera Rozuvan
d02ef8bc12 Add Learning Tools Interoperability (LTI) blade.
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
2013-09-09 23:54:49 +03:00
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module"
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
2013-09-09 22:51:57 +03:00
Valera Rozuvan
729d74f129 Fixing issues found by Anton during review of PR 804.
Changed use of IDs to classes. Simplified lti.js - now simple one function.
Updated tests.
2013-09-09 19:13:20 +03:00
Valera Rozuvan
417ddcaaa1 LTI module with tests 2013-09-09 19:13:20 +03:00
Vik Paruchuri
0fbbaa83d6 Fix some staff-facing messages 2013-09-06 11:17:46 -04:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
Felix Sun
69fbe77dcb Fixed a rebase error in responsetypes.
Fixed a css bug in the hinter.
2013-08-26 09:40:05 -04:00
Felix Sun
4220252055 Fixed terribly annoying issues with back button. Back button is now on
the bottom of the hint div, no matter what.
2013-08-26 09:40:05 -04:00
Felix Sun
2d1c9158d8 Added fancy sliding transitions into hint collection page. 2013-08-26 09:40:05 -04:00
Vik Paruchuri
26a301f42e Merge pull request #504 from edx/feature/vik/oe-ui
Feature/vik/oe ui
2013-08-22 12:23:29 -07:00
Brian Talbot
fb7fe13061 adds in the .reset type of action to the x module capa styling 2013-08-20 09:21:04 -04:00
marco
d782278d5c minor cleanup of pull request comments within scss files, along with removal of some whitespace in text fixture file for rubrics 2013-08-20 01:33:06 -04:00
Vik Paruchuri
f17987c13a Fix flagging, select rubric labels in peer grading 2013-08-16 17:37:53 -04:00
Vik Paruchuri
f8b5e67363 Text and styling cleanup 2013-08-15 14:52:51 -04:00
marco
72bb93d436 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui 2013-08-15 13:57:05 -04:00
marco
7865fbe0df cleaned up padding for peer review training and grading states, removed extraneous response label,fixed style issue on rubric for peer grading where rubric items had a background color overridding the intended style 2013-08-15 13:56:17 -04:00
Vik Paruchuri
9211a38374 Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-08-15 11:36:11 -04:00
marco
3a970d1490 restyled controls area for motion through multiple scored peer reviews 2013-08-13 20:56:53 -04:00
marco
ab81000665 visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins. 2013-08-13 14:42:34 -04:00
Lyla Fischer
e817fb4ca1 Merge pull request #637 from edx/vaxxxa/videoalpha_to_video
Migration videoalpha module to one main video module
2013-08-12 10:56:12 -07:00
Peter Baratta
735e3b01a2 Create a new response type for Numerical/Formula
Named `FormulaEquationInput` (name up for debate)

- Based off ChemEqnIn
- Add FormulaEquationInput in inputtypes.py
- Add a call to a skeleton method for a preview

javascript:

- Queue up some MathJax
- Put some ordering on the AJAX requests: add a parameter when the request was started, when it returns check that it isn't outdated before displaying the preview
- Tests

Note: we moved the `jsinput` tests and DISABLED them, because they were causing the tests to fail.
2013-08-12 11:48:45 -04:00
Anton Stupak
dad9f26a99 Make VideoAlpha out of Alpha. 2013-08-12 14:31:48 +03:00
marco
68199da821 added oe-tools header areas to eventually consolitate all messaging 2013-08-09 18:44:15 -04:00
marco
166c4c6939 cleaned up merge issue in combined_open_ended.html 2013-08-09 11:31:33 -04:00
marco
e1cba4b0b4 cleaned up html structure for various pages, style fixed for show/hide prompt item 2013-08-09 11:26:59 -04:00
Vik Paruchuri
2612fc2bce Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 2013-08-09 11:23:52 -04:00
Valera Rozuvan
f08394ac2c Volume and speeds dialogs are fully extended.
When the controls receive focus not via mouse click or mouse hover, their appropriate
slider and selection menu are fully extended and shown to the user.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
740a343b76 Styling improvements. 2013-08-09 09:22:56 +03:00
Valera Rozuvan
b24ee15568 Fixed styling for volume button.
For some reason the "muted" icon was not showing. Styles have been corrected.Now on focus background color is also simplified for div
.volume control.
2013-08-09 09:22:56 +03:00
Valera Rozuvan
bc503c88c6 Making it possible to tab to captions.
When a VideoAlpha is present on the page, if the user tries to tab through out the entire page, eventually he will land on the VideoAlpha controls. The tab index order has been set up so that all control receive focus eventually in the order from left to right. When a control receives focus, it is hilighted. The last tab focuses the captions dialog. When the captions dialog has focus, the Up and Down arrows can scroll it up and down.
2013-08-09 09:22:56 +03:00
Vik Paruchuri
687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
2013-08-08 19:03:46 -04:00
Vik Paruchuri
d44b2e62a0 Proper partial credit checks 2013-08-08 17:19:06 -04:00
Vik Paruchuri
803b7eb2af Fix peer grading rubric issue. Redo peer grading JS to scope locally 2013-08-08 16:31:36 -04:00
marco
56dee21142 partial cleanup for submitted rubric state, along with sass format cleanup for rubric.scss 2013-08-07 16:35:14 -04:00
Alexander Kryklia
da4f295d00 Add TabsEditingDescriptor for VideoAlpha
Updates comment
Make Model descriptor class property.
Fix tests
2013-08-05 13:38:32 +03:00
marco
ec99e20a35 styled rubric, dividers between sections 2013-08-02 13:37:53 -04:00
marco
cc7c025478 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui 2013-08-02 00:57:50 -04:00
marco
0e8c29989c style cleanup for open ended assessments, cleaning up workflow header, style definitions for rubrics are commented out momentarily, and an open issue for unicode rendering on the show and hide prompt area still remains 2013-08-02 00:57:31 -04:00
Vik Paruchuri
178be44333 Remove legend, start to edit rubric 2013-08-01 16:25:21 -04:00
Anton Stupak
65aa7d4f2e Fixes bug with Fullscreen mode and more.
Fixes subtitles hiding on slidermove and their height.
2013-08-01 20:50:16 +03:00
jmclaus
a77c386f76 Removes empty bindHandlers function from video_progress_slider
Refactors trigger function.
Fixes Ui bugs: captions.
Fixes bug with Youtube on page load.
Hotfixes html5 video streaming bug.
Adds test video files to the project.
2013-08-01 20:49:08 +03:00
Anton Stupak
7d215e12b7 Fixes InvalidStateError failures in FF and more.
Fixes HD button
Disables Fullscreen mode in the Studio
Fixes ui controls bug
2013-08-01 20:47:55 +03:00
Vasyl Nakvasiuk
7c59947ac0 refactoring JS -> HTML
second part of refactoring: JS -> Python HTML
Updated JS code to reflect the change that some HTML generation was moved to python side.
Fixed fullscreen bug - now controls are shown properly below the video. Made the transparency a bit more faded for captions in normal mode.
Fixed bug with captions. Now the attribute show_captions correctly removes them when set to true.
Work in progress.
2013-08-01 20:08:45 +03:00
Valera Rozuvan
0e24ff14f3 Added fade in/fade out for controls in HTML5 videos.
Making video in the center and not stretched when captions are shown.
Added auto hide/show for captions.
Removed old styling and debug info.
Added missing initalizations for captions auto show/hide.
Fixing bugs. Adding black backgorund to video for when it has not yet loaded. Making sure that the captions are not shown when in YouTube mode.
Added back missing styles for captions when in YouTube mode.
Code review 1 comments
Minor refactoring.
Documenting. Part 1.
2013-08-01 20:08:44 +03:00
Valera Rozuvan
9d2eec07b9 Refactoring of events system.
Minor fix.
Minor fix. Now state of captions is properly set from cookies.
Fix for hiding-showing subs based on cookie when subs are not found.
Partial feature - hide show controls on mouse.
Removed debugging messages. Changed trigger() method - now it has a better interface.
Better function rewrite. Now .trigger() is more readable and understandable.
In between.
2013-08-01 20:08:44 +03:00
marco
77e57448b3 cleaned up sass document format and added baseline variable throughout capa and combined open ended problems. no style rule changes, simply whitespace, ordering of properties, and the addition of baseline over direct pixels for padding and margins. 2013-08-01 12:42:11 -04:00
Vasyl Nakvasiuk
1233d73e01 Merge pull request #497 from edx/alex/graphical_slider_tool_for_studio
"Graphical Slider Tool" integration into studio
2013-07-31 06:36:49 -07:00