David Baumgold
fb01d8fa81
Fixes to avoid CSRF error in acceptance tests
2013-10-11 17:11:59 -04:00
Christina Roberts
11142c7cbb
Merge pull request #1300 from edx/christina/fix-rounding-error
...
Grading rounding error.
2013-10-11 07:33:26 -07:00
Frances Botsford
4fc801f09f
fix for forgot password alignment on studio log in page
2013-10-11 09:51:44 -04:00
Brian Talbot
03c9a46d79
Studio: visually hides the tender widget tag UI, again
2013-10-10 16:37:31 -04:00
David Baumgold
3e9c09e097
Ensure that jQuery loads before any other JS dependency
2013-10-10 14:27:29 -04:00
cahrens
8c080b6fb6
Acceptance test for fixing rounding error on weight.
2013-10-10 12:02:21 -04:00
cahrens
3ed2fcbb31
Parse floats to ints in CourseGrader model.
...
Fixes STUD-826.
2013-10-10 12:02:21 -04:00
cahrens
6b5d864885
Change test to pass on Chrome as well as FireFox.
2013-10-10 12:01:11 -04:00
David Baumgold
30dc441807
Merge pull request #1288 from edx/db/grading-deps-ui
...
grading.js depends on jquery.ui
2013-10-10 08:49:24 -07:00
frances botsford
187fc8ea1c
Merge pull request #1280 from edx/fix/frances/lms-video-dl-buttons2
...
Improving the video and transcript download buttons
2013-10-10 07:10:38 -07:00
Frances Botsford
5d509c2e08
addressing review feedback on video buttons - switched to use themeable color variables
2013-10-10 10:09:43 -04:00
David Baumgold
6c2dbce434
grading.js depends on jquery.ui
2013-10-09 15:59:27 -04:00
cahrens
28dd142758
Only change the collapse/expand state on the first child.
...
There are possibly children nested below that.
2013-10-09 13:25:36 -04:00
Frances Botsford
5653112f5e
ux cleanup of video and transcript download buttons
2013-10-09 12:02:09 -04:00
cahrens
5b58318490
Unfortunately, delete tests are still failing sporadically in Jenkins.
2013-10-09 10:27:54 -04:00
Brian Talbot
bbe906f77f
Studio: changes drag and drop container to new .wrapper-dnd on outline/subsection views
2013-10-08 17:24:00 -04:00
Christina Roberts
c484dc6cbb
Merge pull request #1255 from edx/db/requirejs-load-jquery
...
load jquery in requirejs deps
2013-10-08 09:28:50 -07:00
David Baumgold
eb07e0bd58
Remove unused setup_require.coffee file
2013-10-08 12:06:18 -04:00
David Baumgold
f1a104754e
load jquery in requirejs deps
2013-10-08 11:40:42 -04:00
cahrens
9d31924793
Re-enable tests that were failing on Jenkins.
2013-10-08 10:23:47 -04:00
Christina Roberts
009deb7da8
Merge pull request #1236 from edx/christina/course-updates-bug
...
Don't remove course update when clicking outside modal.
2013-10-08 07:20:10 -07:00
cahrens
1de194aaa4
Use RequireJS for test dependencies, and use domReady.
2013-10-08 09:55:15 -04:00
cahrens
328640452f
Comment out tests that fail in Jenkins.
2013-10-07 17:18:40 -04:00
cahrens
61cfb91218
Cleanup to drag and drop implementation.
...
Also includes RequireJS changes.
Fixes bugs:
STUD-755, STUD-152, STUD-700, STUD-699
2013-10-07 17:18:40 -04:00
Brian Talbot
14b4b6a24e
Adds in minimally revised drag and drop styling.
...
Add CSS classes and fix drop destination bug.
2013-10-07 17:17:46 -04:00
Peter Fogg
85be9b4265
Jasmine tests for drag/drop.
2013-10-07 17:17:46 -04:00
Peter Fogg
7640ade481
Fix not being able to expand an empty subsection.
2013-10-07 17:17:46 -04:00
Peter Fogg
cbd066da04
Address PR comments.
...
Remove unused variables; some changes to match existing BDD spec for
drag/drop (expand-on-hover timeout and dropping with mouse outside of
element); bugfix for section expand; some code cleanup; update and
re-enable acceptance test.
2013-10-07 17:17:46 -04:00
Peter Fogg
1c9fbec94b
CSS classes for drop targets.
2013-10-07 17:17:46 -04:00
Peter Fogg
a0deac0399
Make all of section/subsection/unit draggable.
2013-10-07 17:17:46 -04:00
Peter Fogg
fd2f720adb
Add auto-expand to overview lists.
2013-10-07 17:17:46 -04:00
Peter Fogg
2d3cba06d2
Rework course overview drag and drop.
...
Failed drags bring the element back to where it started; elements are
locked to the y-axis, states are represented as CSS classes for
styling, elements can be dragged across section/subsection borders,
and dragging to the top/bottom of a section Just Works™.
Needs some styling love to give visual representation of where the
dragged element will drop, though.
TODO: It'd be good to have auto expand/collapse for subsections.
2013-10-07 17:17:46 -04:00
David Baumgold
d29cc4776e
base.js requires jquery.smoothScroll
2013-10-07 16:37:05 -04:00
cahrens
aa6022d505
Don't remove course update when clicking outside modal.
...
Fixes bug STUD-822.
2013-10-07 15:25:16 -04:00
Julian Arni
bb00924917
Use requirejs for import.js
...
And fixes for rebase-breakage.
2013-10-07 14:07:26 -04:00
Julian Arni
57b38969e5
Move import-related js to import.js
2013-10-07 09:57:20 -04:00
Brian Talbot
1735a0f41f
Studio: copy and styling changes to import view to support new status UI
2013-10-07 09:52:59 -04:00
Brian Talbot
89bba535e1
Studio: adds in action-related elements to the status display UI of the Import view
2013-10-07 09:52:59 -04:00
Brian Talbot
76ee27c22a
Studio: revises import view Sass extends to use placeholder syntax
2013-10-07 09:52:59 -04:00
Julian Arni
45ce8d30d9
Use swanky error css for error messages
2013-10-07 09:52:59 -04:00
Julian Arni
abdaeef9d8
Hook up js to css classes
2013-10-07 09:51:52 -04:00
Brian Talbot
59af44574c
Studio: revises general layout/styling of import view and adds in detail progress feedback after import (WIP)
...
Studio: removes import progress bar HTML and Sass; hides import status by default
Studio: revises import file upload success copy; sets up showing/hiding states for import status and additional messages
Studio: revises iconography and adds in success step in import status feedback
Studio: adds hidden styling back into import status UI
2013-10-07 09:51:19 -04:00
Julian Arni
a108827564
Route ajax request to appropriate view, and show feedback only then
...
Hook up view
Fix getStatus function
2013-10-07 09:51:19 -04:00
Julian Arni
c62691e9fc
Scaffolding for import progress reporting
2013-10-07 09:49:59 -04:00
David Baumgold
d97921e6e2
Convert Studio JS to use require.js
2013-10-04 13:43:50 -04:00
Brian Talbot
38b04f2a9e
Studio: adds in older styling dependent class to unit <body> elem
2013-10-03 11:53:10 -04:00
Brian Talbot
c2507ddc21
Studio: revises class naming conventions applied to the <body> element and used for view specific styling
2013-10-01 16:53:41 -04:00
Christina Roberts
42f286b325
Merge pull request #1069 from edx/christina/lock-assets
...
Add asset locking to the Studio asset page.
2013-09-26 07:54:29 -07:00
Don Mitchell
190b418387
Merge pull request #1121 from edx/dhm/timezone_display
...
Replace date lib w/ simpler tzAbbr
2013-09-26 07:43:22 -07:00
cahrens
2cbdaaee7d
Updates based on switching to checkbox for locking.
2013-09-25 17:29:47 -04:00