Commit Graph

613 Commits

Author SHA1 Message Date
cahrens
b706d4a1f5 Use readonly attribute instead of disabled. Disabled text fields are not selectable on FireFox.
#225
2013-03-06 11:50:23 -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
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
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
ichuang
b6cf206fc7 fix latex high-level-source editor 2013-02-24 01:55:57 +00: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
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
Brian Talbot
41dc655cce resolving local merge conflict 2013-02-14 09:03:46 -05:00
Brian Talbot
557beea31f studio - hiding mast area for subsections 2013-02-14 09:00:57 -05:00
Mark L. Chang
b7e8335a19 switched taxonomy back to section/subsection/unit 2013-02-13 22:53:46 -05:00
Brian Talbot
d571c7791a studio - resetting Unit UI HTML back to prev version for now 2013-02-13 17:01:45 -05:00
Don Mitchell
9d2b92c362 Don't show 'empty' metadata field
Change logic for when to show simple v advanced editor to use an
explicit flag.
2013-02-13 16:34:11 -05:00
Don Mitchell
18ecd11583 Only tabify the problems submenu. 2013-02-13 16:33:19 -05:00
Don Mitchell
62d389c853 Added empty metadata attribute instead of using name to determine which
template is empty (very awkward b/c it's a template descriptor not an
instance one)
Changed display conditionals to get the right things to show in the
right tabs for problems
2013-02-13 16:33:19 -05:00
marco
c238fc3d74 cleaned up css and advanced tab shows proper component list, also using jquery.ui.js 2013-02-13 16:33:19 -05:00
marco
9eb87e1eac final css tweaks prior to jquery bug resolution 2013-02-13 16:33:19 -05:00
marco
fc0a26ae74 styled header of problem component adding menu and made it only visible when you are in the problem menu 2013-02-13 16:33:19 -05:00
marco
a57e91ef47 revision of visual styling per product team feedback round 2013-02-13 16:33:18 -05:00