From 5daa6e7b734cfd9a09c0fab18f5fb53baaa27ca4 Mon Sep 17 00:00:00 2001 From: cahrens Date: Wed, 9 Jan 2013 10:49:59 -0500 Subject: [PATCH 1/3] Tom cruft to be deleted. --- cms/static/coffee/src/views/unit.coffee | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index 4b19e58f6e..fe8f928746 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -68,13 +68,6 @@ class CMS.Views.UnitEdit extends Backbone.View @$newComponentItem.removeClass('adding') @$newComponentItem.find('.rendered-component').remove() - closeEditor: (event) => - @$editor.slideUp(150) - $modalCover.fadeOut(150) - $modalCover.unbind('click', @closeEditor) - @$editor.slideUp(150) - @$componentItem.removeClass('editing') - saveNewComponent: (event) => event.preventDefault() From 64387a4f0c03553d7764f0a38ee2482b16642c3b Mon Sep 17 00:00:00 2001 From: cahrens Date: Wed, 9 Jan 2013 11:06:18 -0500 Subject: [PATCH 2/3] Tom cruft to be deleted, problem editor CSS moved to correct location. --- cms/static/img/problem-settings-icon.png | Bin 1320 -> 0 bytes cms/static/sass/_graphics.scss | 57 ------------------ .../lib/xmodule/xmodule/css/problem/edit.scss | 30 +++++++++ 3 files changed, 30 insertions(+), 57 deletions(-) delete mode 100644 cms/static/img/problem-settings-icon.png diff --git a/cms/static/img/problem-settings-icon.png b/cms/static/img/problem-settings-icon.png deleted file mode 100644 index f99082a1e7f11fc910842fa1e527e4ef70e5c260..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1320 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW|hp4h>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v)=f4rG*mD%(=#+N zH8V5RQ7|$vG}1Q!A~Rh>6Dw0QDv55FG|-pw6wGYnPFt43sj+7T$xvrSfQI&tPC^3CAB!YD6^m>Ge1uOWMX1cerbuV z640d(FXR@$jm;~D1`{yA^eYkz^bPe4Kwg3=^!3HBG&dKny0|1L72#g21{a4^7NqJ2 zr55Lx79|5CE=?I^Re_arQEFmIeo;t%ehw@Y12XbU@{2R_3lyA#%@j0z6O%LZKmwXz z9lpL+o_WP3iFwJXo-VdZKr{3*GgGXbj9g5eoXi}J3|x&34PA{aEnO^}ER3DZT-*#S z%w1ezdR_99OLJ56N?>|Z5PF?(>IEf++ybD@E~!PCWvMA{Mftf3U{70RVsVSBo4J{x ztGSzzfw?Pow?Oo!U~vmXuZ00lz4}1M=!2pbDXL*Y!1M!R!V@l#15f&?dBF5u1Wee^ zZf|vB*LQ~D_=*cy89m`KyC8DDwsOgwC1{qfN8cW35QKQApiyzhOx%taQx z0}Lygj85zjI>gJx=PB5y_d#rm0O!u+JD1F#oe9tuxuoFtHnrgS|6V1J33*aWN@iQz zt1e{m`+IC6^Y%~w_|$eJC@Q>UOiA79xq){N!`rEP7UBvP?73S^eRn4_F7^^&WnbXO z+`nLI*Oz9ytnvo&OW_CE@*^iII!^obJ#|z52G_s4m-x?`zNlkjLTlJD?e!N8m#q9> z{`Jja4e5C`r_QZEeLcBq$IY}itX1=;FJ~`X62P0&)YYTvA)lVSy+Qf$ws}t;d@U?# z_RIR-5PoTO@=azzQw!mQ#-_k2-J;AzNxz;?VAni7{U=YKqvyF$*`ro3wr1!bTs5zh ztLB8x^#@0G#2Qa&|_Xj*YP5K{~KKJ?|n85JADWmUK>~(ff+2!f#=d#Wzp$Pzj9M|Ch diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss index 09e96c3788..4ed22c570d 100644 --- a/cms/static/sass/_graphics.scss +++ b/cms/static/sass/_graphics.scss @@ -310,60 +310,3 @@ vertical-align: middle; background: url(../img/spinner-in-field.gif) no-repeat; } - -.problem-editor-icon { - display: inline-block; - width: 26px; - height: 21px; - vertical-align: middle; - background: url(../img/problem-editor-icons.png) no-repeat; -} - -.problem-editor-icon.multiple-choice { - background-position: 0 0; -} - -.problem-editor-icon.checks { - background-position: -56px 0; -} - -.problem-editor-icon.string { - width: 28px; - background-position: -111px 0; -} - -.problem-editor-icon.number { - width: 24px; - background-position: -168px 0; -} - -.problem-editor-icon.dropdown { - width: 17px; - background-position: -220px 0; -} - -.settings-icon { - display: inline-block; - width: 20px; - height: 20px; - vertical-align: middle; - background: url(../img/problem-settings-icon.png) no-repeat; -} - -.sort-icon { - font-size: 7px; - vertical-align: middle; - - &.down:before { - content: '▼'; - } - - &.up:before { - content: '▲'; - } -} - - - - - diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss index 23ed576b0e..60e0c5431c 100644 --- a/common/lib/xmodule/xmodule/css/problem/edit.scss +++ b/common/lib/xmodule/xmodule/css/problem/edit.scss @@ -142,5 +142,35 @@ } } +.problem-editor-icon { + display: inline-block; + width: 26px; + height: 21px; + vertical-align: middle; + background: url(../img/problem-editor-icons.png) no-repeat; +} + +.problem-editor-icon.multiple-choice { + background-position: 0 0; +} + +.problem-editor-icon.checks { + background-position: -56px 0; +} + +.problem-editor-icon.string { + width: 28px; + background-position: -111px 0; +} + +.problem-editor-icon.number { + width: 24px; + background-position: -168px 0; +} + +.problem-editor-icon.dropdown { + width: 17px; + background-position: -220px 0; +} From 31f9084b616b2e4f45372a3211286b62b174de43 Mon Sep 17 00:00:00 2001 From: cahrens Date: Wed, 9 Jan 2013 11:12:52 -0500 Subject: [PATCH 3/3] Tom cruft to be deleted. --- cms/templates/unit.html | 101 ---------------------------------------- 1 file changed, 101 deletions(-) diff --git a/cms/templates/unit.html b/cms/templates/unit.html index abf4a876a3..75c57f52f2 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -19,107 +19,6 @@ $(this).prepend($emptyEditor); }); })(); - - function setEditorTab(e) { - e.preventDefault(); - $('.editor-tabs .current').removeClass('current'); - $(this).addClass('current'); - switch($(this).attr('data-tab')) { - case 'simple': - currentEditor = simpleEditor; - $(simpleEditor.getWrapperElement()).show(); - $(xmlEditor.getWrapperElement()).hide(); - $(simpleEditor).focus(); - onSimpleEditorUpdate(); - break; - case 'xml': - currentEditor = xmlEditor; - $(simpleEditor.getWrapperElement()).hide(); - $(xmlEditor.getWrapperElement()).show(); - $(xmlEditor).focus(); - xmlEditor.refresh(); - break; - case 'visual': - currentEditor = visualEditor; - convertHTMLToVisual(); - $('table.mceToolbar').show(); - $(htmlEditor.getWrapperElement()).hide(); - break; - case 'html': - currentEditor = htmlEditor; - $('table.mceToolbar').hide(); - $(htmlEditor.getWrapperElement()).show(); - $(htmlEditor).focus(); - convertVisualToHTML(); - htmlEditor.refresh(); - break; - } - } - - - - - -