Brian Talbot
cdcdfd49e0
studio - alerts: resolving local master merge conflcits
2013-03-18 10:58:16 -04:00
Brian Talbot
36746fb729
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-12 16:05:54 -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
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
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
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
Brian Talbot
62514d85a3
studio - alerts: loosely wired advanced settings with new notification and alert messages
2013-03-06 15:36:38 -05:00
Brian Talbot
9a7b6c7eaf
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-06 15:04:34 -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
156a702e08
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-05 09:57:35 -05:00
Brian Talbot
cbdf9ea25b
studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling
2013-03-05 09:57:14 -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
Brian Talbot
ec90d349e2
studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP
2013-03-04 12:47:07 -05:00
Brian Talbot
eb1658730a
studio - alerts: revised border styling on all elements and button/color inheritance
2013-03-04 12:30:04 -05:00
Brian Talbot
72c58cd454
studio - alerts: refactored styles for common content types across UI, got prompts set up and styled, and refactored base template for future prompt/notification/alert use
2013-03-03 20:44:48 -05:00
Brian Talbot
47aacc70b7
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-02 22:11:16 -05:00
Brian Talbot
bc0b1b0958
studio - alerts: cleaned up animation standards and made mixins to reference as well as got prompt UI pattern behavior working
2013-03-02 22:06:55 -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
Brian Talbot
8552b2d614
local merge with master - WIP
2013-03-01 15:47:23 -05:00
Brian Talbot
ad70581b80
studio - alerts: more progress including prompts
2013-03-01 15:43:07 -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
Brian Talbot
cb456ad228
studio - alerts: converted transition-based animation to keyframe/css animation and added in a demo for a fleeting notification
2013-02-27 12:45:44 -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
Brian Talbot
cc02b4714c
Merge branch 'master' into feature/btalbot/studio-alerts
2013-02-26 14:22:50 -05:00
Brian Talbot
d09927e8dd
studio - alerts: small styling tweaks for the close button on help notifications
2013-02-26 12:38:46 -05:00
Brian Talbot
0926395445
studio - alerts: added in close buttons and basic JS to control them/moved demo JS to alerts.html page
2013-02-26 12:32:20 -05:00
Brian Talbot
95ea01689f
studio - alerts: firmed up status-based notifications
2013-02-25 16:30:36 -05:00
Brian Talbot
d809df913d
studio - alerts: moved all states and documentation into new /alerts view
2013-02-25 14:45:27 -05:00
Brian Talbot
8179b9fadc
studio - alerts: initial pass at alert styling and markup complete
2013-02-25 14:19:22 -05: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
Brian Talbot
b1f5d67a96
studio - alerts: initial pass at alert styling and markup complete
2013-02-22 14:39:49 -05:00
Brian Talbot
bb24a079a1
studio - alerts: initial pass at alert styling and markup complete
2013-02-22 14:28:13 -05:00
Brian Talbot
d7bbfbc707
studio - alerts: basic layout and general alert styling WIP
2013-02-22 13:52:24 -05:00
Don Mitchell
c11d627c88
Chrome/Safari don't use keypress for backspace and delete.
2013-02-22 11:00:27 -05:00
Brian Talbot
22639adc63
studio - alerts WIP
2013-02-21 14:31:24 -05:00
Don Mitchell
e5efcf65d3
remove console.log
2013-02-21 13:34:11 -05:00
