Commit Graph

9300 Commits

Author SHA1 Message Date
kimth
ed55e4ae2f Move collapsible back into xmodule 2012-10-02 15:41:38 +00:00
Calen Pennington
b305c0bae2 Make drag/drop save content immediately in seqs and verticals 2012-10-01 15:17:41 -04:00
Calen Pennington
fd7223bd87 Make editing work, building towards drag/drop saving 2012-10-01 15:17:41 -04:00
Calen Pennington
b91c2b6680 Add sequence and vertical js modules that add drag and drop 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
05b9e6cab2 Standardize more of css between lms and cms 2012-10-01 15:17:40 -04:00
Calen Pennington
4381674ec5 Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms 2012-10-01 15:17:40 -04:00
Calen Pennington
4ad22559c4 Standardize on the bourbon clearfix mixin for video player clearfixes 2012-10-01 15:17:40 -04:00
Calen Pennington
44805ca383 Make discussion js work for cms as well as lms so that inline discussion xmodules load 2012-10-01 15:16:54 -04:00
Arjun Singh
a8acb7ff30 Renamed jsloader to match up with the content more explicitly; refactored Collapsible out into its own library 2012-10-01 03:03:33 -07:00
Victor Shnayder
d424fb8332 make codemirror use visible tabs
* this may not be optimal (compared to e.g. replacing tabs with spaces), but it's a lot better than mystery 'bad indentation' errors
2012-09-30 19:18:56 -04:00
Victor Shnayder
af6dd84af0 Merge pull request #789 from MITx/feature/bridger/course_grading
Feature/bridger/course grading
2012-09-30 11:52:36 -07:00
Bridger Maxwell
4ee0e258ea Refactored a bit of the generating scores code. 2012-09-30 14:48:20 -04:00
kimth
680934045f Adjust comments 2012-09-29 21:39:48 -07:00
kimth
c3abeff8d4 Another TODO comment 2012-09-29 21:28:04 -07:00
kimth
7b8750ab69 HTML modules can also run script_placeholder 2012-09-29 19:05:48 -07:00
kimth
4acd8b9fe1 Further explanation to TODO 2012-09-29 18:54:17 -07:00
kimth
faa35f95cc Move executeProblemScripts into executeModuleScripts 2012-09-29 18:53:24 -07:00
kimth
77af860445 Begin transplant of executeProblemScripts 2012-09-29 18:31:06 -07:00
kimth
8956e5bcb1 Update comment: jsloader works at module-scope 2012-09-29 18:03:59 -07:00
kimth
46598b659c HTML module also uses jsloader 2012-09-29 17:27:06 -07:00
kimth
65b3f58338 jsloader works at module-level 2012-09-29 16:57:23 -07:00
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
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
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