Commit Graph

6956 Commits

Author SHA1 Message Date
kimth
cbd602b40d Moving toggle code. wip 2012-09-29 16:03:17 -07:00
kimth
c8964b800b Create jsloader.coffee 2012-09-29 15:14:18 -07:00
Calen Pennington
9c859fd925 Merge pull request #780 from MITx/feature/cdodge/cms-static-content-management
Feature/cdodge/cms static content management
2012-09-29 07:39:50 -07:00
Bridger Maxwell
2e4ea1d49c Added docstring for show_only_average parameter. 2012-09-28 23:19:46 -04:00
Bridger Maxwell
fc73916e05 Removed django.conf.settings dependency from graders. 2012-09-28 23:14:55 -04:00
Bridger Maxwell
a99d7f7c4a Fixed settings.GENERATE_PROFILE_SCORES for debugging progress graph. 2012-09-28 21:48:41 -04:00
Bridger Maxwell
8ba8504466 Added option to only show average of a section format grader. 2012-09-28 12:47:12 -04:00
Tom Giannattasio
33f0176c33 added problem collapsibles 2012-09-28 12:09:38 -04:00
Tom Giannattasio
8d44e6a3db added html collapsibles 2012-09-28 12:06:29 -04:00
Chris Dodge
1ee7646cfc per feedback, use reverse() when generating callback urls. Also generate thumbnails when ingesting static images. We'll need these handy for the CMS UI. 2012-09-28 10:20:57 -04:00
Calen Pennington
bc947c5e4e Merge pull request #776 from MITx/lyla/cms-templates
Lyla/cms templates
2012-09-28 05:55:39 -07:00
kimth
f93115ee4d Merge pull request #778 from MITx/hotfix/arjun/mc_style
Fixes multiple choice styling
2012-09-27 13:41:20 -07:00
Arjun Singh
71923e7c1f Add block display back for text 2012-09-27 13:31:08 -07:00
Chris Dodge
adad3c550b Support asset library references in CapaModule. Also some code refactoring/cleanup. Preparing for review and submit 2012-09-27 12:31:45 -04:00
Chris Dodge
39e64c1e56 work in progress. Need to commit before rebasing to master 2012-09-27 10:24:53 -04:00
Chris Dodge
7bf7eab616 support client-side caching through 'Last-Modified' response headers 2012-09-27 10:24:53 -04:00
Chris Dodge
7512b78eb2 work-in-flight for uploading/serving of static content for courses 2012-09-27 10:24:53 -04:00
Chris Dodge
85e6c23386 work-in-flight for uploading/serving of static content for courses 2012-09-27 10:24:53 -04:00
Arjun Singh
81bd0baf08 Fix multiple choice style and multiple choice show answer style 2012-09-27 02:24:01 -07:00
Lyla Fischer
949f638dd1 added several problem types 2012-09-26 17:31:33 -04:00
Lyla Fischer
c1c7d3a1db added basic problem types 2012-09-26 16:13:16 -04:00
Calen Pennington
7e0b087b97 Remove unused reference to EditingDescriptor 2012-09-25 15:47:12 -04:00
Calen Pennington
7998b4fea6 Fix editing of html modules that broke with changes to EditingDescriptor 2012-09-25 15:46:57 -04:00
Lyla Fischer
3cbb8ed27c fixed sequence template 2012-09-25 15:16:30 -04:00
Lyla Fischer
5478416a42 fixed lack-of-yaml in html template 2012-09-25 14:02:25 -04:00
Lyla Fischer
1aa51a5eb9 basic templates for video, html, discussion, and sequential 2012-09-25 13:47:45 -04:00
Calen Pennington
7f6196c835 Add an example sequence template 2012-09-25 10:10:45 -04:00
Calen Pennington
5410e161f9 Switch template definitions to yaml, so that they can have multiline strings 2012-09-25 10:10:45 -04:00
Calen Pennington
022e27e1a2 Add docstrings to xmodule.templates.py 2012-09-25 10:10:44 -04:00
Calen Pennington
5e0f0be1be Fix up ErrorDescriptor._construct, and use in in ErrorDescriptor.from_json 2012-09-25 10:10:44 -04:00
Calen Pennington
bf4ae6b7e6 Load modules from the mongo modulestore as errordescriptors if creating a regular descriptor fails, but leave the location the same 2012-09-25 10:10:44 -04:00
Calen Pennington
d4377d4ada Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS 2012-09-25 10:10:44 -04:00
Calen Pennington
3107bb9c45 Make separate json and xml editing interfaces 2012-09-25 10:10:44 -04:00
Calen Pennington
e9358f0e4e Make ErrorDescriptor continue to use the interface for __init__ that XModuleDescriptor uses, while providing a helper function for constructing from a different set of arguments 2012-09-25 10:10:44 -04:00
Calen Pennington
b69edcd869 Pass org and course through ErrorDescriptor.from_xml to ErrorDescriptor.__init__ 2012-09-25 10:10:44 -04:00
Calen Pennington
d8736914d4 Display an error descriptor for a preview when a descriptor can be loaded but a module can't 2012-09-25 10:10:44 -04:00
Calen Pennington
7d8095cd97 Initial port of templates into filesystem based storage 2012-09-25 10:10:44 -04:00
Calen Pennington
2554413291 Hook up link to create modules from templates 2012-09-25 10:10:44 -04:00
Calen Pennington
912d6cd6f1 Move common code for updating modules in mongo to a single helper function that also handles creating the item if it doesn't already exist 2012-09-25 10:10:44 -04:00
Calen Pennington
9c5b0ba6ea Create the data dir to put files in, if it doesn't exist when loading a module from mongo 2012-09-25 10:10:44 -04:00
Calen Pennington
335b4bb04b Add method to find courses that contain a particular module location 2012-09-25 09:23:07 -04:00
Calen Pennington
71f39bc4c0 Merge pull request #751 from MITx/cdodge/meta-data-cms-editing
Cdodge/meta data cms editing
2012-09-25 06:16:51 -07:00
Chris Dodge
a85b255271 Define 'system metadata' which should not be editable by the end user. When posting back metadata edits, we need to fetch a copy of the existing metadata and apply the changes. 2012-09-24 16:54:46 -04:00
Victor Shnayder
0b40e75166 Fix login-if-?next behavior
* for more context, see https://basecamp.com/1892446/projects/631155-devops/messages/4719963-strange-caching
2012-09-23 22:33:20 -04:00
Victor Shnayder
450a20228d more info 2012-09-21 17:49:10 -04:00
Victor Shnayder
8d0cc1007a add a debug_request view that prints the request. 2012-09-21 16:51:49 -04:00
Chris Dodge
a3bf3fb1ca Put SequenceDescriptor back as a subclass of MakeModuleDescriptor. THe previous change to have it derive from EditorDescriptor was not safe as EditorDescriptor presumes that there is a edit box in the JS save flows. So we need to edit get_context() on MakoModuleDescriptor to also pass along the metadata to the Mako rendering templates 2012-09-21 15:49:07 -04:00
Chris Dodge
4b6eabec5f Support editing of metadata on Sequences 2012-09-21 14:29:19 -04:00
Chris Dodge
d51f127afa work-in-progress: As a problem author, I would like to be able to edit module metadata 2012-09-21 14:29:19 -04:00
Chris Dodge
0a7dfca0e4 Fix JSON postback error where the content-type header line can contain more info than just the application/json descriptor. Now we just to a compare on the start of the header value. 2012-09-21 14:25:48 -04:00