489 Commits

Author	SHA1	Message	Date
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
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
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	993d59b230	Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor	2013-01-10 13:50:57 -05:00
cahrens	58837066b0	A couple renames.	2013-01-10 13:50:21 -05:00
Christina Roberts	a7887721af	Merge pull request #1255 from MITx/bug/btalbot/unit-editing ... Moving Static Component View Under Modal While Editing	2013-01-10 10:35:31 -08:00
Brian Talbot	4128f37a1f	studio - moving a component's static view visually below modal while editing	2013-01-10 13:18:26 -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
Don Mitchell	d1c888b119	Put init code in a document ready event handler.	2013-01-09 16:37:45 -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	31f9084b61	Tom cruft to be deleted.	2013-01-09 11:12:52 -05:00
cahrens	b704645f99	Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor	2013-01-09 09:40:34 -05:00
cahrens	b97955965a	Warn user when going to XML Editor. Cleanup and comments.	2013-01-09 09:39:46 -05:00
Brian Talbot	2a1e102fca	studio - resolving merge conflict with cms/templates/unit.html	2013-01-09 08:56:58 -05:00
Brian Talbot	f60a9d8d35	studio - problem speed editor: tweaking presentation of problem sub menu further	2013-01-09 08:54:40 -05:00
Brian Talbot	75447eb80d	studio - problem speed editor: revised html and DOM for problem sub menu	2013-01-08 15:43:02 -05:00
cahrens	c7feee5b67	Delete speed-editor.js and cruft from unit.html.	2013-01-08 15:39:45 -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	6e2b4a07d8	Added is_empty to model presented to unit.html	2013-01-08 11:18:57 -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
Don Mitchell	12abdbce73	Added 'has_markdown' property to templates in unit.html so that we can ... differentiate them in the drop down (just added MD to names for now--brian's doing the official differentiation)	2013-01-07 10:55:10 -05:00
Brian Talbot	ce4994dd94	studio - revised course overview section collapse button to toggle collapsing/expanding	2013-01-04 13:27:59 -05:00
cahrens	533f4876b5	Rename, add css file.	2013-01-03 14:27:32 -05:00
cahrens	b4312cbfef	Starting the markdown editor.	2013-01-03 13:39:01 -05:00
cahrens	e09a8e4a9b	Don't show markdown if it doesn't exist.	2013-01-03 12:50:38 -05:00
cahrens	1c886b33cd	Get buttons working again (with old behavior).	2013-01-03 12:24:17 -05:00
cahrens	e60230dd5a	More deletion	2013-01-03 11:21:01 -05:00