Commit Graph

9424 Commits

Author SHA1 Message Date
Tom Giannattasio
277cc3433c added no-header class to login.html 2012-10-03 17:23:48 -04:00
Tom Giannattasio
222d23dfd3 added class to remove header 2012-10-03 17:23:48 -04:00
Tom Giannattasio
f4ccb335e5 abstracted classes to work for both log in and sign up forms 2012-10-03 17:23:48 -04:00
Tom Giannattasio
d44d9ff2d1 tweaked signup template 2012-10-03 17:23:48 -04:00
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
Calen Pennington
79a7cc9f03 Don't send back a preview when saving an item 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
df385bc559 modal close butotn icon 2012-10-03 11:27:32 -04:00
Tom Giannattasio
e7db2b5571 static asset library template 2012-10-03 11:27:15 -04:00
Tom Giannattasio
3bb5a003bc asset library styles 2012-10-03 11:26:30 -04:00
Tom Giannattasio
6e6ba534f0 upload modal functionality 2012-10-03 11:25:18 -04:00
Chris Dodge
e24dcaead6 initial subsection page converted from static HTML mockup 2012-10-03 10:44:20 -04:00
Calen Pennington
5e7699554e Merge pull request #803 from MITx/feature/tomg/cms-editing
code mirror styling and a few small tweaks
2012-10-03 07:20:52 -07:00
Tom Giannattasio
59c30ecdbc slightly smaller class names 2012-10-03 09:49:13 -04:00
Tom Giannattasio
f2be01fd8f removed visibility toggles; added private tag 2012-10-03 09:48:50 -04:00
Chris Dodge
fb204084a2 for get_all_content_info_for_course(), return a list of the MongoDB query rather than a cursor object. Also add some documentation (in a comment) as to what a caller should expect 2012-10-03 09:24:48 -04:00
Chris Dodge
eb7d6c656c use better encapsulation for the naming convention behind thumbnails. Put it all in content.py rather than view.py. 2012-10-03 09:17:18 -04:00
Chris Dodge
84bc81f7eb refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page. 2012-10-03 09:07:09 -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
70d9721d5b Merge pull request #805 from MITx/fix/cdodge/add-user-admin-permissions
allow 'is_staff' flagged user accounts to run as super-admin, which mean...
2012-10-02 09:56:52 -07:00
Chris Dodge
e3d065a66a allow 'is_staff' flagged user accounts to run as super-admin, which means belonging to all groups 2012-10-02 12:33:05 -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
91eb2cf983 Merge pull request #804 from MITx/fix/cdodge/cms-multiple-edit-save-bug
fix bug with editing HTML. The save() method should now return a diction...
2012-10-02 09:14:41 -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
Chris Dodge
a60ec13d3a fix bug with editing HTML. The save() method should now return a dictionary, not a string 2012-10-02 11:58:24 -04:00
Chris Dodge
425e840e7d in order to avoid using stale modules when editing, clear out the @module variable after a save(). Then on a subsequent edit, it'll get recreated 2012-10-02 11:37:27 -04:00
Chris Dodge
ad7771fe5a always load in a new instance of the edit module. It appeared as though on multiple edits (w/o refreshing page) without creating a new data model, we were always referencing stale content from the previous edit 2012-10-02 11:06:28 -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
chrisndodge
0cb9673b79 Merge pull request #798 from MITx/feature/cale/cms-new-component-ids
Feature/cale/cms new component ids
2012-10-02 07:00:54 -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
Calen Pennington
1d8d82b7fc Set id's on newly created components so that they are immediately editable 2012-10-01 16:06:18 -04:00
Tom Giannattasio
4d985dc0c7 added release button; cleaned up toggle button 2012-10-01 15:51:29 -04:00
Calen Pennington
d3a734d211 Insert new modules in front of the new component box 2012-10-01 15:46:44 -04:00
Calen Pennington
f4b8bfe428 Turn off dumping the course back into git 2012-10-01 15:32:29 -04:00