Don Mitchell
5254af2918
Letting render do its thing. The wrap confused the this pointer.
2013-02-08 15:36:42 -05:00
cahrens
4718c9a51a
Forgot to define self when I moved code.
2013-02-08 11:17:02 -05:00
cahrens
950f5de3ca
Move getSession() call out of render method to avoid crash on Chrome.
2013-02-08 08:26:24 -05:00
Don Mitchell
9f5eeaf815
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
...
Conflicts:
cms/templates/settings.html
cms/templates/widgets/header.html
2013-02-07 14:56:48 -05:00
Don Mitchell
31393043d0
More for that commit
2013-02-07 14:46:42 -05:00
Don Mitchell
9cd1162a60
Grading and details split out. Put the unimplemented tabs into a single
...
file not used.
2013-02-07 14:45:24 -05:00
Brian Talbot
5b9609abf6
studio - soft landing: various fixes/tweaks
2013-02-07 14:09:47 -05:00
cahrens
c907cf756c
Add ACE Editors.
2013-02-07 13:05:39 -05:00
Brian Talbot
5674dd19c4
studio - soft landing and nav: slight visual tweaks to soft landing UI and added in support link + new tab/window and modal management JS
2013-02-07 09:58:52 -05:00
Don Mitchell
1e68834e03
Remove from to-be-deleted list any readded keys w/ same name.
2013-02-06 17:42:00 -05:00
Don Mitchell
7b3c81ca53
blacklist violations now properly trigger violation error
...
delete keys only after save completes
2013-02-06 17:25:12 -05:00
Brian Talbot
cb9d960a28
studio - soft landing: style dropdown arrows
2013-02-06 15:46:10 -05:00
cahrens
c243eec604
Move to view file.
2013-02-06 15:29:17 -05:00
Brian Talbot
d11f10cc66
studio - course nav: corrected JS behavior of dropdowns to hide all others and self-hide appropriately
2013-02-06 14:37:09 -05:00
Brian Talbot
1dae21e969
studio - course nav: styled dropdown navigation
2013-02-06 14:16:49 -05:00
cahrens
08ce212bd5
Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
...
Conflicts:
cms/static/js/models/settings/advanced.js
2013-02-06 10:35:12 -05:00
Don Mitchell
1cc62fae75
Catch null pointer for uninitialized dates
2013-02-06 10:23:29 -05:00
Don Mitchell
4ba7de3402
Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
2013-02-06 09:56:19 -05:00
cahrens
8093de1d93
Set size of ACE Editor.
2013-02-06 09:49:27 -05:00
Don Mitchell
0f5571f499
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
2013-02-06 09:48:09 -05:00
Don Mitchell
05ec0c11c6
Oops, when i alphabetized i got the value incorrectly.
...
Fixed cancel to not retain new entries.
2013-02-06 09:08:28 -05:00
Don Mitchell
592d7e532b
Keys are sorted now
2013-02-06 08:58:20 -05:00
Don Mitchell
5275db9ab9
Cancel kind of works (reverts but leaves in new fields :-( )
...
Filter out system metadata fields
2013-02-05 19:17:43 -05:00
Don Mitchell
8f16d639b7
CRUD on policy fields w/ some validation
2013-02-05 17:21:02 -05:00
cahrens
ca2a375c17
saving work
2013-02-04 12:50:16 -05:00
Don Mitchell
902cdefefa
Added comments for unused 2nd arg on generateCheckHoverState
2013-02-04 12:05:49 -05:00
Don Mitchell
50eced5b32
Attempt to patch the dnd hesitation fixes onto master
2013-02-04 11:34:59 -05:00
Brian Talbot
83ad950887
studio - revised course nav: plumbed in current html and scss progress into header
2013-02-01 20:48:59 -05:00
Don Mitchell
1595bd9b0e
Move dnd code from base.js to a js file only loaded by overview.html
2013-02-01 17:20:58 -05:00
cahrens
b613bdc336
Fixes date bug ( #149 ).
2013-01-31 13:37:45 -05:00
Don Mitchell
19927a83a5
Ensure settings and course info CRUD operations tell the user if there's
...
a server error and pull the server error handler into a common function.
2013-01-30 11:24:55 -05:00
Don Mitchell
ab4fd03dd8
Catch any and all save errors
2013-01-30 09:43:27 -05:00
Don Mitchell
b8c1dba1cb
Catch save error and throw it in the user's face (bug 147). May need to
...
add catches in more places or put in $.ajaxSetup?
2013-01-29 17:31:12 -05:00
Don Mitchell
574d6e8e28
Simple zIndex rather than fancy stack works best.
2013-01-29 15:00:49 -05:00
Don Mitchell
63d269acf1
draggable is not the collapsed item :-( but ui.helper seems to be.
2013-01-29 14:31:14 -05:00
Don Mitchell
87d8598abe
subsection drag
2013-01-29 13:43:58 -05:00
Don Mitchell
5fcb6bfcd4
Remove debug code
2013-01-29 13:16:21 -05:00
Don Mitchell
ba95cf2385
Auto expand on hover of drag&drop unit
2013-01-29 13:10:23 -05:00
Don Mitchell
0009430b59
min height on droppable areas and add padding to top/bottom on hover.
2013-01-25 14:30:51 -05:00
Don Mitchell
5ef3f3ee66
Update jquery ui. Overrode draggable w/ an in place fix for scroll
...
racing condition.
2013-01-25 12:44:58 -05:00
Don Mitchell
3e048d7072
Removed old function
2013-01-23 14:15:09 -05:00
Don Mitchell
4d0d46462c
Fixed the y axis drop problem by requiring it to be within the x bounds.
2013-01-23 12:12:40 -05:00
Don Mitchell
ad5f00f270
Drag and drop for sections, subsections, and units works with following
...
caveats: - it drops wherever the y of the cursor is no matter the x for
the cursor. I've constrained the draggables to never change x; so, the
drop doesn't care where the x of the cursor is only the y.
- if you force auto scroll, the visual thing you'll dragging gets out of
sync w/ the mouse cursor; however, the mouse cursor is the "true"
location; so, the drop's posit is the mouse cursor y not the visual
clone's y.
2013-01-23 11:16:04 -05:00
Don Mitchell
2ae92cbd88
Added RequireJS to fix expectation that it's included.
...
Unit drag and drop works correctly now.
2013-01-22 17:25:28 -05:00
Don Mitchell
1b64faf610
Caching to change branches for other work
2013-01-22 11:42:23 -05:00
Don Mitchell
48fa4b4a5e
Cache in order to try updated sortable lib
2013-01-22 11:39:23 -05:00
cahrens
d4f79c0498
Fix bug related to img link for non-img files.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet
2013-01-16 13:51:17 -05:00
Christina Roberts
b3af587ba0
Merge pull request #1247 from MITx/feature/btalbot/cms-sectiontoggling
...
Course Overview Section Collapse/Expand Toggling
2013-01-10 09:04:26 -08:00
cahrens
bcafc5fdfb
Bug fix for modal cover not going way when click outside of edit ( #106 ).
2013-01-10 11:07:11 -05:00
Don Mitchell
96a7db62cd
Fixed time picker race condition for grace period. Still quirky in that
...
in rounds down times from :01-:09 to :00 (and perhaps others). I think
that's a bug or setting in timepicker.
2013-01-09 17:55:02 -05:00
