171 Commits

Author	SHA1	Message	Date
Brian Talbot	fccb3d7a73	studio - nav and soft landing various QA fixes	2013-02-12 17:36:36 -05:00
Brian Talbot	0a2b74110e	studio - nav and soft landing various QA fixes	2013-02-12 17:03:48 -05:00
Brian Talbot	540710f553	studio - nav revamp: added in dynamic course org and number to header	2013-02-12 14:22:42 -05:00
Brian Talbot	3eead4701b	studio - settings: hiding link to advanced settings for now	2013-02-11 15:59:10 -05:00
Brian Talbot	a5ccfc61cd	studio - hiding footer links until we have copy/pages	2013-02-11 08:48:58 -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	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	bb789e758b	studio - course nav: general flex-grid layout - WIP	2013-02-06 09:57:03 -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	ecbe297936	studio - soft landing UI: how it works pathing, html and basic layout styling	2013-02-04 09:39:36 -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	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
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
cahrens	29f49895d3	Pretty much works.	2013-01-14 15:41:12 -05:00
cahrens	db9875758f	Saving work.	2013-01-14 15:41:12 -05:00
cahrens	c4ec8ead4a	Work in progress, related to rich HTML editor.	2013-01-14 15:41:12 -05:00
Brian Talbot	e82987a32d	problem editor - revised classes on editor cheatsheet text and explanation tooltip text	2013-01-14 09:37:38 -05:00
Brian Talbot	1cf5e10a34	revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet	2013-01-13 12:47:30 -05:00
Brian Talbot	04e9447367	added in icons for header and explanation markdown elements	2013-01-13 12:15:29 -05:00
Don Mitchell	1bf2cdd528	Changed order of buttons to match order of cheat sheet	2013-01-11 17:01:50 -05:00
cahrens	a4b6851e6c	Remove some dead css.	2013-01-11 16:11:09 -05:00
Don Mitchell	755bf709a5	Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor	2013-01-11 14:44:38 -05:00
Brian Talbot	7d445f5630	studio - tweaking problem editor's advanced editor toggle control UI and prompt message	2013-01-11 14:25:22 -05:00
Don Mitchell	64507bd5fd	Drop down for markup done but w/o new icons	2013-01-11 10:36:42 -05:00
Don Mitchell	e095a139b9	Cheat sheet updated for header and explanation. Video removed.	2013-01-11 09:36:29 -05:00
cahrens	58837066b0	A couple renames.	2013-01-10 13:50:21 -05:00
cahrens	b3d168b6f2	Make editor names consistent.	2013-01-09 16:20:38 -05:00
cahrens	1252181fe1	Code review cleanup.	2013-01-09 14:11:13 -05:00
cahrens	b97955965a	Warn user when going to XML Editor. Cleanup and comments.	2013-01-09 09:39:46 -05:00
cahrens	4ac15daf44	Fix formatting.	2013-01-08 15:04:48 -05:00
cahrens	f616aecd81	Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor ... Conflicts: common/lib/xmodule/xmodule/js/src/problem/edit.coffee	2013-01-08 14:56:59 -05:00
cahrens	bc10d080df	Save work	2013-01-08 13:39:16 -05:00
Don Mitchell	76f2ef6f7c	Empty template now recognized as allowing markdown editing ... Save saves markdown and updates the xml	2013-01-08 10:53:45 -05:00