1298 Commits

Author	SHA1	Message	Date
Chris Dodge	1240325c69	Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page ... Conflicts: cms/static/js/base.js	2012-10-03 16:24:38 -04:00
Chris Dodge	5390a19fc0	delete unit in overview and subsection_edit pages	2012-10-03 16:19:14 -04:00
Calen Pennington	a6cf7cb0c2	Merge pull request #817 from MITx/feature/tomg/cms-library ... Feature/tomg/cms library	2012-10-03 12:21:55 -07:00
Calen Pennington	55d6aff4c1	Wire up the unit location display	2012-10-03 14:54:17 -04:00
Calen Pennington	d80c931772	Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module)	2012-10-03 14:24:11 -04:00
chrisndodge	153d5d69b1	Merge pull request #814 from MITx/feature/cale/cas-reorder-unit ... Enable reordering on the unit page	2012-10-03 11:22:57 -07:00
Chris Dodge	711dc55c73	add subsection edit page to the project with a shared 'unit' widget that will render out unit lists. Both edit_subsection and overview.html will share this widget	2012-10-03 14:16:23 -04:00
Chris Dodge	ca3aecd6ad	add subsection edit page to the project with a shared 'unit' widget that will render out unit lists. Both edit_subsection and overview.html will share this widget	2012-10-03 14:07:21 -04:00
Calen Pennington	bd7ea4424b	Enable reordering on the unit page	2012-10-03 13:24:24 -04:00
Chris Dodge	a0b3fb0ec5	Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page	2012-10-03 12:40:55 -04:00
Tom Giannattasio	e7db2b5571	static asset library template	2012-10-03 11:27:15 -04:00
Chris Dodge	e24dcaead6	initial subsection page converted from static HTML mockup	2012-10-03 10:44:20 -04:00
Tom Giannattasio	f2be01fd8f	removed visibility toggles; added private tag	2012-10-03 09:48:50 -04:00
Tom Giannattasio	44d4a4b0d9	started asset library template -wip	2012-10-02 17:02:47 -04:00
Chris Dodge	a570702ae3	add a new subsection edit url map and reference it in the course summary page	2012-10-02 16:22:26 -04:00
Calen Pennington	f637cc5723	Merge pull request #800 from MITx/feature/tomg/cms-release-flow ... private/public unit	2012-10-02 09:15:28 -07:00
Calen Pennington	aff44b1f11	Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ... Conflicts: cms/djangoapps/contentstore/views.py	2012-10-02 12:12:55 -04:00
Tom Giannattasio	76559af8f1	added wip tag to unit settings	2012-10-02 10:50:23 -04:00
Tom Giannattasio	423dbd17b5	new unit publish settings	2012-10-02 10:40:05 -04:00
chrisndodge	d108af8848	Merge pull request #799 from MITx/feature/cale/cms-codemirror-background ... Feature/cale/cms codemirror background	2012-10-02 07:10:29 -07:00
Calen Pennington	55542c1d47	Make editor display immediately, and with a white background	2012-10-02 09:42:19 -04:00
Calen Pennington	2accc77944	Adding more WIP	2012-10-02 09:22:00 -04:00
Tom Giannattasio	8478f7af64	styled course list page	2012-10-01 16:37:24 -04:00
Tom Giannattasio	8f0b068459	styled log in form	2012-10-01 16:30:28 -04:00
Tom Giannattasio	265ab4366f	removed visibility toggle from subsections in overview	2012-10-01 16:15:19 -04:00
Tom Giannattasio	d2549b6346	fixed header styles	2012-10-01 16:11:04 -04:00
Tom Giannattasio	4d985dc0c7	added release button; cleaned up toggle button	2012-10-01 15:51:29 -04:00
Calen Pennington	60e7914580	Add WIP markers	2012-10-01 15:28:12 -04:00
Calen Pennington	aa0aa65301	Clean up unit.html with layout/css from tom	2012-10-01 15:28:12 -04:00
Calen Pennington	96a914216c	Fix up overview page with new design mockup	2012-10-01 15:28:12 -04:00
Calen Pennington	bfeccd88f8	Enable creation of new components	2012-10-01 15:28:07 -04:00
Calen Pennington	805798600b	Clean up display of templates	2012-10-01 15:19:35 -04:00
Calen Pennington	8ca10a8356	Separate unit page from vertical implementation for editing	2012-10-01 15:19:35 -04:00
Calen Pennington	82a28f069d	Make overview page conform to section/subsection/unit format. Breaks CMS editing of existing courses	2012-10-01 15:18:50 -04:00
Calen Pennington	ff002e35c2	Limit the depth of items to display on the overview	2012-10-01 15:17:41 -04:00
Calen Pennington	f53217e523	Add padding around courseware content	2012-10-01 15:17:40 -04:00
Calen Pennington	8a131446fe	First pass at integrating the new unit editing wireframes with the CMS	2012-10-01 15:17:40 -04:00
Calen Pennington	c0ca7fe697	Make expansion/contraction work on overview page	2012-10-01 15:16:54 -04:00
Calen Pennington	d534855b54	Make the overview page pull data from the db, rather than static content	2012-10-01 15:16:30 -04:00
Chris Dodge	27016465f4	support some simple authorization scheme to view/edit courses	2012-10-01 15:13:19 -04:00
Calen Pennington	ea8ab0f809	Add basic overview.html from tom's wireframe to CMS	2012-10-01 15:12:29 -04:00
Chris Dodge	84a0603754	shimmy around the upload_asset widget to at least not mess up the edit unit rendering. Now it'll always be at the bottom	2012-09-28 11:42:11 -04:00
Chris Dodge	adad3c550b	Support asset library references in CapaModule. Also some code refactoring/cleanup. Preparing for review and submit	2012-09-27 12:31:45 -04:00
Chris Dodge	39e64c1e56	work in progress. Need to commit before rebasing to master	2012-09-27 10:24:53 -04:00
Chris Dodge	7512b78eb2	work-in-flight for uploading/serving of static content for courses	2012-09-27 10:24:53 -04:00
Chris Dodge	85e6c23386	work-in-flight for uploading/serving of static content for courses	2012-09-27 10:24:53 -04:00
Calen Pennington	2554413291	Hook up link to create modules from templates	2012-09-25 10:10:44 -04:00
Calen Pennington	eb20e47160	Remove drag-and-drop handles from navigation until we actually are going to enable them	2012-09-25 10:10:44 -04:00
Calen Pennington	2223d2007b	Only display the LMS link if it's set up, and don't error if it isn't	2012-09-25 09:18:54 -04:00
Calen Pennington	c7209a736e	Add links from the editing page for the cms to the corresponding page in the lms	2012-09-25 09:18:54 -04:00