David Baumgold
40e540284f
wait to load video module until YT API is ready
2013-10-16 13:28:28 +03:00
Christina Roberts
ccd692dd86
Merge pull request #1133 from edx/jkarni/fix/customtag-error
...
Jkarni/fix/customtag error
2013-10-15 14:23:45 -07:00
Will Daly
52a475885c
Merge pull request #1350 from edx/db/enable-tender
...
re-enable tender
2013-10-15 14:10:43 -07:00
Frances Botsford
de1ee17323
fixing alignment error on studio component error message, i18n error message
2013-10-15 16:16:09 -04:00
Frances Botsford
9f188ed20c
additional copy and styling for component syntax error in studio
2013-10-15 16:16:09 -04:00
Frances Botsford
faadc33fcc
leveraging some of the existing notification styling for component errors in studio
2013-10-15 16:16:09 -04:00
Julian Arni
62a8c420ed
Check for exceptions when rendering studio and students views.
...
Otherwise it's possible to reach stuck states.
2013-10-15 16:16:09 -04:00
Brian Talbot
e825cfb1db
Merge pull request #1311 from edx/talbs/fix-studio-importui
...
Studio: FIX - Import Status UI Consistency
2013-10-15 11:29:48 -07:00
David Baumgold
eec7118f2b
enable tender
...
This reverts commit 96485694d3
2013-10-15 14:19:26 -04:00
Brian Talbot
8769a1a687
Studio: revises layout for success step and actions in import view
2013-10-15 13:44:33 -04:00
cahrens
6a7b88df4d
Move sock JS code into its own file.
2013-10-15 12:59:22 -04:00
David Baumgold
e7f9243c95
Merge pull request #1346 from edx/db/disable-tender
...
disable tender
2013-10-15 08:49:04 -07:00
David Baumgold
96485694d3
disable tender
...
because their Javascript breaks our page
2013-10-15 10:25:48 -04:00
David Baumgold
061e046e2d
use domReady rather than $.ready()
2013-10-12 13:24:30 -04:00
David Baumgold
b6281cb0a6
Define CMS.URL.UPLOAD_ASSET immediately
2013-10-11 17:12:00 -04:00
David Baumgold
1007f5aeb4
load gettext on every page
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
David Baumgold
3e9c09e097
Ensure that jQuery loads before any other JS dependency
2013-10-10 14:27:29 -04:00
David Baumgold
b80d1572f0
source-edit.html depends on leanModal
2013-10-10 13:16:15 -04:00
David Baumgold
7a24188ca6
Merge pull request #1278 from edx/db/increase-requirejs-timeout
...
Increase requirejs load timeout to 60 seconds
2013-10-10 09:37:39 -07:00
cahrens
3ed2fcbb31
Parse floats to ints in CourseGrader model.
...
Fixes STUD-826.
2013-10-10 12:02:21 -04:00
Christina Roberts
94ed3c6abb
Merge pull request #1275 from edx/christina/delete-static-tabs
...
Delete unused static-pages.html.
2013-10-10 08:28:24 -07:00
cahrens
70cb24a37f
Delete unused static-pages.html.
2013-10-09 15:06:58 -04:00
David Baumgold
7f783da16c
Increase requirejs load timeout to 60 seconds
2013-10-09 11:53:37 -04:00
David Baumgold
61c25fa6ee
load common libs via require
...
using requirejs config to define deps
2013-10-09 11:38:14 -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
David Baumgold
f1a104754e
load jquery in requirejs deps
2013-10-08 11:40:42 -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
Peter Fogg
a0deac0399
Make all of section/subsection/unit draggable.
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
Julian Arni
bb00924917
Use requirejs for import.js
...
And fixes for rebase-breakage.
2013-10-07 14:07:26 -04:00
Brian Talbot
5cfec75ece
Studio: adds in instructional copy to user on when it is safe to leave the import view without harming an import process
2013-10-07 09:57:41 -04:00
Julian Arni
7b3c4945cf
Review fixes
...
Studio: revises import help/status copy to better reflect/generalize what is done with imported content
Add test cases for import status
2013-10-07 09:55:46 -04:00
Julian Arni
642bf0e6e6
Clear import status on retry
2013-10-07 09:53:37 -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
Julian Arni
4bbacb02db
Re-add bar references
2013-10-07 09:52:59 -04:00
Julian Arni
cab7c4ff74
Remove references to old upload progress bar
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
39b578c066
Studio: adds JS/functionality dependent class to course updates <body> elem
2013-10-03 15:29:42 -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
3bec8c66d2
Studio: adds JS/functionality dependent class to course updates <body> elem
2013-10-03 11:52:26 -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
