Calen Pennington
|
feef179e3e
|
Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing
Conflicts:
cms/envs/common.py
|
2012-06-29 12:11:35 -04:00 |
|
Calen Pennington
|
919f8cf261
|
Import x_module using the full path
|
2012-06-28 11:28:42 -04:00 |
|
Calen Pennington
|
6fdf44fe8d
|
Make import work via mako again, to unblock others while I work on making the LMS work using XModuleDescriptors
|
2012-06-26 14:35:21 -04:00 |
|
Calen Pennington
|
9983160995
|
Parse more module types as sequence modules
|
2012-06-26 14:29:30 -04:00 |
|
Calen Pennington
|
66ca31947a
|
Remove semantically meaningless sections from course.xml by moving their attributes onto the contained element. If there is more than one contained element, turn the section into a sequence. Also handles includes
|
2012-06-26 14:10:15 -04:00 |
|
Calen Pennington
|
daf3eed4ee
|
Handle unnamed modules during import
|
2012-06-26 12:14:18 -04:00 |
|
Calen Pennington
|
e9a00ffc5a
|
Parse XModuleDescriptors on import using from_xml
Also:
Render all XModuleDescriptors in the cms the same way
Default them to editing raw xml, if there is no specific module for them
|
2012-06-26 11:56:21 -04:00 |
|
Kyle Fiedler
|
863568ec99
|
Added red wip class and added tag for it
|
2012-06-25 11:52:43 -04:00 |
|
Kyle Fiedler
|
656fa38944
|
Added wip class
|
2012-06-25 11:44:06 -04:00 |
|
Kyle Fiedler
|
3081258836
|
Refactored the css and fixed some smaller bugs
|
2012-06-25 11:21:24 -04:00 |
|
Kyle Fiedler
|
5908d844b8
|
Added styles to be more consistant across pages
|
2012-06-25 11:21:24 -04:00 |
|
Calen Pennington
|
83b3d51fd2
|
Wire up the cancel button in the unit editor
|
2012-06-22 10:58:18 -04:00 |
|
Calen Pennington
|
72eef72d8b
|
Html Module can now be editing, saved, and re-opened
|
2012-06-22 10:58:18 -04:00 |
|
Kyle Fiedler
|
f9bb8a701a
|
Added new readme info and started to rework some of the css
|
2012-06-22 09:42:22 -04:00 |
|
Calen Pennington
|
5bef1e14b2
|
Split problem metadata out from problem editing contents when rendering
|
2012-06-22 09:21:09 -04:00 |
|
Calen Pennington
|
17a4d7fd09
|
Call js module name dynamically, rather than statically calling the HTML module
|
2012-06-22 08:59:53 -04:00 |
|
Kyle Fiedler
|
657fcd9984
|
Added new styles for html editing and removed a bunch of unused templates
|
2012-06-21 17:36:21 -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 |
|
Calen Pennington
|
b0e94a5fd3
|
Remove old pre-compiled css
|
2012-06-21 10:59:46 -04:00 |
|
Calen Pennington
|
4cb285f1f9
|
Switch the cms over to using django-pipeline
|
2012-06-21 10:59:46 -04:00 |
|
Calen Pennington
|
eef28891d8
|
Remove reference to instructor module
|
2012-06-21 10:59:46 -04:00 |
|
Calen Pennington
|
82898978fa
|
Cleanup intertwined descriptor and keystore code
|
2012-06-21 10:59:46 -04:00 |
|
Calen Pennington
|
3f3aacae61
|
Remove unused urls
|
2012-06-21 10:59:45 -04:00 |
|
Calen Pennington
|
a41327614c
|
Fix string layout for readability
|
2012-06-21 10:59:45 -04:00 |
|
Calen Pennington
|
e0ba9ca8c0
|
Get rid of references to askbot
|
2012-06-21 10:59:45 -04:00 |
|
Calen Pennington
|
645a190f3a
|
Search for course specifically in navigation view
|
2012-06-21 10:59:45 -04:00 |
|
Calen Pennington
|
7ce4f001d1
|
Conform to new TODO standards
|
2012-06-21 10:59:45 -04:00 |
|
Calen Pennington
|
7fd87f6cd9
|
Remove old template that is no longer relevant
|
2012-06-21 10:59:44 -04:00 |
|
Calen Pennington
|
0abeaffa0e
|
Remove copy/paste instructor module. It was a bad idea anyway. =)
|
2012-06-21 10:59:44 -04:00 |
|
Calen Pennington
|
898e417f0b
|
Delay initializition of the MongoKeyStore until required
|
2012-06-21 10:59:44 -04:00 |
|
Calen Pennington
|
b6514fa5eb
|
Make tests pass when running on cms
|
2012-06-21 10:59:44 -04:00 |
|
Calen Pennington
|
da71515bfa
|
Add categories and XModuleDescriptors for all module types that are used at the top level of a course
|
2012-06-21 10:59:43 -04:00 |
|
Calen Pennington
|
bb2910fce5
|
Read week headings from mongodb
|
2012-06-21 10:59:43 -04:00 |
|
Kyle Fiedler
|
f9b1e42a58
|
Added more styles and markup for sequence
|
2012-06-21 10:59:42 -04:00 |
|
Kyle Fiedler
|
e8b4fc218b
|
Added scratch on the calendar view and added handles on the calendar view
|
2012-06-21 10:59:42 -04:00 |
|
Kyle Fiedler
|
13d8b3dc4a
|
Added more styels to the section view and default section view
|
2012-06-21 10:59:42 -04:00 |
|
Calen Pennington
|
22f5c5c73d
|
Successfully read course children out of mongodb
|
2012-06-21 10:59:42 -04:00 |
|
Kyle Fiedler
|
6ba19953de
|
Continued on week view styles
|
2012-06-21 10:59:42 -04:00 |
|
Kyle Fiedler
|
2666f9bf9f
|
Added sass readme
|
2012-06-21 10:59:41 -04:00 |
|
Calen Pennington
|
03cc78f52e
|
Porting latest changes from ui_prototype
|
2012-06-21 10:59:41 -04:00 |
|
Calen Pennington
|
1516c52544
|
Switch to mako templates
|
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
|
195255cb7a
|
Add contentstore from cms proto as a baseline for importing and views for the cms
|
2012-06-21 10:59:40 -04:00 |
|
Calen Pennington
|
cabcc0c1d9
|
Allow login in the cms, and read a particular course from mongo
|
2012-06-21 10:59:36 -04:00 |
|
Calen Pennington
|
338547343e
|
Get the cms up to the point of rendering a template
|
2012-06-21 10:59:36 -04:00 |
|
Kyle Fiedler
|
28b570cf79
|
Added body class for layout
|
2012-06-20 11:39:55 -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 |
|
Calen Pennington
|
cc22125971
|
Remove old pre-compiled css
|
2012-06-19 14:30:19 -04:00 |
|
Calen Pennington
|
cac53cf1a0
|
Switch the cms over to using django-pipeline
|
2012-06-19 14:30:19 -04:00 |
|
Calen Pennington
|
b91a1d48b6
|
Remove reference to instructor module
|
2012-06-19 11:44:54 -04:00 |
|