Chris Dodge
|
84a0603754
|
shimmy around the upload_asset widget to at least not mess up the edit unit rendering. Now it'll always be at the bottom
|
2012-09-28 11:42:11 -04: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
|
7512b78eb2
|
work-in-flight for uploading/serving of static content for courses
|
2012-09-27 10:24:53 -04:00 |
|
Calen Pennington
|
2554413291
|
Hook up link to create modules from templates
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
eb20e47160
|
Remove drag-and-drop handles from navigation until we actually are going to enable them
|
2012-09-25 10:10:44 -04: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 |
|
Chris Dodge
|
e6445ceaa0
|
adjust implementation to reflect feedback from Calen. Also limit the jQuery selection to be within the metadata-edit region, just to avoid picking up other elements decorated with that attribute
|
2012-09-24 13:03:34 -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 |
|
Calen Pennington
|
d7dffb034b
|
Merge pull request #721 from MITx/feature/cale/cms-remove-wips
Feature/cale/cms remove wips
|
2012-09-18 12:44:08 -07:00 |
|
Calen Pennington
|
da4206f170
|
Remove scratch pad ui WIPs, until we decide we actually want it
|
2012-09-18 15:31:32 -04:00 |
|
Calen Pennington
|
07d4f43f80
|
Use display names for module edit links in the cms
|
2012-09-18 15:26:37 -04:00 |
|
Calen Pennington
|
c1ce5a87ac
|
Move sequence nav into xmodule
|
2012-09-18 13:19:01 -04:00 |
|
Victor Shnayder
|
523cb334a0
|
Hook up reordering children in the browser.
* NOTE: the new order is NOT saved to the server!
|
2012-08-08 13:15:05 -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 |
|
Kyle Fiedler
|
b777d2c057
|
Added some more style for cal view and nav bar
|
2012-07-30 09:51:50 -04:00 |
|
Kyle Fiedler
|
9d638d2ac0
|
Added some more style for cal view and nav bar
|
2012-07-30 09:50:25 -04:00 |
|
Calen Pennington
|
2d570f7c54
|
Load preview modules when a cms edit page is opened
|
2012-07-24 16:14:00 -04:00 |
|
Calen Pennington
|
3cdceab16c
|
Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms
|
2012-07-24 16:13:59 -04:00 |
|
Calen Pennington
|
15ac476781
|
Display preview html on the module edit page. Javascript for previews doesn't yet function
|
2012-07-24 15:05:07 -04:00 |
|
Calen Pennington
|
57d8361acb
|
Escape characters from raw xml data going into the text box so that the round-trip doesn't get rid of neccessary xml escaping
|
2012-07-24 15:05:06 -04:00 |
|
Victor Shnayder
|
ddf84d807d
|
add login and logout links to cms header
|
2012-07-16 13:34:04 -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 |
|
Calen Pennington
|
6d246f0685
|
Merge remote-tracking branch 'origin/master' into ps-cms-backbone
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/coffee/unit.coffee
cms/templates/index.html
cms/templates/widgets/sequence-edit.html
|
2012-07-10 08:55:45 -04:00 |
|
Kyle Fiedler
|
389fd7111a
|
Get rid of comments
|
2012-07-09 11:08:07 -04:00 |
|
Kyle Fiedler
|
93f8f7685a
|
Added more wip and fixed issue with after
|
2012-07-09 10:37:37 -04:00 |
|
Kyle Fiedler
|
dbcad03ddd
|
Added some fixes for some small things adn reset the js
|
2012-07-09 10:22:55 -04:00 |
|
Kyle Fiedler
|
c8da987436
|
Added new icons for all of the content
|
2012-07-09 10:04:20 -04:00 |
|
Kyle Fiedler
|
0cb4781e43
|
Rearranged the filter and sort bar and made it consistant
|
2012-07-09 10:04:20 -04:00 |
|
Kyle Fiedler
|
4b43e3474f
|
More tweeks for visual style for the filter bar and settings
|
2012-07-09 10:04:20 -04:00 |
|
Kyle Fiedler
|
f1623ec605
|
Added more tweeks to the calendar and unit pages
|
2012-07-09 10:04:20 -04:00 |
|
Kyle Fiedler
|
94fccb0017
|
Added fixes for the sidebar, made better base style for inputs and brightened colors a bit
|
2012-07-09 10:04:19 -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
|
a9aa5d9ea0
|
Update code base on changes in master
|
2012-07-05 15:25:04 -04:00 |
|
Prem Sichanugrist
|
5c85412dfa
|
Nested subview is working
|
2012-07-05 09:38:51 -04:00 |
|
Prem Sichanugrist
|
a7dc045f36
|
External module loading
|
2012-07-05 09:38:50 -04:00 |
|
Prem Sichanugrist
|
b46f6a6d9c
|
Section editing interface is now working
|
2012-07-05 09:38:50 -04:00 |
|
Kyle Fiedler
|
ffea8e3e7d
|
added more style for unit page, hovers, and buttons
|
2012-07-03 16:19:19 -04:00 |
|
Calen Pennington
|
5b8c3dc1e4
|
Make html a RawDescriptor with a slightly different UI
|
2012-07-02 10:44:50 -04:00 |
|
Calen Pennington
|
e0e42ae8ac
|
Fix up cms after changing html and sequence descriptors to use metadata
|
2012-07-02 10:18:24 -04:00 |
|
Calen Pennington
|
3cf29af8fe
|
Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content
|
2012-07-02 10:17:59 -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
|
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
|
5bef1e14b2
|
Split problem metadata out from problem editing contents when rendering
|
2012-06-22 09:21:09 -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
|
82898978fa
|
Cleanup intertwined descriptor and keystore code
|
2012-06-21 10:59:46 -04:00 |
|