Commit Graph

2914 Commits

Author SHA1 Message Date
Brian Talbot
1dae21e969 studio - course nav: styled dropdown navigation 2013-02-06 14:16:49 -05:00
Brian Talbot
b0be1cd3dc studio - soft landing: revised app nav flexible grid 2013-02-06 11:36:08 -05:00
Brian Talbot
b98c643aaf studio - merging soft landing local work with rebased branch 2013-02-06 10:59:59 -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
Brian Talbot
bb789e758b studio - course nav: general flex-grid layout - WIP 2013-02-06 09:57:03 -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
Brian Talbot
280de111e1 studio - soft landing: fixed flexible grid proportions on sign up/in UI 2013-02-06 09:18:34 -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
Brian Talbot
1687a99c5c studio - soft landing: added in modal copy and resolved image dimensions issue 2013-02-06 08:53:23 -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
56b8353dfd studio - soft landing: refined sign in/up error states visually 2013-02-05 16:41:24 -05:00
Brian Talbot
cdf28f6183 studio - soft landing: added in edX Studio logo 2013-02-05 14:14:14 -05:00
Brian Talbot
afa5b75de2 studio - soft landing: optimizing/compressing new images 2013-02-05 11:48:30 -05:00
Brian Talbot
b456281a8f studio - soft landing/nav: added in functionality/content to soft landing view and started punch list 2013-02-05 11:34:28 -05:00
Brian Talbot
b654ee4006 studio - soft landing: further styling and modal set-up - WIP 2013-02-04 20:25:58 -05:00
Brian Talbot
db21156d40 studio - soft landing: added in hover/active states for elements 2013-02-04 17:18:12 -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
Brian Talbot
71ae45fd0e studio - soft landing UI: how it works styling - wip 2013-02-04 14:23:44 -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
Brian Talbot
c9dc762a2b studio - soft landing UI: how it works basic layout styling 2013-02-04 09:54:14 -05:00
Brian Talbot
ecbe297936 studio - soft landing UI: how it works pathing, html and basic layout styling 2013-02-04 09:39:36 -05:00
Brian Talbot
e207881b50 studio - soft landing UI: button tweaks 2013-02-04 08:21:32 -05:00
Brian Talbot
4946eace2a studio - soft landing UI: sign in and basic styling/layout tweaks 2013-02-04 00:43:24 -05:00
Brian Talbot
5a1795db85 studio - soft landing UI: basic signin/sign up styling and sign up markup/templating 2013-02-04 00:19:26 -05:00
Brian Talbot
1144b0eeed studio - soft landing UI: initial header and templating work 2013-02-03 22:22:11 -05:00
Brian Talbot
604bfcc04a studio - course nav - fixing width of course name for now 2013-02-03 20:20:35 -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
Brian Talbot
d0d0296310 studio - revising course-based navigation - initial scss setup 2013-02-01 19:57:17 -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