Don Mitchell
e55bb845b2
Fix for script tags w/in json objects being oddly evaluated on html page
...
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
cahrens
d7c28bfa11
Don't usurp ValidatingView's error handling.
...
#219
2013-03-01 15:24:56 -05:00
Don Mitchell
c11d627c88
Chrome/Safari don't use keypress for backspace and delete.
2013-02-22 11:00:27 -05:00
Don Mitchell
e5efcf65d3
remove console.log
2013-02-21 13:34:11 -05:00
Don Mitchell
851a99cb13
remove commented out code
2013-02-21 13:32:29 -05:00
Don Mitchell
116c74c075
Highlighting of field labels and smarter decision as to when to show the
...
save cancel bar.
2013-02-21 13:27:36 -05:00
cahrens
cc63f9c2db
Unique IDs, other cleanup.
2013-02-20 17:11:34 -05:00
Brian Talbot
7b60ec380a
Merge branch 'master' into feature/cas/manual-policy-merged
2013-02-20 14:58:50 -05:00
Brian Talbot
ad770a5ec8
studio - manual policy editor: converting to new page layout - WIP
2013-02-20 14:24:13 -05:00
cahrens
305f0b2a54
Add number of spaces for formatting of JSON.
2013-02-20 10:56:49 -05:00
Brian Talbot
266e8951a4
made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750
2013-02-19 17:18:09 -05:00
cahrens
167d07037d
Merged, delete Ace.
2013-02-19 14:56:37 -05:00
cahrens
f91060d197
Merge branch 'master' into feature/cas/manual-policy
...
Conflicts:
cms/djangoapps/contentstore/features/common.py
cms/djangoapps/contentstore/features/section.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/settings/course_grading_policy.js
cms/static/js/views/settings/main_settings_view.js
cms/static/sass/_settings.scss
cms/templates/settings.html
cms/urls.py
2013-02-19 13:27:35 -05:00
Brian Talbot
20553b00d3
resolving merge conflict with master
2013-02-15 09:32:38 -05:00
Brian Talbot
6c95460761
studio - resolving merge from master
2013-02-15 09:15:06 -05:00
Brian Talbot
47c117bf03
studio - page headers: resolved new course update creation JS issue caused by new markup
2013-02-14 10:52:25 -05:00
cahrens
4ae691e88a
Convert JSON that doesn't parse to String (unless object, array, or single quote).
2013-02-13 17:41:52 -05:00
Don Mitchell
d569c559ca
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/views/settings/main_settings_view.js
cms/templates/index.html
cms/templates/settings.html
2013-02-12 16:57:00 -05:00
cahrens
f56729dbdb
Turn off line wrapping.
2013-02-12 15:27:38 -05:00
Don Mitchell
76d675ba16
fix npe for time (bug 185)
2013-02-12 15:20:02 -05:00
Don Mitchell
40668133f7
Fix bug which I know I fixed before (perhaps on another branch?) to
...
ensure old time had a value before comparing it to new time.
2013-02-12 15:11:35 -05:00
cahrens
75ceed7f69
Show "successful save" message when a new edit is made.
2013-02-12 10:29:47 -05:00
cahrens
e9bb5eb1d0
Minor updates.
2013-02-11 17:27:39 -05:00
Don Mitchell
8bc9564d92
clean up note to self
2013-02-11 16:45:36 -05:00
Don Mitchell
777e0ef9c5
The other one was too inclusive
2013-02-11 16:36:34 -05:00
Don Mitchell
565f5f0adc
Stop simple clicks from paging to top w/o disrupting dnd
2013-02-11 16:28:22 -05:00
cahrens
98920e7e05
Switch to new notification/Save/Cancel mechanism (attached to bottom of viewport).
2013-02-11 16:17:32 -05:00
Don Mitchell
ae4a854e18
Bug 180
2013-02-11 15:46:58 -05:00
cahrens
437c806fce
Enable/disable new entry button.
2013-02-11 14:16:04 -05:00
cahrens
67a557d59a
Update Save/Cancel button state on typing events.
2013-02-11 14:07:11 -05:00
cahrens
044a8a5cf6
CodeMirror.
2013-02-11 12:37:31 -05:00
Don Mitchell
773dfce68d
Try to make server and validation errors work together. Getting double
...
errors when there are parent and child views both defining on error
handlers still.
2013-02-11 12:04:45 -05:00
cahrens
039160f50c
Beginning of CodeMirror.
2013-02-11 11:20:14 -05:00
cahrens
ac732f6b07
Beginnings of feedback regarding unsaved and saved changes.
2013-02-08 17:19:19 -05:00
Don Mitchell
09e8628037
add editor to new entries and when key changes
2013-02-08 16:58:50 -05:00
Don Mitchell
5254af2918
Letting render do its thing. The wrap confused the this pointer.
2013-02-08 15:36:42 -05:00
cahrens
4718c9a51a
Forgot to define self when I moved code.
2013-02-08 11:17:02 -05:00
cahrens
950f5de3ca
Move getSession() call out of render method to avoid crash on Chrome.
2013-02-08 08:26:24 -05:00
Don Mitchell
31393043d0
More for that commit
2013-02-07 14:46:42 -05:00
Don Mitchell
9cd1162a60
Grading and details split out. Put the unimplemented tabs into a single
...
file not used.
2013-02-07 14:45:24 -05:00
cahrens
c907cf756c
Add ACE Editors.
2013-02-07 13:05:39 -05:00
Don Mitchell
1e68834e03
Remove from to-be-deleted list any readded keys w/ same name.
2013-02-06 17:42:00 -05:00
Don Mitchell
7b3c81ca53
blacklist violations now properly trigger violation error
...
delete keys only after save completes
2013-02-06 17:25:12 -05:00
cahrens
c243eec604
Move to view file.
2013-02-06 15:29:17 -05:00
Don Mitchell
1cc62fae75
Catch null pointer for uninitialized dates
2013-02-06 10:23:29 -05:00
Don Mitchell
4ba7de3402
Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
2013-02-06 09:56:19 -05:00
Don Mitchell
8f16d639b7
CRUD on policy fields w/ some validation
2013-02-05 17:21:02 -05:00
Don Mitchell
902cdefefa
Added comments for unused 2nd arg on generateCheckHoverState
2013-02-04 12:05:49 -05:00
Don Mitchell
50eced5b32
Attempt to patch the dnd hesitation fixes onto master
2013-02-04 11:34:59 -05:00
Don Mitchell
1595bd9b0e
Move dnd code from base.js to a js file only loaded by overview.html
2013-02-01 17:20:58 -05:00
