Commit Graph

529 Commits

Author SHA1 Message Date
Brian Talbot
1936b47ba5 studio - small display tweaks to setting form new/remove actions 2013-02-11 09:01:52 -05:00
Brian Talbot
a5ccfc61cd studio - hiding footer links until we have copy/pages 2013-02-11 08:48:58 -05:00
Brian Talbot
ed15997259 studio - settings: grading revamp WIP 2013-02-11 08:48:01 -05:00
Brian Talbot
210086fed3 studio - settings: grading revamp WIP 2013-02-08 13:42:36 -05:00
Brian Talbot
1b679750ad studio - settings: more revamp of tabs to views WIP 2013-02-08 12:36:21 -05:00
Brian Talbot
dc07e7375f studio - settings: revamp of tabs to views WIP 2013-02-08 09:36:18 -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
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
ed42fa8830 studio - soft landing: revised page title structure and values 2013-02-07 14:23:00 -05:00
Brian Talbot
5b9609abf6 studio - soft landing: various fixes/tweaks 2013-02-07 14:09:47 -05:00
Brian Talbot
fedd0aac9a studio - course nav: added in styling to account for stateful menus 2013-02-07 11:25:11 -05:00
Brian Talbot
903115d6a9 studio - soft landing: refined user icon vs. dropdown icon styles 2013-02-07 11:07:18 -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
Brian Talbot
946d1617e7 studio - resolving merge conflict in header widget 2013-02-06 14:18:55 -05:00
Brian Talbot
1dae21e969 studio - course nav: styled dropdown navigation 2013-02-06 14:16:49 -05:00
Don Mitchell
31d541e5ad Wire up settings to menu (3 different ways just b/c it's possible) 2013-02-06 13:42:51 -05:00
Brian Talbot
b98c643aaf studio - merging soft landing local work with rebased branch 2013-02-06 10:59:59 -05:00
Brian Talbot
bb789e758b studio - course nav: general flex-grid layout - WIP 2013-02-06 09:57:03 -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
8c86eb2522 studio - soft landing: revised copy 2013-02-06 09:03:07 -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
Brian Talbot
56b8353dfd studio - soft landing: refined sign in/up error states visually 2013-02-05 16:41:24 -05:00
Brian Talbot
b0d843e38d studio - soft landing: removed forgot password link from tab order of sign in form 2013-02-05 14:55:58 -05:00
Brian Talbot
cdf28f6183 studio - soft landing: added in edX Studio logo 2013-02-05 14:14:14 -05:00
Brian Talbot
8bb5cc1c23 studio - course nav: added in root link to main nav 2013-02-05 11:50:58 -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
71ae45fd0e studio - soft landing UI: how it works styling - wip 2013-02-04 14:23:44 -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
79e3482265 studio - soft landing UI: initial how it works plumbing 2013-02-04 08:25:58 -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
22444f6dfe studio - revised course nav: fixed placeholder login link text 2013-02-01 20:50:29 -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
Don Mitchell
6491363647 Remove format field as it's the one for grading type. 2013-01-31 12:11: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
Brian Talbot
25df02fedd studio - syncing cheatsheet language with new class name for heading 1 again 2013-01-23 13:04:16 -05:00
Brian Talbot
0e061ca726 studio - syncing cheatsheet language with new class name for heading 1 2013-01-23 13:02:33 -05:00
Brian Talbot
5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:58:20 -05:00
Don Mitchell
b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce
Feature/christina/tiny mce
2013-01-23 09:14:42 -08:00
Chris Dodge
0042131588 use property rather than referencing the metadata dictionary. This is better because if there is no 'display_name' defined, then we get back a string of the location name 2013-01-23 09:12:24 -05:00
Brian Talbot
aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) 2013-01-22 15:51:12 -05:00
cahrens
77865f7ab2 Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 2013-01-17 14:22:18 -05:00
cahrens
5f05ec83f1 Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly. 2013-01-17 13:11:47 -05:00
cahrens
d07a9203d1 in progress 2013-01-17 09:10:23 -05:00
Brian Talbot
e8ba078d4e studio HTML editor - codemirror/tinymce toggle work - wip 2013-01-16 14:54:28 -05:00