Christina Roberts
e8401cf2bb
Merge pull request #1643 from MITx/fix/btalbot/studio-sasscleanup
...
Studio Sass Cleanup
2013-03-21 08:45:48 -07:00
chrisndodge
37a673012f
Merge pull request #1701 from MITx/bug/orphan
...
Fix bug 249 the ugly way (decerebrate the moronically impotent model)
2013-03-21 07:21:16 -07:00
Don Mitchell
3ea70eac9d
Also clean up children after sort saved.
2013-03-20 17:59:24 -04:00
Brian Talbot
2876554cd7
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-20 17:09:38 -04:00
Brian Talbot
3b80a90bd0
studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss
2013-03-20 16:54:14 -04:00
Brian Talbot
f181a454e4
studio - added in basic JS confirm UI when deleting course updates
2013-03-20 11:20:16 -04:00
Brian Talbot
8cf2cc6f78
studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles
2013-03-20 10:42:35 -04:00
Brian Talbot
9069d822a4
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-20 10:38:07 -04:00
Don Mitchell
af136e75ca
Fix bug 249 the ugly way (decerebrate the moronically impotent model)
2013-03-19 18:07:46 -04:00
Jay Zoldak
b6e82afb0e
Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests
...
Fix/will/fix broken jasmine lms tests
2013-03-18 11:53:22 -07:00
Brian Talbot
a1ba97376a
studio - sass cleanup: further revisions and box-sizing all elements for consistency
2013-03-16 12:18:35 -04:00
Brian Talbot
06b118ae33
studio - sass cleanup: resolved static pages display issue after local merge master
2013-03-15 15:23:03 -04:00
Brian Talbot
84a5475d5a
studio - sass cleanup: resolving conflicts with local master merge
2013-03-15 12:42:33 -04:00
cahrens
99f55266f5
Do not need to pass blacklist keys to client.
2013-03-12 09:27:46 -04:00
cahrens
7e8fcb85ff
Updated Selenium test, deleted dead code related to Advanced Settings.
2013-03-11 16:56:24 -04:00
Brian Talbot
a496cc0a1e
studio - Sass Cleanup: moved all page/view specific css to their own views and created forms specific sheet
2013-03-11 13:28:28 -04:00
Brian Talbot
82a00104c2
studio - settings: revised markup and styling around disabled/readonly fields
2013-03-11 12:24:43 -04:00
Brian Talbot
603d11577f
studio - settings: matched up styling/treatment of disabled input fields in schedule/details settings view to new advanced settings UI
2013-03-11 11:40:36 -04:00
Brian Talbot
524db5e3f9
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-11 11:35:25 -04:00
Brian Talbot
72a7ec9e07
studio - advanced settings: removed new/delete controls from advanced policies and makde key fields readonly/disabled since we're now showing all policy metadata
2013-03-11 11:31:48 -04:00
Will Daly
6b94090e67
Fixed jasmine test issue with cms caused by previous change
...
to order of file import. Introduced static_files list
in files.json (supported in original django_jasmine implementation)
that loads static files before any compiled files.
2013-03-11 11:27:49 -04:00
Brian Talbot
7a9fdb9069
studio - sass clean up: in progress business with git ignore issues
2013-03-11 11:04:43 -04:00
cahrens
f5dd5d35e9
Need to trigger invalid instead of error, after changes for new version of Backbone.
2013-03-08 14:51:29 -05:00
Brian Talbot
3bc73de1b4
studio - changed order of Sass import to account for variables needed in architecture
2013-03-08 12:56:00 -05:00
Brian Talbot
786ffd1092
studio - further small cleanup on Sass
2013-03-08 12:44:24 -05:00
Brian Talbot
e9a2413c04
studio - further small cleanup on Sass
2013-03-08 12:35:28 -05:00
Brian Talbot
6418d033dd
studio - adding files I forgot to add when cleaning up Sass and originally committing
2013-03-08 12:20:40 -05:00
Brian Talbot
3b2c970248
studio - reorganized and documented used Sass for studio
2013-03-08 11:47:11 -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
e093431d75
Merge pull request #1581 from MITx/feature/vik/advanced-studio
...
Feature/vik/advanced studio
2013-03-05 12:28:29 -08:00
Arthur Barrett
c9b2a6a203
updated CSS to use the new advanced icon
2013-03-05 10:52:39 -05:00
Brian Talbot
ef9f963f49
studio - advanced modules: added in advanced module button icon per artie/vik work
2013-03-05 10:39:21 -05:00
Brian Talbot
cc3b9557f9
studio - open ended and annotations: added in component button icon assets and styling
2013-03-04 17:02:59 -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
Vik Paruchuri
f8b0338dee
Change name of annotatable, add in sass for advanced module
2013-03-01 16:26:48 -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
Vik Paruchuri
9f020e228b
Add in some dummy values
2013-03-01 14:50:40 -05:00
Brian Talbot
73ae818958
studio - fixing padding of codeMirror fields to match height of others given new line height
2013-02-27 13:08:56 -05:00
Brian Talbot
cdd6ce708e
studio - reducing line height for codemirror JSON lines
2013-02-27 13:07:58 -05:00
Brian Talbot
524f48b68e
studio - fixing padding of codeMirror fields to match height of others given new line height
2013-02-27 13:03:36 -05:00
Brian Talbot
45520fe124
studio - fixing line heights not syncing with code mirror lines and cursor
2013-02-27 12:59:25 -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
