Commit Graph

39 Commits

Author SHA1 Message Date
Tom Giannattasio
446915189f added toast notification styles and basic js implementation 2012-10-09 09:15:10 -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
Chris Dodge
758c446929 wip on setting date/times on subsection page 2012-10-05 09:56:07 -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
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
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
bd7ea4424b Enable reordering on the unit page 2012-10-03 13:24:24 -04:00
Tom Giannattasio
6e6ba534f0 upload modal functionality 2012-10-03 11:25:18 -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
bfeccd88f8 Enable creation of new components 2012-10-01 15:28:07 -04:00
Calen Pennington
8ca10a8356 Separate unit page from vertical implementation for editing 2012-10-01 15:19:35 -04:00
Calen Pennington
fd7223bd87 Make editing work, building towards drag/drop saving 2012-10-01 15:17:41 -04:00
Calen Pennington
ce3638538c Make inline editing save to mongo and then update the preview 2012-10-01 15:17:41 -04:00
Calen Pennington
dc062f5668 Make edit and delete buttons show up on cms unit editing page 2012-10-01 15:17:41 -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
87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware 2012-07-24 16:14:03 -04:00
Calen Pennington
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
Victor Shnayder
ff59c9bfa9 Initial connection of student module with cms.
* Enable account creation
* Some code cleanups
* Fix access to nonexistent fields in the account creation view
* Formatting fixes
2012-07-13 11:51:32 -04:00
Calen Pennington
fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
2012-07-10 13:39:19 -04:00
Prem Sichanugrist
9dc5cddeb7 Move vendored js files into js/vendor/ 2012-07-06 12:07:21 -04:00
Prem Sichanugrist
a77e7fe57b Update jasmine-jquery for newer features 2012-07-05 23:31:36 -04:00
Prem Sichanugrist
f60af340ea Add Jasmine suite to CMS 2012-07-05 18:44:56 -04:00
Calen Pennington
9d1dc37b44 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
Conflicts:
	cms/djangoapps/contentstore/management/commands/import.py
	cms/djangoapps/contentstore/views.py
	cms/envs/common.py
	cms/envs/dev.py
	cms/envs/test.py
	cms/static/sass/README.txt
	cms/static/sass/_base.scss
	cms/static/sass/_calendar.scss
	cms/static/sass/base-style.scss
	cms/templates/base.html
	cms/templates/index.html
	cms/templates/widgets/header.html
	cms/templates/widgets/module-dropdown.html
	cms/templates/widgets/navigation.html
	cms/templates/widgets/problem-edit.html
	cms/urls.py
	common/djangoapps/pipeline_mako/__init__.py
	common/djangoapps/util/views.py
	common/lib/capa/capa_problem.py
	common/lib/capa/templates/textinput_dynamath.html
	common/lib/mitxmako/middleware.py
	common/lib/mitxmako/shortcuts.py
	common/lib/mitxmako/template.py
	common/lib/xmodule/capa_module.py
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/test_files/symbolicresponse.xml
	common/lib/xmodule/test_files/test_files/symbolicresponse.xml
	common/lib/xmodule/tests/__init__.py
	common/lib/xmodule/tests/test_files/symbolicresponse.xml
	common/lib/xmodule/vertical_module.py
	common/lib/xmodule/video_module.py
	common/lib/xmodule/x_module.py
	lms/djangoapps/courseware/content_parser.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/static/coffee/spec/helper.coffee
	lms/static/coffee/spec/modules/video/video_player_spec.coffee
	lms/static/coffee/spec/modules/video/video_volume_control_spec.coffee
	lms/static/coffee/src/modules/problem.coffee
	lms/static/coffee/src/modules/sequence.coffee
	lms/static/coffee/src/modules/video/video_player.coffee
	lms/static/coffee/src/modules/video/video_volume_control.coffee
	lms/static/js/vendor/jquery-1.6.2.min.js
	lms/static/js/vendor/jquery-ui-1.8.16.custom.min.js
	lms/static/sass/application.scss
	lms/static/sass/courseware/_sequence-nav.scss
	lms/static/sass/courseware/_video.scss
	lms/templates/main.html
	lms/urls.py
	rakefile
	requirements.txt
2012-07-05 16:22:50 -04:00
Prem Sichanugrist
21734eb919 Add Backbone to the project 2012-07-05 09:38:50 -04:00
Calen Pennington
72eef72d8b Html Module can now be editing, saved, and re-opened 2012-06-22 10:58:18 -04:00
Calen Pennington
69290c18c3 Live editing of html modules implemented, but no saving to the backend 2012-06-21 15:33:52 -04:00
Kyle Fiedler
6ba19953de Continued on week view styles 2012-06-21 10:59:42 -04:00
Calen Pennington
03cc78f52e Porting latest changes from ui_prototype 2012-06-21 10:59:41 -04:00
Calen Pennington
bfc04665aa Add templates directly from cms_proto/ui_prototype 2012-06-21 10:59:41 -04:00
Calen Pennington
1853b99861 Work in progress editing. Committing to allow kfiedler to work in parallel 2012-06-20 11:14:25 -04:00
Kyle Fiedler
3eb7c69b23 Continued on week view styles 2012-06-14 11:55:49 -04:00
Calen Pennington
f2080fde62 Porting latest changes from ui_prototype 2012-06-13 14:43:01 -04:00
Calen Pennington
a333612cce Add templates directly from cms_proto/ui_prototype 2012-06-13 11:54:17 -04:00