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
Will Daly
b749300d43
Use css_has_value() to fix failure in course-overview.feature
2013-10-07 16:08:39 -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
jkarni
31980150f0
Merge pull request #1043 from edx/jkarni/feature/import-feedback
...
Jkarni/feature/import feedback
2013-10-07 12:13:07 -07:00
David Baumgold
fd7e8baccb
Tie the USE_I18N setting to DEBUG setting
...
We want USE_I18N to be on in development, but off in production. Tying
this setting to the DEBUG setting accomplishes that neatly.
2013-10-07 15:04:15 -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
57b38969e5
Move import-related js to import.js
2013-10-07 09:57:20 -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
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
Will Daly
3257a7baf2
Refactored navigation feature
...
Fixed grading tests
2013-10-07 09:41:18 -04:00
Julian Arni
f095f3c8c8
Merge branch 'release'
2013-10-04 17:34:49 -04: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
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
Julian Arni
dadc766fc0
Use wrapped tar extraction
...
Signed-off-by: Julian Arni <julian@edx.org >
2013-10-04 15:47:58 -04:00
David Baumgold
d97921e6e2
Convert Studio JS to use require.js
2013-10-04 13:43:50 -04:00
Will Daly
54ea98d249
Merge pull request #1219 from edx/will/run-individual-tests
...
Allow rake test to run individual tests again
2013-10-04 07:27:30 -07:00
Jay Zoldak
cce3758363
Modify acceptance tests to account for the new text_customization capa field
2013-10-04 09:38:40 -04:00
Will Daly
b0878d3d43
Allow rake test to run individual tests again
2013-10-03 16:15:33 -04:00
Jay Zoldak
855d5d9e4a
Fix the matcher for the word 'test' in the upload file step of acceptance tests
2013-10-03 16:14:30 -04:00
Brian Talbot
39b578c066
Studio: adds JS/functionality dependent class to course updates <body> elem
2013-10-03 15:29:42 -04:00
Calen Pennington
230bf0c643
Switch get_html replacement out for using wrap_child
2013-10-03 14:28:19 -04:00
Brian Talbot
0dfe4a3243
Merge pull request #1214 from edx/talbs/fix-studio-bodyclasses
...
Studio: Fix - HTML <body> class regressions
2013-10-03 09:08:16 -07: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
Jay Zoldak
db4dfd147e
Change css locator for Course Outline page in acceptance test
2013-10-03 11:17:36 -04:00
Will Daly
86c6dd6e23
Merge pull request #1199 from edx/will/latex-test-timeout
...
Increased timeout in LaTeX acceptance test.
2013-10-03 04:42:43 -07:00
Jay Zoldak
8ab2e3c351
Merge pull request #1179 from edx/zoldak/enable-component-acceptance-tests
...
Re-enable the component acceptance tests
2013-10-02 14:17:05 -07:00
Brian Talbot
9d87a03134
Merge pull request #1192 from edx/talbs/studio-viewnames
...
Studio: HTML body class and view-styling naming conventions
2013-10-02 13:17:43 -07:00
polesye
9a4633be86
Fix matchers.
2013-10-02 22:41:14 +03:00
