Commit Graph

6510 Commits

Author SHA1 Message Date
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
d55769861e check if 'delete metadata field' is not in the list of system metadata 2012-10-05 14:45:07 -04:00
Calen Pennington
0ef56bb06c Merge pull request #830 from MITx/feature/tomg/cms-style-cleanup
Random style updates
2012-10-05 11:06:06 -07:00
Chris Dodge
95e15c4455 time/date setting on Release Date and Due date 2012-10-05 13:17:51 -04:00
Chris Dodge
758c446929 wip on setting date/times on subsection page 2012-10-05 09:56:07 -04:00
Tom Giannattasio
1e68123e09 fixed sign up to log in text 2012-10-05 09:21:20 -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
3b38070d38 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-04 14:54:50 -04:00
Chris Dodge
c3aa86f1fb remove template_dir_name from Vertical and Sequence descriptors so that it uses the default template dir 2012-10-04 14:53:43 -04:00
Calen Pennington
580164e192 Merge pull request #826 from MITx/feature/cdodge/subsection-edit-page
Feature/cdodge/subsection edit page
2012-10-04 11:01:37 -07: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
29c142e3dc need to wire through the new unit template location to the edit unit page 2012-10-04 11:09:28 -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
Calen Pennington
612e5fe8c4 Merge pull request #822 from MITx/feature/tomg/labs-signup
added course page with log in and sign up
2012-10-04 07:55:27 -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
ea1b7caf47 consistent field labels 2012-10-03 17:23:48 -04:00
Tom Giannattasio
5a26dd7eba removed extraneous border on log in extras 2012-10-03 17:23:48 -04:00
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
35d1966d9a Merge pull request #813 from MITx/feature/cdodge/asset-id-change
add a 'safety switch' where we add new content into GridFS with a filena...
2012-10-03 11:29:16 -07:00
chrisndodge
baaafb9df4 Merge pull request #815 from MITx/feature/cale/cas-component-delete
Feature/cale/cas component delete
2012-10-03 11:27:37 -07: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
Calen Pennington
2412885e95 Merge pull request #816 from MITx/feature/cdodge/subsection-edit-page
Feature/cdodge/subsection edit page
2012-10-03 11:19:24 -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
Chris Dodge
ebf6d07607 add a 'safety switch' where we add new content into GridFS with a filename (which GridFS maintains an index on) in case any assumptions about our new id scheme proves to be false. We can query by filename (which is a /tag/org/course/category/name format) so it'll be unique 2012-10-03 12:36:35 -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