Commit Graph

624 Commits

Author SHA1 Message Date
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
ec90d349e2 studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP 2013-03-04 12:47:07 -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
2ce4ecbc84 local merge with master - finished 2013-03-01 15:48:15 -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
Don Mitchell
5fa1da5324 Merge pull request #1577 from MITx/bug/christina/misc
Bug fix for #215 (quotes not rendering in text fields).
2013-03-01 12:09:20 -08:00
cahrens
29330cc922 Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc.
#213
2013-03-01 14:55:38 -05:00
cahrens
d001f21bfe Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. 2013-03-01 14:39:49 -05:00
Christina Roberts
69ef622afd Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor
Fix latex high-level source editor in current version of cms / studio
2013-02-28 10:02:09 -08:00
ichuang
b75ccbdcce address Christina's comments re js in latex2edx source-edit.html 2013-02-28 04:21:43 +00: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
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
ichuang
b6cf206fc7 fix latex high-level-source editor 2013-02-24 01:55:57 +00:00
Brian Talbot
60f803f369 studio - alerts: initial pass at alert styling and markup complete 2013-02-22 14:29:19 -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
Mark L. Chang
f1c8301e4f added question marks 2013-02-21 22:47:48 -05:00
Jay Zoldak
c10dc838b2 Fix tip on JSON key value pairs 2013-02-21 15:01:12 -05:00
Brian Talbot
22639adc63 studio - alerts WIP 2013-02-21 14:31:24 -05:00
Don Mitchell
697bd5c97b also this one 2013-02-21 13:28:43 -05:00
cahrens
cc63f9c2db Unique IDs, other cleanup. 2013-02-20 17:11:34 -05:00
cahrens
dd959d1123 Longer warning got merged out. 2013-02-20 15:01:41 -05:00
Brian Talbot
7b60ec380a Merge branch 'master' into feature/cas/manual-policy-merged 2013-02-20 14:58:50 -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
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
d5903c0e60 Make HTML better formatted. 2013-02-19 15:14:05 -05:00
cahrens
167d07037d Merged, delete Ace. 2013-02-19 14:56:37 -05:00
Brian Talbot
585dff521a Merge branch 'master' into feature/btalbot/studio-pagechrome 2013-02-19 12:27:49 -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
Don Mitchell
cfa13922f5 Change url for login from login to signin. 2013-02-15 17:30:24 -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
cahrens
b49325009a Merge branch 'master' into feature/btalbot/studio-softlanding 2013-02-15 13:14:46 -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
Brian Talbot
bd98b2726a resolving local merge conflict 2013-02-14 13:00:51 -05:00
Brian Talbot
c81f958788 studio - final prep of introduction areas (with fix for current page content margins) 2013-02-14 13:00:14 -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
Mark L. Chang
859cfff870 updated modal copy and alt text 2013-02-14 12:42:17 -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
Brian Talbot
1a1be106ae studio - page headers: added in view live links to course dashboard 2013-02-14 10:14:10 -05:00
Brian Talbot
2024f9eeca studio - page headers: added view course button to course outline 2013-02-14 09:48:19 -05:00
Brian Talbot
6ade6983ae studio - page headers: added in logic to style page actions' height based on title having a subtitle or not 2013-02-14 09:38:32 -05:00