Commit Graph

652 Commits

Author SHA1 Message Date
Don Mitchell
09e8628037 add editor to new entries and when key changes 2013-02-08 16:58:50 -05:00
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
cahrens
c907cf756c Add ACE Editors. 2013-02-07 13:05:39 -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
cahrens
3f15b3b8ff Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy 2013-02-06 15:29:36 -05:00
cahrens
c243eec604 Move to view file. 2013-02-06 15:29:17 -05:00
Brian Talbot
d8a6010d0f studio - manual policy editor: added in example messages for confirm, error, warning 2013-02-06 15:13:44 -05:00
Brian Talbot
571e1106a4 studio - manual policy editor: styled error states to appear inline with row actions visually 2013-02-06 14:57:18 -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
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
Brian Talbot
ffd585ae56 studio - resolved safari/webkit display issue with unit editing window's wrapper background color 2013-02-04 14:44:17 -05:00
Brian Talbot
6ca55b8458 studio - overview drag and drop: removed unused scss and hid new unit button while dragging 2013-02-04 14:35:04 -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
cahrens
8f3e8024b9 Merge branch 'master' into feature/cas/manual-policy 2013-02-04 10:54:22 -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
Brian Talbot
61de4c028a temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog) 2013-02-01 09:41:51 -05:00
Don Mitchell
aad5015a82 Merge pull request #1398 from MITx/feature/christina/misc2
Fixes date bug (#149).
2013-01-31 10:59:07 -08:00
Jay Zoldak
c590c24e25 Add vendor files to files.json for the cms jasmine tests to work. 2013-01-31 13:48:38 -05:00
cahrens
b613bdc336 Fixes date bug (#149). 2013-01-31 13:37:45 -05:00
Don Mitchell
f257f12124 Meant to add the file here 2013-01-31 12:56:18 -05:00
Brian Talbot
7d871ddfc9 studio - revised manual policy UI: added key tips on focus, moved error messages to bottom of pairings 2013-01-31 11:50:07 -05:00
Brian Talbot
0e17d16dbe studio - advanced settings - added in several more static states and firmed up key/value pair styling specifically 2013-01-30 20:02:45 -05:00
Brian Talbot
06439c7b9b studio - advanced settings - initial HTML stubbing 2013-01-30 19:27:47 -05:00
Christina Roberts
91b3a220b8 Merge pull request #1367 from MITx/fix/cdodge/static-tab-reordering
support reordering of static tabs in studio
2013-01-30 08:51:36 -08:00
Chris Dodge
7f32aae47d rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability 2013-01-30 11:50:11 -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
Jay Zoldak
c3eba0d2da Add RequireJS.js to files.json so that the cms jasmine tests will run without erroring when importing RequireJS. 2013-01-29 16:22:37 -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
Chris Dodge
28a2dd9a18 support reordering of static tabs in studio 2013-01-28 16:33:28 -05:00
Brian Talbot
8a6dc040a9 studio - styled first children in an overview's subsection list for drag and drop work 2013-01-25 15:26:25 -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