cahrens
f5dd5d35e9
Need to trigger invalid instead of error, after changes for new version of Backbone.
2013-03-08 14:51:29 -05:00
cahrens
98e410816e
New version of Backbone has separate invalid event.
2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce
New version of Backbone has separate invalid event.
2013-03-07 13:37:10 -05:00
Christina Roberts
d0eefc6a67
Merge pull request #1580 from MITx/bug/dhm/course_update_js
...
Fix for script tags w/in json objects being oddly evaluated on html page
2013-03-04 12:42:42 -08:00
Don Mitchell
de3a75d29d
Don't prepopulate models which may have script tags in their payloads
...
but fetch async via json get.
2013-03-04 12:54:58 -05:00
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
Carlos Andrés Rocha
2ca303c95d
Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
...
Feature/cas/manual policy merged
2013-02-27 09:02:07 -08:00
Don Mitchell
bb0ad61f81
Somehow the saves changed to just sets w/ don't send data to the server.
2013-02-25 12:13:50 -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
6981ba4e3f
Get Save and Cancel working.
2013-02-19 17:08:10 -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
9eb02a8a26
studio - resolving base.js spacing/conflicts
2013-02-15 16:57:42 -05:00
cahrens
5acf9cb3d2
Reformat to 4 spaces.
2013-02-15 14:46:41 -05:00
Brian Talbot
cb127d473d
studio - page headers: revised where new course form fields are placed in dashboard
2013-02-15 11:40:06 -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
9b09d043bd
studio - adding introduction areas to all templates and infrastructure for its contnet
2013-02-14 12:49:58 -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
Brian Talbot
d3e67be766
studio: nav - clicking anywhere but nav's dropdowns will close them, fixed link outline and is-selected styling
2013-02-13 12:03:30 -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
Don Mitchell
c9c026be62
Fixed urls
2013-02-12 12:15:07 -05:00
Brian Talbot
7ca267fd78
studio - debugging grading settings JS errors WIP
2013-02-12 11:56:54 -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
Brian Talbot
715cea51a4
studio - resolved scss that relied on old body classes
2013-02-11 16:09:33 -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
