From 9c3c72ad3c0f9879470d02a4f9fec80705d27188 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 9 Nov 2012 15:49:06 -0500 Subject: [PATCH] discussion editor and preview added; string response glitch fixed --- cms/static/coffee/src/views/unit.coffee | 4 ++ cms/static/img/new-post-icon.png | Bin 0 -> 1168 bytes cms/static/img/show-hide-discussion-icon.png | Bin 0 -> 1610 bytes cms/static/js/html-editor.js | 11 +-- cms/static/js/speed-editor.js | 4 +- cms/static/sass/_unit.scss | 71 ++++++++++++++++++- cms/templates/unit.html | 21 ++++++ 7 files changed, 104 insertions(+), 7 deletions(-) create mode 100644 cms/static/img/new-post-icon.png create mode 100644 cms/static/img/show-hide-discussion-icon.png diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee index 91740a2b04..e7cb5574eb 100644 --- a/cms/static/coffee/src/views/unit.coffee +++ b/cms/static/coffee/src/views/unit.coffee @@ -98,6 +98,9 @@ class CMS.Views.UnitEdit extends Backbone.View @$editor = $($('#html-editor').html()) $preview = $('
') initHTMLEditor(@$editor, $preview) + when 'discussion' + @$editor = $($('#discussion-editor').html()) + $preview = $($('#discussion-preview').html()) @$editor.find('.save-button, .cancel-button').bind('click', => @$componentItem.removeClass('editing') @@ -108,6 +111,7 @@ class CMS.Views.UnitEdit extends Backbone.View @$componentItem.append(@$editor) @$componentItem.append($preview) + @$componentItem.append($componentActions) @$componentItem.hide() @$newComponentItem.before(@$componentItem) diff --git a/cms/static/img/new-post-icon.png b/cms/static/img/new-post-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bf16b9da89a995c6910490dab30bc68b066159df GIT binary patch literal 1168 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!3HF+tk*dLq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Kep0RGSfuW&-nVFuU ziK&^Hp^k!)fuWJU0T7w#8k$&{npqi{D?ot~(6*wKG^-#NH>h1eo~=?wNlAf~zJ7Um zxn8-kUVc%!zM-Y1CCCgTBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~`lk!VT zY?Xj6g?J&i0B&qvF*KNf0j6J(SfFpHX8`gNOrftYexnUy@&(kzb(T9Bihb;hUJ8nFkWk z1ncniwerj>E=kNwPW5!LRRWr!mzkLY3`|Eu7dK;L7guK&Lqk_XOA~WbOJhqD6E`;_ zV^=e0m|mCsATTy#-3XckuB&U{zq9cGQCte z+hfteM)t^WXSW{~Q0gd-OItRBcbV3?5TOfQk8eEH&t+|?*yuN7o=Ly$`Rv)tEc+Lo znEw5BjDtkmx^=IGS=OAs5x!^N=G@)c633J{n64MjxhdUnv@WY^mE}$56n%wR%Xka# zhX_9rEeoBj`0wcVzk+Ap{LEuixSSJtjq91)rs?b_Ocozl+R>Z*T>3#=iW`4>KEu_T zurn%W|EM#ZF~2&e$^N|QDS_l11^eVPfnOXglm7g57G8Y+%f|SH_MxX0reFHcIpvU- e=E`@92N-Tl*ZU&*X}u|^jPP{zb6Mw<&;$Sjg_G(4 literal 0 HcmV?d00001 diff --git a/cms/static/img/show-hide-discussion-icon.png b/cms/static/img/show-hide-discussion-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..17d319378035e1b462fd449402d5f5b0be841cd3 GIT binary patch literal 1610 zcmaJ>X;2eq7>+=x1wo})6cM*k6e!tTB#=nR0GmLNq%qJj!)PVP23FkNu)9de)OMhV zb(ngziqRGUooH(TM^J9Xt3@TA1!wTUqoWeEib&On)@~4Je`t4h_xrwg-sgFr_n2?J zT9xeQ6YRraF#HrLkcM6(>F>kI-t_-&V`V(O%%WskDjhdb1v&y|Bp7i$3@A`tHmrel z#=^YQa2$i-IUmW;Qd(u2*np#;&g}zQP&18YFyf>Zv(AtUQ-B`MMlcEUQCkNSK#UUR zQh}1AG$+A1NQ#w!)2*rugEiM6GBTy{K%7NP6QD4q11#t&j1*fW%u!x3y?2}0OkmW7 z%9SwRh|((6KoU;CfB@vP3>+>O5DGzVv_L52Mgcqym&fMNuaL!!77K)8UJNkyFzIN7 z(InPD^08R-Ny5ybD6^Q&E+{Af3-};TWV5*Byc6_b6YWtDgW=JxfD$q+S8B?YxxooD zJG1l4GQuFm$!#I~B_Rx*4c;8fT#DDc2QYSrHI z;^@HC@Wj+7iT*-c)(*7sbp&RsyMM&#`PE&x()A~wf8GHuR0M2BNiw}oUX`r&Y4vqg z=k`y2;c<9fUt(v;fu5evcELAi-!3L=Lb?tVVJPZS*CcHGc=pA{8y7z5kLcb#XKi9a z&&9}~_P&%VyT%#XnI|~7=46R3EyxgB)!I>C&l~ze1KLKQo!6f}U46mSa7g{vu_D{_ z2mW))T9aM%i22yyHLsOTS6A$|349GzzFF;R?|q$T?>+I@Ivs3kXyC6KD!F{x%X@G} z7eYuPcwTZfxpIvkEyUv}*G=`uAGXMSbZD1N4H5V0XkwyZ!-ObMFg zYhBj&$74rDW#upD_GH$A8@JmBe7ro0eu(S2eZ0KqO6Ib@N6#M34Gq=jhaKu&EN=>J znO}P1mS;=tueCiZUpH@0D>Yn=jWe_~x?CN^K3p7Y*iuB^Uq)2 zEIjf}*xX6_5%2zv-^k790vEQfyXN#bxS@0QSyQ@^RO!lFHieJW7X`ErYD8_?sHd!% zQ&yL{p83A;UsD<%{z~8oTNs!=Ev*zoX@Pi{LnVi?bw!EQg*lQ;^TQm zmlg+!E`2NC4R=@i7Mt}8s`5$~4M`skK1q#we@EH^Y2o3|tzqpaCN=MrZ|c@Q9L(OX q_1_YlCG%=d-m_{;*>T>p{R~eAS&>q)W_d`B`*v5zR8U=FR`EYdo_c}+ literal 0 HcmV?d00001 diff --git a/cms/static/js/html-editor.js b/cms/static/js/html-editor.js index 9d530b6199..9a84e26820 100644 --- a/cms/static/js/html-editor.js +++ b/cms/static/js/html-editor.js @@ -5,7 +5,6 @@ var htmlEditor; function initHTMLEditor($editor, $prev) { $htmlEditor = $editor; - console.log($editor.find('.edit-box')); htmlEditor = CodeMirror.fromTextArea($editor.find('.edit-box')[0], { lineWrapping: true, mode: 'xml', @@ -15,9 +14,13 @@ function initHTMLEditor($editor, $prev) { currentEditor = htmlEditor; - $(htmlEditor.getWrapperElement()).css('background', '#fff'); - - $(htmlEditor.getWrapperElement()).bind('click', setFocus); + $(htmlEditor.getWrapperElement()).css({ + 'background': '#fff' + }); + $(htmlEditor.getWrapperElement()).bind('click', function() { + $(htmlEditor).focus(); + }); + $(htmlEditor).focus(); $htmlPreview = $prev; } diff --git a/cms/static/js/speed-editor.js b/cms/static/js/speed-editor.js index b2499324cb..cfd2b96419 100644 --- a/cms/static/js/speed-editor.js +++ b/cms/static/js/speed-editor.js @@ -155,7 +155,7 @@ function updateXML() { xml = xml.replace(/\{\{video\s(.*)\}\}/g, '
+ + + +