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
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
8b5f088eb9
studio - fixed alignment of new section field and controls
2013-02-20 16:43:13 -05:00
Brian Talbot
4b850f4da9
studio - notifications: made icon/copy area more bulletproof for longer lines of text
2013-02-20 16:24:50 -05:00
Brian Talbot
7b60ec380a
Merge branch 'master' into feature/cas/manual-policy-merged
2013-02-20 14:58:50 -05:00
Brian Talbot
e157fd26c8
studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields
2013-02-20 14:58:19 -05:00
Brian Talbot
c7f5b74225
studio - manual policy editor: converting to new page layout and styling
2013-02-20 14:46:54 -05:00
Brian Talbot
ad770a5ec8
studio - manual policy editor: converting to new page layout - WIP
2013-02-20 14:24:13 -05:00
Brian Talbot
453e249f16
studio - manual policy editor: converting to new page layout - WIP
2013-02-20 13:54:19 -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
fca98c19a5
studio - adding in info icon to page intro help and making icon classes consistent in all new references
2013-02-19 12:13:08 -05:00
cahrens
596de8ab2c
Hook up "View Live" buttons and get "New Static Tab" working again.
2013-02-19 11:34:41 -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
3c6caa611c
resolving local merge
2013-02-15 14:24:42 -05:00
Brian Talbot
a5e2b5c53a
resolving merge conflict and missing Sass mixin
2013-02-15 14:10:52 -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
9feb810006
studio - final prep of introduction areas (with fix for current page content margins)
2013-02-14 13:16:10 -05:00
