cahrens
b704645f99
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 09:40:34 -05:00
cahrens
b97955965a
Warn user when going to XML Editor. Cleanup and comments.
2013-01-09 09:39:46 -05:00
Brian Talbot
2a1e102fca
studio - resolving merge conflict with cms/templates/unit.html
2013-01-09 08:56:58 -05:00
Brian Talbot
f60a9d8d35
studio - problem speed editor: tweaking presentation of problem sub menu further
2013-01-09 08:54:40 -05:00
Brian Talbot
75447eb80d
studio - problem speed editor: revised html and DOM for problem sub menu
2013-01-08 15:43:02 -05:00
cahrens
c7feee5b67
Delete speed-editor.js and cruft from unit.html.
2013-01-08 15:39:45 -05:00
cahrens
4ac15daf44
Fix formatting.
2013-01-08 15:04:48 -05:00
cahrens
f616aecd81
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
...
Conflicts:
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
2013-01-08 14:56:59 -05:00
cahrens
bc10d080df
Save work
2013-01-08 13:39:16 -05:00
Don Mitchell
6e2b4a07d8
Added is_empty to model presented to unit.html
2013-01-08 11:18:57 -05:00
Don Mitchell
76f2ef6f7c
Empty template now recognized as allowing markdown editing
...
Save saves markdown and updates the xml
2013-01-08 10:53:45 -05:00
Don Mitchell
12abdbce73
Added 'has_markdown' property to templates in unit.html so that we can
...
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
2013-01-07 10:55:10 -05:00
Brian Talbot
ce4994dd94
studio - revised course overview section collapse button to toggle collapsing/expanding
2013-01-04 13:27:59 -05:00
cahrens
533f4876b5
Rename, add css file.
2013-01-03 14:27:32 -05:00
cahrens
b4312cbfef
Starting the markdown editor.
2013-01-03 13:39:01 -05:00
cahrens
e09a8e4a9b
Don't show markdown if it doesn't exist.
2013-01-03 12:50:38 -05:00
cahrens
1c886b33cd
Get buttons working again (with old behavior).
2013-01-03 12:24:17 -05:00
cahrens
e60230dd5a
More deletion
2013-01-03 11:21:01 -05:00
Don Mitchell
31141299e8
Cache to pull CR's cleanup of branch
2013-01-03 11:00:41 -05:00
Don Mitchell
4f32d5f34d
Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor
...
Conflicts:
cms/static/sass/_assets.scss
cms/static/sass/_base.scss
cms/static/sass/_unit.scss
cms/templates/unit.html
2013-01-02 17:39:27 -05:00
Calen Pennington
8e0d218c7d
Stop using .definition and .metadata directly
2013-01-02 15:06:43 -05:00
Calen Pennington
6427dd6742
WIP: Get the cms running. Component previews work
2013-01-02 09:07:02 -05:00
Calen Pennington
cbfc7b201a
WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms
2012-12-28 14:44:31 -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
Chris Dodge
8e5fc2917a
Merge branch 'feature/btalbot/cms-export' into feature/cdodge/export
2012-12-27 14:43:36 -05:00
Don Mitchell
88b2457c13
Bug 98: no unit tests b/c it's just text in hmtl
2012-12-26 11:47:42 -05:00
Don Mitchell
a35c1386f2
Bug 99: don't show date as 'Unset' but leave out altogether if not set
...
plus commented out failing unit tests until I can get someone to help
debug them.
2012-12-26 11:30:31 -05:00
Brian Talbot
c9e5c47b30
removed progress bar UI from export UI
2012-12-26 09:19:08 -05:00
Brian Talbot
ed3f3b02d6
studio - course export UI alpha - roughing in states/views
2012-12-26 09:10:05 -05:00
cahrens
91ce214964
Fix for Studio #96 .
2012-12-20 14:59:21 -05:00
Don Mitchell
d66f33956e
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
2012-12-19 17:31:30 -05:00
Don Mitchell
e37180e074
Generalized the grader drop down and applied to edit_subsection
2012-12-19 17:31:06 -05:00
Chris Dodge
91b0fddfce
malformed url generation for User's tab
2012-12-19 13:49:47 -05:00
Don Mitchell
fc2b6f034b
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
2012-12-18 14:29:10 -05:00
Brian Talbot
af5d007a8f
cms - added users tab back into course navigation
2012-12-18 12:50:04 -05:00
Don Mitchell
5709ff34f5
Refactored videos to a much simpler impl b/c about videos don't have
...
speeds and don't use the video/default.yaml format.
2012-12-18 12:46:54 -05:00
Christina Roberts
e57b5b1431
Merge pull request #1160 from MITx/feature/btalbot/cms-gradable
...
Overview page allows user to specify grading policy per subsection
2012-12-14 14:09:28 -08:00
Don Mitchell
ac7b0334a6
Code review changes.
2012-12-14 16:51:40 -05:00
Brian Talbot
7d1a08d481
pages - made intro text visible again and styled it some
2012-12-14 16:15:01 -05:00
Don Mitchell
0b762fa35f
Remove ability to set gradability at the section level (commented out
...
until we decide the inheritance)
Remove Policy from subsection editor
Commented out Graded as: _____ from subsection settings
Fix menu dismissa
Fix ambiguous selection
2012-12-14 15:19:14 -05:00
Brian Talbot
e4f4f32c1b
tooltips - removed duplicate/incorrect tooltip_manager.js reference in base.html and added tooltips to unit actions
2012-12-14 15:18:45 -05:00
Don Mitchell
0fc16dffee
Gradable impl'd for overview page
2012-12-14 12:29:57 -05:00
Brian Talbot
4e152952af
cms settings - revised course overview textarea to display as codemirror field on page load
2012-12-14 11:57:46 -05:00
Don Mitchell
e0849e8b5a
Cache to debug other branch
2012-12-13 16:34:58 -05:00
Chris Dodge
bb3b7cb3a9
add back the course info tab in the CMS
2012-12-13 16:28:47 -05:00
Brian Talbot
fb47f30918
bug - removed placeholdit image references in template HTML
2012-12-13 15:48:39 -05:00
Brian Talbot
3b784f2145
styling - setting form field layout
2012-12-13 13:21:43 -05:00
Brian Talbot
69c26a08e3
settings/style - general UI clean up - wip
2012-12-13 13:06:56 -05:00
Don Mitchell
595edac4c2
Caching changes to fix critical bug on other branch
2012-12-13 12:33:22 -05:00
Tom Giannattasio
2be1f852e7
clean up of users page
2012-12-13 11:28:59 -05:00
