From 86df93c15cc8faebe987e46a409e532176b3b9f8 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Tue, 9 Dec 2008 16:02:49 -0800 Subject: [PATCH] Replaced title button with font face button. Needs more work in IE. Also added more rounded corners to several display elements. --- NEWS | 1 + static/css/download.css | 1 + static/css/product.css | 8 +- static/css/style.css | 36 ++++++-- static/images/toolbar/font_button.png | Bin 0 -> 963 bytes static/images/toolbar/font_button.xcf | Bin 0 -> 1725 bytes static/images/toolbar/font_button_down.png | Bin 0 -> 1374 bytes static/images/toolbar/font_button_down.xcf | Bin 0 -> 2576 bytes .../images/toolbar/font_button_down_hover.png | Bin 0 -> 1342 bytes .../images/toolbar/font_button_down_hover.xcf | Bin 0 -> 2550 bytes static/images/toolbar/font_button_hover.png | Bin 0 -> 954 bytes static/images/toolbar/font_button_hover.xcf | Bin 0 -> 1403 bytes static/images/toolbar/small/font_button.png | Bin 0 -> 587 bytes static/images/toolbar/small/font_button.xcf | Bin 0 -> 1465 bytes .../images/toolbar/small/font_button_down.png | Bin 0 -> 695 bytes .../images/toolbar/small/font_button_down.xcf | Bin 0 -> 1528 bytes .../toolbar/small/font_button_down_hover.png | Bin 0 -> 684 bytes .../toolbar/small/font_button_down_hover.xcf | Bin 0 -> 1525 bytes .../toolbar/small/font_button_hover.png | Bin 0 -> 582 bytes .../toolbar/small/font_button_hover.xcf | Bin 0 -> 1143 bytes static/js/Wiki.js | 87 +++++++++++++++++- view/Toolbar.py | 10 +- 22 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 static/images/toolbar/font_button.png create mode 100644 static/images/toolbar/font_button.xcf create mode 100644 static/images/toolbar/font_button_down.png create mode 100644 static/images/toolbar/font_button_down.xcf create mode 100644 static/images/toolbar/font_button_down_hover.png create mode 100644 static/images/toolbar/font_button_down_hover.xcf create mode 100644 static/images/toolbar/font_button_hover.png create mode 100644 static/images/toolbar/font_button_hover.xcf create mode 100644 static/images/toolbar/small/font_button.png create mode 100644 static/images/toolbar/small/font_button.xcf create mode 100644 static/images/toolbar/small/font_button_down.png create mode 100644 static/images/toolbar/small/font_button_down.xcf create mode 100644 static/images/toolbar/small/font_button_down_hover.png create mode 100644 static/images/toolbar/small/font_button_down_hover.xcf create mode 100644 static/images/toolbar/small/font_button_hover.png create mode 100644 static/images/toolbar/small/font_button_hover.xcf diff --git a/NEWS b/NEWS index 181fef8..55fc268 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ 1.5.11: * Decreased the default note text font size, so now you can see more of your notes at once. + * Added more rounded corners to several display elements. 1.5.10: December 4, 2008 * Fixed a bug in which certain new installations of Luminotes Desktop diff --git a/static/css/download.css b/static/css/download.css index 7db9333..9b59eaf 100644 --- a/static/css/download.css +++ b/static/css/download.css @@ -14,6 +14,7 @@ body { } .note_frame { + -moz-border-radius: 5px; text-align: left; margin: 0em; padding: 1.5em; diff --git a/static/css/product.css b/static/css/product.css index 1b7a93c..3d45509 100644 --- a/static/css/product.css +++ b/static/css/product.css @@ -40,10 +40,10 @@ background-image: url(/static/images/toolbar/strikethrough_button.png); } -#title_button_preload { +#font_button_preload { height: 0; overflow: hidden; - background-image: url(/static/images/toolbar/title_button.png); + background-image: url(/static/images/toolbar/font_button.png); } #bullet_list_button_preload { @@ -65,6 +65,8 @@ } .hook_area { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; padding-top: 1.5em; padding-bottom: 1.5em; width: 100%; @@ -156,6 +158,8 @@ } .thumbnail_area { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; background-color: #fffece; padding-bottom: 0.5em; } diff --git a/static/css/style.css b/static/css/style.css index 8c92468..4eaa119 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -107,10 +107,10 @@ h1 { background-image: url(/static/images/toolbar/strikethrough_button_hover.png); } -#title_button_hover_preload { +#font_button_hover_preload { height: 0; overflow: hidden; - background-image: url(/static/images/toolbar/title_button_hover.png); + background-image: url(/static/images/toolbar/font_button_hover.png); } #bullet_list_button_hover_preload { @@ -167,10 +167,10 @@ h1 { background-image: url(/static/images/toolbar/strikethrough_button_down_hover.png); } -#title_button_down_hover_preload { +#font_button_down_hover_preload { height: 0; overflow: hidden; - background-image: url(/static/images/toolbar/title_button_down_hover.png); + background-image: url(/static/images/toolbar/font_button_down_hover.png); } #bullet_list_button_down_hover_preload { @@ -227,10 +227,10 @@ h1 { background-image: url(/static/images/toolbar/strikethrough_button_down.png); } -#title_button_down_preload { +#font_button_down_preload { height: 0; overflow: hidden; - background-image: url(/static/images/toolbar/title_button_down.png); + background-image: url(/static/images/toolbar/font_button_down.png); } #bullet_list_button_down_preload { @@ -493,6 +493,9 @@ h1 { } .note_button { + -moz-border-radius-topleft: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-radius: 4px; border-style: outset; border-width: 0px; background-color: #d0e0f0; @@ -511,9 +514,12 @@ h1 { #save_button { margin-left: 0.5em; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; } .note_frame { + -moz-border-radius: 5px; margin: 0em; padding: 0em; overflow: hidden; @@ -549,6 +555,7 @@ h1 { } .pulldown { + -moz-border-radius: 4px; position: absolute; font-size: 72%; text-align: left; @@ -579,16 +586,23 @@ h1 { } .pulldown_label { + -moz-user-select: none; color: #000000; text-decoration: none; } +.font_label { + font-size: 125%; +} + .pulldown_label:hover { color: #ff6600; cursor: pointer; } .message { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; padding: 0.5em; margin-bottom: 0.5em; font-weight: bold; @@ -596,12 +610,16 @@ h1 { } .message_inner { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; padding: 0.5em; line-height: 140%; background-color: #ffaa44; } .error { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; padding: 0.5em; border: 1px solid #550000; margin-bottom: 0.5em; @@ -611,6 +629,8 @@ h1 { } .error_inner { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; padding: 0.5em; line-height: 140%; color: #ffffff; @@ -618,6 +638,8 @@ h1 { } .message_button { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; margin-left: 0.5em; border-style: outset; border-width: 0px; @@ -861,6 +883,8 @@ h1 { } .hook_action_area { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; background-color: #ffff99; font-weight: bold; padding: 1em; diff --git a/static/images/toolbar/font_button.png b/static/images/toolbar/font_button.png new file mode 100644 index 0000000000000000000000000000000000000000..9372ee95986f69b2856fcc02ffd55b362c085b64 GIT binary patch literal 963 zcmV;!13dhRP)WFU8GbZ8({Xk{QrNlj4iWF>9@00SpUL_t(o!_}EvNEA^V z#(#TeOLsSIi^3uzE6vivTiz-wNQj7fNPo=Fsw#tnzvy`Olo2!+d=Inw@3kEKN(tY?e5^_j$?AD@2l{*a0Ra&O``-#cHGH zOZS-N&CDracxY(!l4Ut+z^HAep}vj{C0j_GX$QdF?_$^1^*F!xMD&|8H;Jovo0z{~ z;neQpZKb;-?gN1l-2E=h)24B;t^r9%NMA zqkloDN3D1LN)4yZT_7vBKzG1#`=Bh#D6&j2sLA)E1eJ?typ z%%>0Uh>y3hedity9Xm1Z8gJ5OaKPQqm(QP=9v4UQl2qd2<0t*NFrkWiN={8$1ZGqP z1)+S-sPYIx;h|C0DF`K-Mpcs_6uWjA5UvZjB!FH*v8&5Ka4wChS7?FtHA1ng%OG&I lgmP;C{}G~xK^pEi#BZbdCdpu;gPQ;V002ovPDHLkV1mOyyB7ce literal 0 HcmV?d00001 diff --git a/static/images/toolbar/font_button.xcf b/static/images/toolbar/font_button.xcf new file mode 100644 index 0000000000000000000000000000000000000000..4331ad9c931af415827b74bf0f0a01ae15ed1584 GIT binary patch literal 1725 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 QUW2WU=}uXQ7yJ+Y1G8e3S^xk5 literal 0 HcmV?d00001 diff --git a/static/images/toolbar/font_button_down_hover.png b/static/images/toolbar/font_button_down_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..1294bcdb766fac8a584c279f20efad3590051fd3 GIT binary patch literal 1342 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 ZZUCVdj_h^9SWo}}002ovPDHLkV1mHl_Ll$v literal 0 HcmV?d00001 diff --git a/static/images/toolbar/small/font_button.xcf b/static/images/toolbar/small/font_button.xcf new file mode 100644 index 0000000000000000000000000000000000000000..fc89f2587dea860f9078b89196fb4cf7b0c8471e GIT binary patch literal 1465 zcmcIj&ubG=5PsX58vDbps1*_6(L+cMTbe^f@YZUjpkV!hC@5?;FPo>E-LSjC#7i$; zya_6L%*lh|NxWIFiuBM5LXY(is01(8n(X?`X17f-UIYi`&G){UdGGDatSKv1UN=g- zBrU-pM`9&>2&yPp4nxzkj~F9`P|!Z;5OgBO6n7NyS766X9IF{lr6Oz}dq&QQIalbu zDDr#KFY~Kq!Ot&TyhL6#3YQh#6q@PEB5}x2(pk@MSb|I27p^A^Uplsz8_t$Y!?7Hf zXCtGzWErQ6S?oAlK@}dD$HE3^flza(Ng*^HV~RQuV;DBv zgGYKWol3bRW6%VT14n0t5a9hizTTmrL0E*Z+gV@Kea+Gv!UYv|b|y<4pPZjW6-tf` zc{`0uqsd>IEHMoKQK+s8+w1t+; z%*^iR6r8$Naf*T$8@67N2E7DSG(pL?QSo9KT#iA~el%!sZ7(Tl1)b#z`rjV<&S5&|p3!F18ba*0^5o4eh2`jenu=sTM`m^7uIV~8yGXA8IiPet zNxuP2eh|1*sVHjqnW$sx_+Bm*eMi7n)m1D@ib+OYWh`JD>IN22WYi6!T51amC^Bk` zv2B)VZU$jG+zK|E8J1ZO4~FgaOfyu&PIHr1c-1fn!X@^B449zHQ%t)VWo)e@wR_I5 G=$zj%Gg!?4 literal 0 HcmV?d00001 diff --git a/static/images/toolbar/small/font_button_down.png b/static/images/toolbar/small/font_button_down.png new file mode 100644 index 0000000000000000000000000000000000000000..eedcfbf80f8c103fbb0e0fb0c6a537e783eeadd4 GIT binary patch literal 695 zcmV;o0!aOdP)WFU8GbZ8({Xk{QrNlj4iWF>9@00J9HL_t(I%cYb}NK{c2 z$A9422?<8{RoTaL-ffYIR=zjtS)F@1=g0rv!}$wQdXgq zKnUDI2!XEq@anqq`-7=s(`*VBt$QjicigT}w%r>pjfBil7{3v~eM_^9;G{$l4UvHY8}j(FH(X&jUPC(sJ%3XB&_4K9~J( zkK<6b?I>Hwr>7=4SXoW$)tjqVxHyIf2PogW-?dIF#0V_wCnLi{95@_v2Wmn9&d|YR zKh?DjM53GBfnMF`STH;LmC<)OPB*m_w2@Nx8R~C|N-3^iX=Z%v1C>YWh#x&s=$=oC z?#Iu2i%ZP9Kp?nsoB21ow4&mYW+6n@w(YgTGQcHGO8MIB)#JcDU}D~k3wE*jo-Uxi da`%=uzX0`Is2^#A9k>7h002ovPDHLkV1gDODQ*A& literal 0 HcmV?d00001 diff --git a/static/images/toolbar/small/font_button_down.xcf b/static/images/toolbar/small/font_button_down.xcf new file mode 100644 index 0000000000000000000000000000000000000000..94b8e52389ff6b2292431cc7bdf4a8bb639e4e79 GIT binary patch literal 1528 zcmb7COH31C5dIegN_n(I#eZF(#T|^rDG}QnqDdAEYf2;sFnUF+_Qa z@+KM(dBh0PqL$KN1thf;0tf`5HxCA53`QQ?U1xr_C=m~xWM;m3&(6Pk-dMmEX?3iQ zH*f^#kj#jafEfnFL10Bz6(Pt#m~=qqWLab0VaUG%IzbO@)3j!zku%xACKyaUYvD9D zE|0y%+w$3~`5b%x!lfLHs%biJ)abc1y@k(1A5<`k6sxV+z_Gl^##yYK*2bGn)>LJR zPOmi^%oa9X(-PAA7E*bwLqigO?oyXGz*-?`#EJ_ zTA_)z!SdRC4!15c>vUGmw!0u!|LfZE>@CH6$i%n^i98mvK*s~)bKr#&ax_*v@I_5A zX91f;pa6;jhWDa{(L0z(pcOL4;#e7jB1##fKTgJ==rDYDqy*p)RsqIdI0q>PI28N) zU!g%*>$VI+%R_ENr0`!1g*0+W0OKJ;6ZrEgO7dIyidXLnyF*XCf@X10@% zhmR56>m+3QI-=Scq7sh-`jv5%6l_flr^1TC(jHhgIBbM9h3FqFsNlIrXv7<$A$NrF&z<>AL>{V4_>7c8s`H z?qJOuw>o@TN2?mBY@@Qv4t<1I4i_{PhMX=KLC6-Vs;GQW8B@7lRo~oUAFZwKa(c!U z<3Hbzj=De8bbEYLex-k7%Ij-z0ZjA@En`!Dl|R@z=~ss%+h~3}m7P@fQE4B8K7wc5 z2Tg?uuMbAxR!#Md4UI94>rGF(20YWP&4ZJ(^NM+K*3bAi7g`)MpH~CQz{cwGN{1I< zVnBF4zZy^lg53)NbvUwz=JzgQ)c}=msr1Z&N0^;ofu_R3@(PR~WSe96$1hq-}An H{RH_9ST+BP literal 0 HcmV?d00001 diff --git a/static/images/toolbar/small/font_button_down_hover.png b/static/images/toolbar/small/font_button_down_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..549562cbba253ba4bb1022ae77e16c4e8f064918 GIT binary patch literal 684 zcmV;d0#p5oP)WFU8GbZ8({Xk{QrNlj4iWF>9@00Iz6L_t(I%cYb}XcIvc z$A7cCNw($#*QOG*wu*|UR!>5LB18q1QY~0dB3=rWdi3L_V4-?YJSYfWBv3?D5PI{V z)`JoR8`0JhbFifd(xeHo)i%lQj29yjY_e_N>CG_j$D8-~{{_HYSEJJc4$G7Y+Qt1M_cUk~!w0zvXxc8r?jYeJc4JA1l zZ)2c$7f)YKb8~o-(R+uNtYG? zN364D^}xlF!{k&EfZ{@#iLXVX9cuudKC+D`*Y^YP@c9&mE;xJbE!`JJNl*XyZ%y5$ zbpF{Uz+AD!vDju3S7WR1ur}U(o@+Qi0L_IDP_8(n(s_Dbi^2N>!`#szNT^Nij3~lM@HF(06=?JClTh7<+VPq&Z-B z1x?#sN&QG@mfyZ2gvvN_&A2o$qxY#vAe-PWPUUw#7$CcJ3x S&~@zq0000{wvksm+e&SRCMh!GwbXf#GOYn-N=z|J|&G7lFoIEGG{k+%5+x()(?aS0< z*ae%%>G5(IRAqSutA)!xlucKI1>B& zU!g%*>yic{%R_EV!&YBR2in!-`z9YIGLv=$K6EM0+w)u*8ynmUpWS_$nBKs!)qIJN zrWQmsw+MM@M%4I<=#>M2e&y^VdXB&HA$@+%fj;R$uHl zwAV;SOIureLi^8-+daYYsjg1x^~@|gyFBw@>iw6lr_=LGAvP4Vv^uxYJpni+BtM*8 z3h6`P-mf7;G_sH8_fr|9aulUJ{t?^B)1T&1eV$u@8Ms${O>J!*Tep0*sr7DOLw)=G zfdCs=9_Z`qeN^As9~_o+(#r7TVB-UTDUy6WFf8e%aPyF4h+ekPs#Yp*PWFU8GbZ8({Xk{QrNlj4iWF>9@00F8=L_t(I%dM18DCA)n z$3O3{-^IbfpZvQFc0(zlIVmGao5PG&QR3tvB^Nnt+MG0HZ|rT#N-1h@D9TdGBn*u| z(M%*s#-IHSHJA+hy1Z?Y-};DERk4RZe4p6CyBXs6>;~WN z1?5HQ0A!{m@uRQmWlM@~wg4$5EngRC{`7(F))K~N_vs(rz&F4^!L5w58)_}19%&KVCNtVz;)!F?R|sF(yaFb+gydr z4AlWJG8sVEH5$MCqNZb-y~D66P&X@-sciyWUPY;|vhj1E_Wct+*YegG4hsvh1iX(u zvbKAH(_u>taB=;Vmb#DR<|M}tjNHZu99=QkQ(^fmbrnJ4`Gs_S^Kx_=p{X{X&Zc67 z5SGteNMHMJAeF?(&{Q}kN>du(R^dnj0@kewyC(>^fKk9uo?7-y^^5{8VfO@|09VwD Ud%)t(EC2ui07*qoM6N<$f}mpooB#j- literal 0 HcmV?d00001 diff --git a/static/images/toolbar/small/font_button_hover.xcf b/static/images/toolbar/small/font_button_hover.xcf new file mode 100644 index 0000000000000000000000000000000000000000..9adf123905a6fa0ae51a96a2d1a86388191d94a1 GIT binary patch literal 1143 zcmb7Czl#%55S~rE81F9LiW&mQ*z0KRrVzL`{_b|aCjg6Ip zigu>5P^`qxv$0Slje?l}z$zj(o-x_=o6T;#U@UH6-hA(yA8&SMO{>uqE!_}?RhI-g z6f5HcP({IU5Sm@PN5l%@pgqt9Xg3UN4Eywmsi$%lKox0G6RVNT0hQQQLh8nx)Wk3T4>+~uH8tI`O;JhS0@0`+ab{Wd+;0fo}HID~;L2FAFcS`XA;XPqrQDSC-DTK|& zn3MO#7={*O%=}V}VWP))?<_fJf>(f}S|J2@?+)M2e+4v4>ej?gn@640-B~X6gzp{t zKGl;nQu3$pq2CtV7axLN@6{1}_OnZL^)njzb>=nE!^e#7JSF;gjnVy2v=ST#`dK+j z&Efm45=Jq;{T$7Xw;E`3l=&fG#%CY#Wx1X~>`-~|^14DLexI99rn|JJ={HQ**|e+d z+RYp}em8UEc$Rr{Om+%)`fU{Tw@u73{biO*f8~2Xp&H`oC?*>fOA4r`_Hck=qxP6G zR09VnHmX51q(XNPgxPRA7<3C%=!g5mQNPediE($pC%h;fgdKXv223#FIcC(2GPe6j Koz(dq)%gRA!1llZ literal 0 HcmV?d00001 diff --git a/static/js/Wiki.js b/static/js/Wiki.js index 308737c..d29e79c 100644 --- a/static/js/Wiki.js +++ b/static/js/Wiki.js @@ -330,7 +330,7 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri connect( "italic", "onclick", function ( event ) { self.toggle_button( event, "italic" ); } ); connect( "underline", "onclick", function ( event ) { self.toggle_button( event, "underline" ); } ); connect( "strikethrough", "onclick", function ( event ) { self.toggle_button( event, "strikethrough" ); } ); - connect( "title", "onclick", function ( event ) { self.toggle_button( event, "title" ); } ); + connect( "font", "onclick", this, "toggle_font_button" ); connect( "insertUnorderedList", "onclick", function ( event ) { self.toggle_button( event, "insertUnorderedList" ); } ); connect( "insertOrderedList", "onclick", function ( event ) { self.toggle_button( event, "insertOrderedList" ); } ); @@ -342,7 +342,7 @@ Wiki.prototype.populate = function ( startup_notes, current_notes, note_read_wri this.make_image_button( "italic" ); this.make_image_button( "underline" ); this.make_image_button( "strikethrough" ); - this.make_image_button( "title" ); + this.make_image_button( "font" ); this.make_image_button( "insertUnorderedList", "bullet_list" ); this.make_image_button( "insertOrderedList", "numbered_list" ); @@ -1332,7 +1332,7 @@ Wiki.prototype.update_toolbar = function() { this.update_button( "italic", "i", node_names ); this.update_button( "underline", "u", node_names ); this.update_button( "strikethrough", "strike", node_names ); - this.update_button( "title", "h3", node_names ); + this.update_button( "font", "font", node_names ); this.update_button( "insertUnorderedList", "ul", node_names ); this.update_button( "insertOrderedList", "ol", node_names ); @@ -1407,6 +1407,30 @@ Wiki.prototype.toggle_attach_button = function ( event ) { event.stop(); } +Wiki.prototype.toggle_font_button = function ( event ) { + if ( this.focused_editor && this.focused_editor.read_write ) { + this.focused_editor.focus(); + + // if a pulldown is already open, then just close it + var existing_div = getElement( "font_pulldown" ); + + if ( existing_div ) { + this.up_image_button( "font" ); + existing_div.pulldown.shutdown(); + existing_div.pulldown = null; + return; + } + + this.down_image_button( "font" ); + this.clear_messages(); + this.clear_pulldowns(); + + new Font_pulldown( this, this.notebook.object_id, this.invoker, event.target(), this.focused_editor ); + } + + event.stop(); +} + Wiki.prototype.hide_editor = function ( event, editor ) { this.clear_messages(); this.clear_pulldowns(); @@ -4196,6 +4220,63 @@ Suggest_pulldown.prototype.shutdown = function () { } +function Font_pulldown( wiki, notebook_id, invoker, anchor, editor ) { + anchor.pulldown = this; + this.anchor = anchor; + this.editor = editor; + + Pulldown.call( this, wiki, notebook_id, "font_pulldown", anchor ); + + this.invoker = invoker; + + var fonts = [ + [ "Sans Serif", "sans-serif" ], + [ "Serif", "serif" ], + [ "Monospace", "monospace" ], + [ "Comic", "comic sans ms,sans-serif" ], + [ "Garamond", "garamond,serif" ], + [ "Georgia", "georgia,serif" ], + [ "Tahoma", "tahoma,sans-serif" ], + [ "Trebuchet", "trebuchet ms,sans-serif" ], + [ "Verdana", "verdana,sans-serif" ] + ]; + + var self = this; + for ( var i in fonts ) { + var font = fonts[ i ]; + var font_name = font[ 0 ]; + var font_family = font[ 1 ]; + + var label = createDOM( "label", { "class": "pulldown_label font_label", "style": "font-family: " + font_family + ";" }, + font_name + ); + label.font_family = font_family; + appendChildNodes( this.div, createDOM( "div", {}, label ) ); + connect( label, "onclick", function ( event ) { self.font_name_clicked( event ); } ); + } + + Pulldown.prototype.finish_init.call( this ); +} + +Font_pulldown.prototype = new function () { this.prototype = Pulldown.prototype; }; +Font_pulldown.prototype.constructor = Font_pulldown; + +Font_pulldown.prototype.font_name_clicked = function ( event ) { + var label = event.src(); + this.editor.focus(); + // FIXME: this doesn't work in IE 7 from this click handler, but it works elsewhere (like in the constructor) + this.editor.exec_command( "fontname", label.font_family ); + this.shutdown(); +} + +Font_pulldown.prototype.shutdown = function () { + Pulldown.prototype.shutdown.call( this ); + + this.anchor.pulldown = null; + disconnectAll( this ); +} + + function Note_tree( wiki, notebook_id, invoker ) { this.wiki = wiki; this.notebook_id = notebook_id; diff --git a/view/Toolbar.py b/view/Toolbar.py index f5fbd85..0b8bafd 100644 --- a/view/Toolbar.py +++ b/view/Toolbar.py @@ -62,8 +62,8 @@ class Toolbar( Div ): ) ), Div( Input( type = u"image", - id = u"title", title = u"title", - src = u"/static/images/toolbar/title_button.png", + id = u"font", title = u"font", + src = u"/static/images/toolbar/font_button.png", width = u"40", height = u"40", class_ = "image_button", ) ), @@ -94,7 +94,7 @@ class Toolbar( Div ): Span( id = "italic_button_hover_preload" ), Span( id = "underline_button_hover_preload" ), Span( id = "strikethrough_button_hover_preload" ), - Span( id = "title_button_hover_preload" ), + Span( id = "font_button_hover_preload" ), Span( id = "bullet_list_button_hover_preload" ), Span( id = "numbered_list_button_hover_preload" ), @@ -105,7 +105,7 @@ class Toolbar( Div ): Span( id = "italic_button_down_hover_preload" ), Span( id = "underline_button_down_hover_preload" ), Span( id = "strikethrough_button_down_hover_preload" ), - Span( id = "title_button_down_hover_preload" ), + Span( id = "font_button_down_hover_preload" ), Span( id = "bullet_list_button_down_hover_preload" ), Span( id = "numbered_list_button_down_hover_preload" ), @@ -116,7 +116,7 @@ class Toolbar( Div ): Span( id = "italic_button_down_preload" ), Span( id = "underline_button_down_preload" ), Span( id = "strikethrough_button_down_preload" ), - Span( id = "title_button_down_preload" ), + Span( id = "font_button_down_preload" ), Span( id = "bullet_list_button_down_preload" ), Span( id = "numbered_list_button_down_preload" ),