cahrens
3ed2fcbb31
Parse floats to ints in CourseGrader model.
...
Fixes STUD-826.
2013-10-10 12:02:21 -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
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
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
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
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
David Baumgold
d97921e6e2
Convert Studio JS to use require.js
2013-10-04 13:43:50 -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
cahrens
c64e04d8c2
Add the ability to lock assets.
2013-09-25 17:29:27 -04:00
cahrens
ab6af2b586
Put assets JavaScript code back in something that goes through pipelining.
2013-09-24 11:49:54 -04:00
Don Mitchell
f8cd482621
Replace date lib w/ simpler tzAbbr
2013-09-23 16:56:30 -04:00
cahrens
9b076464f4
Moving unregistration of change listener into asset_index.html.
...
Fixes broken integration test on master.
2013-09-23 10:25:06 -04:00
cahrens
fe6ed08518
Code review feedback.
2013-09-20 10:44:55 -04:00
cahrens
d11c92d799
Set the URL on the collection instead of the model.
2013-09-20 10:44:55 -04:00
cahrens
9ceee3627f
Simplify how we determine if asset is already showing.
2013-09-20 10:44:54 -04:00
cahrens
01d7d48f8f
Create backbone models/views for assets.
...
cleanup
Updates.
Testing changes.
Testing changes.
asset-index progress state cleanjup.
cleanup
2013-09-20 10:44:54 -04:00
cahrens
e65e9b53a3
Minor cleanup.
2013-09-17 14:40:15 -04:00
cahrens
ff2d952d39
Change course id limit to 65.
...
STUD-726
2013-09-11 16:15:16 -04:00
David Baumgold
543438816d
Merge pull request #875 from edx/db/translate-hellip
...
Translate …
2013-09-10 06:58:47 -07:00
jkarni
b53d55543d
Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload
...
Add support for multiple file uploads
2013-09-09 06:47:58 -07:00
chrisndodge
9c6987d010
Merge pull request #873 from edx/fix/cdodge/enable-course-image-setting
...
also even when we have a marketing site, we still need a course image fo...
2013-09-06 16:58:54 -07:00
Chris Dodge
10b7c13652
add comment
2013-09-06 16:05:41 -04:00
David Baumgold
d984311b2e
Remove references to template loader JS library
2013-09-06 09:59:56 -04:00
Julian Arni
d0f7206099
Review fixes
2013-09-06 09:25:45 -04:00
David Baumgold
2c2668ca02
Removed template loader JS library
2013-09-06 09:21:55 -04:00
David Baumgold
fd8b375f3a
Translated …
2013-09-06 09:17:19 -04:00
David Baumgold
79b3af8749
tabs to spaces
2013-09-06 09:16:26 -04:00
Chris Dodge
0a6565b882
also even when we have a marketing site, we still need a course image for the dashboard
2013-09-05 21:07:22 -04:00
Julian Arni
07014e8eb2
Reset modal when closed by clicking outside of it
2013-09-04 16:25:23 -04:00
Julian Arni
b797118811
review fixes
2013-08-29 17:22:07 -04:00
cahrens
a061c7ece7
Rewriting of links for Course Updates and Course Handouts.
...
STUD-669.
2013-08-29 14:35:16 -04:00
Julian Arni
e0ab75fb84
Add support for multiple file uploads
2013-08-29 09:55:40 -04:00
Peter Fogg
7fc8fcde7b
Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod
...
Allow grace periods of > 24 hours.
2013-08-21 13:00:15 -07:00
