Brian Talbot
|
0a2b74110e
|
studio - nav and soft landing various QA fixes
|
2013-02-12 17:03:48 -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 |
|
Brian Talbot
|
dd50313f82
|
studio - revised manual policy editor scss to have value field height match key values' and condensed error message UI
|
2013-02-12 15:19:08 -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 |
|
Brian Talbot
|
70e11e823c
|
studio - made all page heading chrome have consistent markup
|
2013-02-12 15:07:32 -05:00 |
|
Brian Talbot
|
540710f553
|
studio - nav revamp: added in dynamic course org and number to header
|
2013-02-12 14:22:42 -05:00 |
|
Brian Talbot
|
e5c0bdf7a1
|
studio - added in manual policy editor CodeMirror styles and removed unused classes on CodeMirror instance in other settings tabs
|
2013-02-12 13:13:37 -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 |
|
Brian Talbot
|
22b959d657
|
studio - link wiring and spot styling changes for new nav/soft landing/settings work
|
2013-02-12 11:16:37 -05:00 |
|
cahrens
|
75ceed7f69
|
Show "successful save" message when a new edit is made.
|
2013-02-12 10:29:47 -05:00 |
|
Brian Talbot
|
8976818c78
|
studio - header UI: in progress markup changes WIP
|
2013-02-12 09:16:24 -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 |
|
Brian Talbot
|
8f5d8a98c7
|
studio - resolved sidebar content organization and styling
|
2013-02-11 16:20:25 -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
|
2150386a21
|
studio - resolved scss that hid works in progress
|
2013-02-11 16:16:10 -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 |
|
Brian Talbot
|
2478178237
|
studio - resolving merge
|
2013-02-11 15:28:38 -05:00 |
|
Brian Talbot
|
707e781148
|
studio - manual policy editor: stubbed in notification UI and testing code
|
2013-02-11 15:16:45 -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 |
|
Brian Talbot
|
ea709684d0
|
studio - settings: synched up styling/controls for existing video with other existing fields
|
2013-02-11 12:13:25 -05:00 |
|
Brian Talbot
|
34272beba3
|
studio - merge resolving
|
2013-02-11 12:09:01 -05:00 |
|
Brian Talbot
|
77343519c6
|
studio - settings: revising enumerated item lists
|
2013-02-11 12:08: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 |
|
Brian Talbot
|
1936b47ba5
|
studio - small display tweaks to setting form new/remove actions
|
2013-02-11 09:01:52 -05:00 |
|
Brian Talbot
|
5730cf45b7
|
studio - window class revamp
|
2013-02-11 08:57:34 -05:00 |
|
Brian Talbot
|
ed15997259
|
studio - settings: grading revamp WIP
|
2013-02-11 08:48:01 -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 |
|
Brian Talbot
|
210086fed3
|
studio - settings: grading revamp WIP
|
2013-02-08 13:42:36 -05:00 |
|
Brian Talbot
|
1b679750ad
|
studio - settings: more revamp of tabs to views WIP
|
2013-02-08 12:36:21 -05:00 |
|
cahrens
|
4718c9a51a
|
Forgot to define self when I moved code.
|
2013-02-08 11:17:02 -05:00 |
|
Brian Talbot
|
dc07e7375f
|
studio - settings: revamp of tabs to views WIP
|
2013-02-08 09:36:18 -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
|
9f5eeaf815
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
Conflicts:
cms/templates/settings.html
cms/templates/widgets/header.html
|
2013-02-07 14:56:48 -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 |
|
Brian Talbot
|
ed42fa8830
|
studio - soft landing: revised page title structure and values
|
2013-02-07 14:23:00 -05:00 |
|
Brian Talbot
|
5b9609abf6
|
studio - soft landing: various fixes/tweaks
|
2013-02-07 14:09:47 -05:00 |
|
cahrens
|
c907cf756c
|
Add ACE Editors.
|
2013-02-07 13:05:39 -05:00 |
|