Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Brian Talbot
70457176f1
studio - stubbed in basic LMS styling to HTML displaygst
2013-01-17 21:28:14 -05:00
cahrens
b6fcf3a51e
Some refactoring from Brian's submission.
2013-01-17 10:36:04 -05:00
Brian Talbot
ed6134ea11
abstracted out common editor styles shared by problem and html editors
2013-01-15 14:14:31 -05:00
cahrens
db9875758f
Saving work.
2013-01-14 15:41:12 -05:00
Chris Dodge
e70db062b2
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
...
Conflicts:
requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
c0f12e69f7
fixes on the export. There's some attributes not being handled correctly
2012-12-27 16:15:52 -05:00
Calen Pennington
c917725ff0
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/static/sass/course.scss
requirements.txt
2012-12-07 11:17:41 -05:00
Brian Wilson
dfb9913100
clean up lms tests, and fix export/import
2012-12-04 11:52:35 -05:00
Brian Wilson
4ebd70dcc4
add support for utf8 in sequences, verticals and custom modules.
2012-12-04 03:54:36 -05:00
Brian Wilson
1d44ebb10c
Add more non-ascii characters to full dataset, and make fixes in xmodule code.
2012-12-03 16:22:25 -05:00
Brian Wilson
0c1ebd8dfb
add toylab test data and test changes, including fix to jump_to
2012-11-30 19:05:26 -05:00
Brian Wilson
6a24ecebe7
decode utf-8 when reading html, and encode when writing.
2012-11-28 17:54:18 -05:00
Chris Dodge
9cc1af5052
first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course
2012-11-07 15:27:44 -05:00
Chris Dodge
743f2b56dd
make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting
2012-10-30 15:12:13 -04:00
Calen Pennington
b52ed48221
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
2012-10-23 13:38:11 -04:00
Chris Dodge
84bc81f7eb
refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page.
2012-10-03 09:07:09 -04:00
arjun810
f627c9e9c1
Merge pull request #791 from MITx/kimth/js-refactor
...
Kimth/js refactor
2012-10-02 19:47:20 -07:00
kimth
845b921ca1
Missing comma
2012-10-02 15:42:22 +00:00
kimth
ed55e4ae2f
Move collapsible back into xmodule
2012-10-02 15:41:38 +00: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
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
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
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
Calen Pennington
7998b4fea6
Fix editing of html modules that broke with changes to EditingDescriptor
2012-09-25 15:46:57 -04:00
Lyla Fischer
1aa51a5eb9
basic templates for video, html, discussion, and sequential
2012-09-25 13:47:45 -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
Victor Shnayder
f81f94ec67
Allow location url_names to contain ':', mapping to / on file load
...
* New format: {tag}://{org}/{course}/{category}/{name}[@{revision}]
* Updated tests, code
* Added test chapter with : in url_name in toy course
* added test html page with : in url_name
* added a note to docs
2012-08-27 11:37:22 -04:00
Victor Shnayder
d3f1f0f8b6
comment out debug messages
2012-08-21 16:09:48 -04:00
Victor Shnayder
7e69c35735
fix another backcompat html bug
2012-08-16 17:58:10 -04:00
Victor Shnayder
1ae71313bc
fix html rendering bug
2012-08-16 16:53:29 -04:00
Bridger Maxwell
735488fa51
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
2012-08-07 14:40:37 -04:00
Bridger Maxwell
f872e41d1d
Added descriptor to xmodule init. Now xmodules have pointer to their descriptor.
2012-08-07 13:43:30 -04:00
Victor Shnayder
47b9441af5
a few pep8 cleanups
2012-08-07 11:06:47 -04:00
Victor Shnayder
e6e290f525
Make initial import-export tests pass.
...
TODO:
* need unique slugs for errors so they don't overwrite each other on export.
- try to preserve origin slug. If not possible, generate random one.
* figure out what metadata to strip. e.g.
({'data': '<problem><p><h1>Finger Exercise 1...'},
{'data': '<problem points="1" type="lecture"><p><h1>Finger Exercise 1...'},
False)
- where did points and type come from? Do we want them there?
* separate broken and non-broken test courses
2012-08-07 11:06:47 -04:00
Victor Shnayder
d09e2261f3
New file structure--everything in own file
...
* needed for CMS performance (can now save just an item, not whole tree)
* remove split_to_file methods
* simplified AttrMap logic
* write each descriptor to a separate file
* detect format on import and adjust appropriately.
* update tests
2012-08-07 11:06:46 -04:00
ichuang
3c23235885
fix for some broken github edit links - avoids symlinks
2012-08-05 11:39:56 -04:00
ichuang
7fe75030cc
fix staff edit link in module content display (goes to github)
2012-08-04 17:52:14 -04:00
Victor Shnayder
b46172da9b
Rename module.name and descriptor.name to url_name
...
* update templates and code references
* also a display_name property that defaults to cleaned url_name
2012-08-03 11:36:54 -04:00
Victor Shnayder
41eca8a0a5
Move files into xmodule module per comment on #326
...
* move html_checker.py
* move stringify.py
* move tests into module
* remove duplicate progress.py
* fix module imports
2012-08-02 10:13:58 -04:00
Victor Shnayder
7fb831a2e8
Record warning on bad html files
2012-08-01 11:48:19 -04:00
Victor Shnayder
32253510d1
Import error cleanup
...
* call error tracker when needed
* remove duplicate logging--just add info and re-raise
* xml modulestore uses error tracker to capture load errors
* add unstyled list of import errors to courseware homepage!
2012-08-01 11:48:19 -04:00
Victor Shnayder
0ae434cc09
Move path_to_location out of mongo.py
...
* also bugfix for load_definition in html_module
* a bit of refactoring of Location checking code in mongo.py
2012-08-01 11:40:12 -04:00
Victor Shnayder
ed35cefa29
Fix html file handling.
...
* html files are now stored as follows:
If the html file is valid xml, store as html/stuff.xml
If it's not, store as html/stuff.xml, which contains
<html meta1="..." filename="stuff.html">,
and html/stuff.html, which actually contains the contents.
Warn if the contents are not parseable with lxml's html parser,
but don't error.
* for parseable html, strip out the html tag when storing, so that it isn't
rendered into the middle of a page
* lots of backcompat to deal with paths. Can go away soon.
* fix output ordering in clean_xml
2012-08-01 11:40:12 -04:00
Victor Shnayder
3c3bbd114e
minor formatting tweaks
2012-07-27 16:08:24 -04:00
Victor Shnayder
94ac61ffe2
Make decision about export file splitting overrideable
...
* create split_to_file() function
* chapters, html, problems always split
* course never split
* others based on size of subtree for now
2012-07-27 16:08:22 -04:00
