Commit Graph

1595 Commits

Author SHA1 Message Date
Chris Dodge
d57aa31545 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-09 10:32:17 -04:00
Chris Dodge
20a8395f4f add/remove policy data from subsection 2012-10-09 10:32:12 -04:00
Tom Giannattasio
446915189f added toast notification styles and basic js implementation 2012-10-09 09:15:10 -04:00
Calen Pennington
5df71a0c3e Merge pull request #836 from MITx/feature/tomg/cms-ff-styles
cross-browser css3
2012-10-09 06:10:10 -07:00
Calen Pennington
97fb8be6ba Merge pull request #832 from MITx/feature/cdodge/subsection-edit-page
Feature/cdodge/subsection edit page
2012-10-09 06:08:15 -07:00
Chris Dodge
ef1fb321b8 allow for adding/deleting of new 'policy' metadata in the edit subsection page 2012-10-08 16:46:25 -04:00
Chris Dodge
530f6a65c1 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-08 11:38:29 -04:00
Chris Dodge
d55769861e check if 'delete metadata field' is not in the list of system metadata 2012-10-05 14:45:07 -04:00
Chris Dodge
95e15c4455 time/date setting on Release Date and Due date 2012-10-05 13:17:51 -04:00
Tom Giannattasio
24247dc0b9 cross-browser css3 2012-10-05 10:29:36 -04:00
Chris Dodge
758c446929 wip on setting date/times on subsection page 2012-10-05 09:56:07 -04:00
Tom Giannattasio
842306addd updated styles and template for unit location tree 2012-10-05 09:18:10 -04:00
Tom Giannattasio
fbae5d9e71 fixed courseware overview search positioning 2012-10-04 17:08:19 -04:00
Tom Giannattasio
61ea9d3678 fixed log in header and overview search 2012-10-04 17:08:19 -04:00
Tom Giannattasio
ebd3f28de8 added padding to xmodule units 2012-10-04 17:08:19 -04:00
Chris Dodge
fe42f6fd22 address pull request feedback 2012-10-04 14:00:25 -04:00
Chris Dodge
48d84c2e3d support reordering of units inside subsection list 2012-10-04 13:44:46 -04:00
Chris Dodge
d93bf63dff save display_name and subtitle metadata 2012-10-04 13:05:45 -04:00
Chris Dodge
322c4c0ba6 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/templates/widgets/units.html
2012-10-04 11:03:37 -04:00
Chris Dodge
45b82f3a45 update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element 2012-10-04 10:58:48 -04:00
chrisndodge
ab7377dc98 Merge pull request #819 from MITx/feature/cale/cas-unit-location-view
Wire up the unit location display
2012-10-04 07:57:11 -07:00
Tom Giannattasio
92e830df24 more explicit temporary status on landing page 2012-10-04 10:37:46 -04:00
Tom Giannattasio
cd64f92171 h1 float fix 2012-10-03 17:27:42 -04:00
Tom Giannattasio
145be8c895 added landing styles 2012-10-03 17:26:14 -04:00
Tom Giannattasio
249d25204b added temp labs logo 2012-10-03 17:26:14 -04:00
Tom Giannattasio
6b4d9ba0cd setup landing template 2012-10-03 17:26:14 -04:00
Tom Giannattasio
5a26dd7eba removed extraneous border on log in extras 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
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
Calen Pennington
bd7ea4424b Enable reordering on the unit page 2012-10-03 13:24:24 -04:00
Tom Giannattasio
df385bc559 modal close butotn icon 2012-10-03 11:27:32 -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
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
Tom Giannattasio
44d4a4b0d9 started asset library template -wip 2012-10-02 17:02:47 -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
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
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
Tom Giannattasio
8478f7af64 styled course list page 2012-10-01 16:37:24 -04:00