From cb9b82e0f000cab401c00eca08a288196993236d Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 10 Jul 2017 18:32:33 +0300 Subject: [PATCH 01/18] [Common] refactoring --- apps/common/main/lib/component/Mixtbar.js | 15 ++++++++------- .../documenteditor/main/app/controller/Toolbar.js | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index 0798a0fe9..a39acc421 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -73,7 +73,7 @@ define([ if ( this.isFolded ) { if ( $(e.target).parents('.toolbar').length ){ } else { - this.collapseToolbar(); + this.collapse(); } } } @@ -125,7 +125,7 @@ define([ optsFold.$bar.addClass('folded'); optsFold.$box.on({ mouseleave: function (e) { - optsFold.timer = setTimeout(me.collapseToolbar, optsFold.timeout); + optsFold.timer = setTimeout(me.collapse, optsFold.timeout); }, mouseenter: function (e) { clearTimeout(optsFold.timer); @@ -163,7 +163,7 @@ define([ } }, - collapseToolbar: function() { + collapse: function() { if ( this.isFolded && optsFold.$bar ) { optsFold.$bar.removeClass('expanded'); optsFold.$bar.find('.tabs .ribtab').removeClass('active'); @@ -172,11 +172,11 @@ define([ Common.UI.Menu.Manager.hideAll(); }, - expandToolbar: function() { + expand: function() { clearTimeout(optsFold.timer); optsFold.$bar.addClass('expanded'); - optsFold.timer = setTimeout(this.collapseToolbar, optsFold.timeout); + optsFold.timer = setTimeout(this.collapse, optsFold.timeout); }, onResize: function(e) { @@ -213,10 +213,11 @@ define([ } if ( panel.length ) { - if ( this.isFolded ) this.expandToolbar(); + if ( this.isFolded ) this.expand(); } else { onShowFullviewPanel.call(this, true); - if ( this.isFolded ) this.collapseToolbar(); + if ( this.isFolded ) this.collapse(); + } } } }, diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 54b2cae73..0d35c9713 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -347,7 +347,7 @@ define([ }, onContextMenu: function() { - this.toolbar.collapseToolbar(); + this.toolbar.collapse(); }, onApiFontSize: function(size) { From 70a9e6deb5d81ee5d0e659fc6a368a050ecdfa77 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 10 Jul 2017 18:34:10 +0300 Subject: [PATCH 02/18] [Common] debug toolbar's collapsing --- apps/common/main/lib/component/Mixtbar.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index a39acc421..f77b120b9 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -122,7 +122,7 @@ define([ if ( this.isFolded ) { if (!optsFold.$box) optsFold.$box = me.$el.find('.box-controls'); - optsFold.$bar.addClass('folded'); + optsFold.$bar.toggleClass('expanded', true).addClass('folded'); optsFold.$box.on({ mouseleave: function (e) { optsFold.timer = setTimeout(me.collapse, optsFold.timeout); @@ -193,7 +193,7 @@ define([ if ( !tab ) { onShowFullviewPanel.call(this, false); - if ( this.isFolded ) { /*this.collapseToolbar();*/ } + if ( this.isFolded ) { this.collapse(); } else tab = this.lastPanel; } @@ -207,17 +207,16 @@ define([ panel.addClass('active'); } - var $tp = this.$tabs.find('> a[data-tab=' + tab + ']').parent(); - if ( $tp.length ) { - $tp.addClass('active'); - } - if ( panel.length ) { if ( this.isFolded ) this.expand(); } else { onShowFullviewPanel.call(this, true); if ( this.isFolded ) this.collapse(); } + + var $tp = this.$tabs.find('> a[data-tab=' + tab + ']').parent(); + if ( $tp.length ) { + $tp.addClass('active'); } } }, From d5bfc3244d4c19d0e4d9e69a78591d3b1a667d36 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 11 Jul 2017 11:26:42 +0300 Subject: [PATCH 03/18] [Common] debug button's layout --- apps/common/main/lib/component/Button.js | 14 +++++++++----- apps/common/main/resources/less/buttons.less | 17 +++++++---------- apps/common/main/resources/less/toolbar.less | 5 +---- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 42856bd49..b33afb11a 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -134,7 +134,9 @@ define([ '
' + templateBtnIcon + '
' + - '<%= caption %>' + + '
' + + '<%= caption %>' + + '
' + ''; var templateHugeMenuCaption = @@ -145,7 +147,7 @@ define([ '' + '
' + '<%= caption %>' + - '' + + '' + '
' + '' + ''; @@ -157,7 +159,7 @@ define([ '' + '' + ''; @@ -198,7 +200,9 @@ define([ '', '', '<% } else { %>', @@ -208,7 +212,7 @@ define([ '<%= caption %>', '', '', '', diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 4e2f3a549..0a2535678 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -1,3 +1,5 @@ +@x-huge-btn-height: 46px; + .btn { border-radius: 1px; color: @gray-deep; @@ -25,7 +27,7 @@ } &.x-huge { - .btnsize(45px); + .btnsize(@x-huge-btn-height); } &[disabled] { @@ -98,12 +100,11 @@ } } - &.x-huge, - .x-huge { + &.x-huge { @icon-size: 26px; min-width: 45px; - height: 45px; + height: @x-huge-btn-height; img { height: 27px; @@ -127,8 +128,6 @@ align-items: center; justify-content: center; line-height: 20px; - max-height: 26px; - height: 26px; } .inner-box-caption { @@ -290,10 +289,8 @@ } > .dropdown-toggle:first-child { - padding: 0 2px 0 0; - - .caption { - padding-right: 4px; + .inner-box-caret { + padding: 0 2px; } } diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index f8dc9b805..6094c22c4 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -171,6 +171,7 @@ vertical-align: middle; white-space: nowrap; padding-left: 12px; + font-size: 0; &:last-child { padding-right: 12px; @@ -207,10 +208,6 @@ width: 20px; height: auto; - &:not(:first-child) { - margin-left: 1px; - } - &.split { width: 31px; } From 27fd54d45e2cf31d43394317139f32bb39cbdff9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 11 Jul 2017 11:27:56 +0300 Subject: [PATCH 04/18] [DE] updated toolbar layout --- .../resources/img/controls/toolbarbig.png | Bin 6777 -> 8131 bytes apps/common/main/resources/less/toolbar.less | 11 ++++ .../main/app/template/Toolbar.template | 52 ++++-------------- apps/documenteditor/main/app/view/Toolbar.js | 25 +++++---- .../main/resources/less/toolbar.less | 18 +++--- 5 files changed, 44 insertions(+), 62 deletions(-) diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png index 5982df15426838f43e5e2d017cda8a1dfb0fe599..e6c0bf15247198ef62361b4484bf0be03ed66511 100644 GIT binary patch literal 8131 zcmY*ebzGBe+ukTaN-615K#-E|P>~)TqY;pn!3b%TMuCT}5f5D>MwgU;FhW2^jqa9i z{D$xQ`+nc|&$TP>U1uHVao%^NCPJLk5mdLLbMfqCVR*Ab5Codmubz9&)An=U3OVmaPDrr!6+{u6R8KDxRG8$fF zF8PUwl1G*%oSV!;y+_uhQ|>$J^H9QDnTAv$OYrgFS{hPNbj4X%E>v>(R?Si+$bey_n|LAXBG4>n0+tlQ*0?0=JTt zWEin-GWB(8myG>8XMEPhK1?`5d#(S^K6-b2b-uUP(1p5rKSNrS~mNj*oVSN!^SPHzn2{;$v^b z+3Kn&@oGP9llwo7=Kmk+T47c-|F_ZpZ%-*^0;|ms(-`vV=S8d;@&v6ZsV6=a){6P1 zE3QrcpMhS?uQ&f0r2Jj^J1~n2VLy+0Ce&2<@{!%JFCyGEu8dyH2bjq=N<{S~n2rK&G)RHCs)Mjp;`k9Hw{fMo$*q*QL)vKkOd_W!GVM zjC29HoOPycw06wv6)pG2nXJ@U_e z4;4RdNX~G3o&Qj5JC;WG5k0;QI65wQg4za5cQ~p#z8d1MWA(M_JY5zFr-3CY-oET1 z8b}w1f_afPO<}DB8(;n`pPSreKO?+#iMR>%P`VS59ziQz<0;-S+Ug#DX^gmoF)893 zB>Q-1#rk;kNFy(=e4eZsX|3RXKGO_PC8W6g&VdoKc>Rf4qii9xx_^f>2k{$H1(=tzHlUqtvurylXNlIpg zt?#^>eHQxq0(YePt#jGDTZl-1^^BHJ7OL2J$T+4od{t?WjTaty5=8b zUpwO)NL1ItcoB(Tl~v~@xRYjG^B^_=2gw8(zfyH;Dt)%Ef>T(?kW#VyUja$Tv{I5df17UQFlmOk4Scd##qK=e?;L{sP(RoTb<^gwJkjo= z=Tb-=jpEOvvRoh7y)u&a@^AaDXBgq>|8o13a+BEh$sfhWbt5KUkxrJGDs3*lJHX*` z?9{7IR;`^B9AdvY%AS3+DP<3^ap*9(CFE(SO|#uUINQfnD&3wxzpxDhhKXWF;4=&4 z0^a83USP2e=s(WG!_D*gs^t^^kkHVuKXmvK%~fpxV^aZ<-9H;TspCJi<;8UuTTr%aM)lbErv#s6OZ;(cvgQg^?3O`5~Q^OeBdxCfG%M? z@1#y-gXcTj=OvJ3_vB>|Bk<(1_WRxf#g1wK2Xr)aC-_UjDQ1Q@2;B_<9$8jp@ z+937^lF||5dtDg;H?4!$oqiHjy)sV^FRM`=A)NtivvImKy>6Ps#plZq*i=Cz8$ z%78^5jj|L_<1uHEBs%NNBZRZrmhe24iKe^(G%Pq(Fh<}t&%fYN;TGEG?x9rAmv}d~ z(5att5%*M=Q<)v@jWo`&j`Jrjc9(NHZ9YSgZznowX2Lh{u1ZIWCsidi<3YvaJ&ad7 z6?t4g$Ud0Y=rxTU@SN8hd!%3%`l>&o-q8t3Xoqtz1>}a`aszayxuYSrvJ7Y^wjemT zYr=ODt7HEP%n}VLYB`7Focx>)yi_HVsxE!}pq>Fbn+Ivow{?h8_`4cm8x~ zcJi5qw&3wTckM(qd)g|+j?h#*8=C(5qK<7{yuajb92avcxurh=~s!WCW9S^mvNnQBg=YI$3fzTW56na&w&O5YR#80+${Yp>91~IykuI*?h@=H`MM8G zz70LF0Fv~AVbsw@Jf4O!Ng?s~oQ&oNQlbN)((cXpKuqgNk#bR^^T>p+qMk!{-=h2R zw|5RYylB>G0OX04FE^Hzk7+;Wwz(7 zhH+S(H9?iBKQR-6-R2=e)14x-8ZZqeF1Uhr8q$=KXBK>n zk+CQV4>M7Rj3+aM;dHq~^26@q&OdE4vUWm&&1_7@l_!OkAQXO1LsNy@zvkD;2uzH- zr=Fh(A@u=uF~_jctP{gADbexg2aY&`u*~#fS5VW})_-LPdeD-}uzs!Ly9S@@Cl`uQCgXnDo&kNG# z*^!Rh-sWBdCpq8ARErYXmS1>AWDmqfUCmB$#89BD^M8hlJsaic&psD9&x@chv)m+e zRFv^B63)!h@@-7&ZnRXkZX9JfCN1^0pewjoF$fOqZT^NpP?=PG>$1bZRhQvh3Af28 z1tl4-*rDM2P@)K7E*7*sdf$as4@-~h9`muD7sjFp{U^^&a28v5-{?7{Vvxnz<(M0% zs$ukbp+*-j1ppE!)Rp;|nj|Px&Zw~;l{0Uhc8@Ld?Cu8U{YzzwzOm6@e62?czYs%w62zrYZNrW7V*Y=>W(AFB-%3IxXqAfbzEZIY6$(7kFQdU z<)J_BHx_{nvkQt$7n~H#31Z#cBuuqsnF#7HEOu}pPK5NG-`(dc+OWS-cz?pG}Rf{%qeUX zM85aF{F+;VI0yB~OpWxMaKSBsFUYy1RZR-bba%Fu$jMm-#KGeo(Vo0W|hJNvtEXcc(&& zLl8bW_ol3;URwq&=Ih(faAjQDo0TOp*2V}4wpsEGuP9PI3zFUR-gt3%H6?Nu!}^vPRAWRs49OMreTH0Pg!^Bpj}C<+rJ>=vNA9#XZw=-Ayib2nb82%3Reb1HvpER37aWj!|lY%2AMo-VSIFh5%Py3H{ zwnW*ROdn#5JR$Zfv)#wwiK1~~Uhv$`TCJY4trzt>n8DsMi-!38WlX|7x(mmkhW6$s zh7R>x`lNzc#7#)gx7HxYpMBYx#iKI%`ELm!xg;?YqYS7#ly)`TXO{UB?Qg|BhIMED z1wYvOD_bS@L2=!>Sz(cu8OLI5boM+n!EbyPAl8=+Tf^%Q5q~XJ`WVn1E!ao6wWLo& z5LDUni(*oR{g=J>dAtUVRdPXo_;t*J7)iQJl|(0ei~!0At?C?-k#Fx)1t)KrdsZL! zd|OrP%izJr$Q14VkGGj%*ZzJrjC)CJw34{~r#RIQC5#-e>GR9<7^@J@nJz=!YfDEE zjuu@PrXenK59~)6{HY+(+R2;VwB!>Ct3fPS^_$`?NkKyb{kjt!yR$hqjzTXS}1aTOzoccUWxYM%G6PQX2o zw=(z(xm-9NL)i4jo*x@vq@bkm7sBn)XR0uI@&0qB+;<;q^eM!ZXYx>~W0lLHUa26paHIFj_nd!$ZBoCP#-hEOAA`J;DvGkH04R(PfC zt7041R(lU82`BNx4uK`sWT1;LVjcbb1WzcAAPa`z@%P; zTOQ?bd?tTU&7sK0ocPh1`Djl_vz}Z~f^)4tT_x&PL|+^ACHhbY3h06n*+?tN#u|fs zz!|X!&f(JtLIA#(c1c5#s1%944IG+=)cq7!QHv@O!G5%u$mghN^%eMwrfAf^{*@2d zH|=xf<~F;j+9AUF6^u1UUz%~uEWelg0JA2JWYsZUSLwd(BuacnzCTz!qhv*2Sj0xF zd9exE$+UB$9V3Y$8vQY z(YeHecUEF1zipZ~V@PYhS0(qM}ONK_1-;@6jba1nQKF+1fQ!Ieb5O!0zr za{l)2J;yWww3J~7C-cSZp?P^3htxg*-$P*cf^=-2E8%45ig>4P*fp12t?p;Rquu<# z?&eX*YqVp9Ua#Lt43pUR9(M1cjc5_vuFMby*`Fiw?{@Y|E5S@{E8+4Vj%1}Bm=tt` zCV-V?VxT3QxB&O@>=?G&FW5dAgS|HIw3dku`(~$DDk&^>E8?_vM+jYwMaF z9`7WoxqU103ievqN3HIMn+A)2?dJorpA;FlE(~h8%pJ;%@Za{5={9Arbu$R_Q<4Y* zEWYX$UX|ZEVKM(u=G|ewZXA01l-Ltm&(uM;E@5l5%HRH5yz+%I$FHp|d}w)n0yf$) z7;DRBuOz(P2jz^HvE;a}%syzJ?&$%^uQNmGty;QtDW;rCbVDl5DqQQVUuCi`LZn}6 zDUSH^?tE&mSN2CX*sy&s0p7N4yhMb~cCswua?G;Qv4G$Vof7AqHpE^9-`-z*4K9yM zdSnX&(W001Gb~zeie(oTS0(SHOzvJ|d4s)<4HlpogWoCX-bmB0xtLXym+ReGgdB54 z=vME6D(|~wXPrq$n=~Z zwZA8sKi6FQGIZe6XT!yOuQlVmp3D86m7-pbl8t**lrmx5=U`P#26K6ORZfv6v0$+3 zmPkk^k955AWpbLi44Q%6a8=300c3tYGj1BgL&w_@86)z;L9nezJd-{z#bC}<#w5v6 z{j8P143B@x)KjqAUd5&xSL{uAS;Mf}0oLX=^_*~OrmlYKI$^T-u%JcAERlOsiS|7| zE1!dVHPq!4<#`;!n({+eSk0>k`tQ~OqMLgH3v8Jfra;0!#$MA}Qh6w0wCe(XyL0Z3 z#0&f_>wc&zoA3#2}Msr95;em3scP06!8eQ-|zbCFpZ{X1wmGF|Lgd@A_ zN=7g`TJS6-&@T?c{FjV#af?&&t}0)i-#~C!KPYuvF>_=aycLwXPUIpn_ga7)lOqjV zrtRt}r+s5ect?@ZG8}?hLF6N+i7~yi1!EH)kW1%Bu85b4zZ!+aeRnEJqfpg1ZQS4>MITdzoiOQ{)+Xz{Cgl%5k!+L-7;3}PyR*p&?Vo{~pIYtRgsXBzU^td9b-}<2Rh%&T z&yn!KWwPVn$?Mr}s#x!=@};QZu?mE--+eMJwk*xpLJxNx>X=tHmIFa@VB_ncpphnB zgZAUwhs(HPqrAO#2lmHyPZRh_#RmjzTg?8d%Chh@OguM<>EbvE5?}-Q7XAY{Gk{?& zZ_`|42?37&saf^+-Ymo3G_BH+CNp^Aw!|w09#!~T+>CDXR9D518WkhjN}rQJ~;Bf>_T6&-i7 zH%fsR)0;c3Ke+QFBjF%TVfuEY+(^7&%`E%7p+5`hyPrUVar;=5U+wzR5u1)o(rR{L zgUpN%1|pU%46XSHFb^HGu%pEySc)$U$=`VVKrC`xN#3=E(7<&4yfA}NnFGx!R9C2& z#Q3dL7Zjo61WnPm;fsS5ArSh`$HgFlC6H@|;&@H6u>GA%R$mt^U%YY}Jt<{E;BltQ z)`oeBr_8B=a3=#{KN!3w?BbHuQ!dWBL1^`|>p>wJPqzove4`ZwUM}w^n}! z>U@PZV61?*ZycTf7acH>^b8glDK6W$FwnKOWHb%lp`F#%#;`!kmi;C_Il$7AN=|7! zU&p;I01Ej5K=$j>H)F@HK?w-1(cMcF6Yr%p%-8_UBG42sHX7VhHQBC?n1*=OkVGy`2@aNT&jO=`G-Ua{r^2NKcsrUH^ zeYRFI#@;dG8s5n*Pwlhlo<_RHkPUZF)DBA$aD=V|tZ*@e$`4mxam1qY zAuGCiek-w$iUQvqP}XBUV2WMZ5p$59H)mRNpr>=77xA2~g0MT;`_QE@{$qb~(~<2` zicPYNnJBqJCdGSs+t{f}^{6Hj~mGd{;1YPjgf*=(tYL2dp$!!gPC zHQtJ_4~h=3=}c-mq}DQ6fOFT~j$PQSD_k1i?wz`u?{{1UU=(HIA7d%iRQqNaOt$FA z+k@j(`bt@JhYeE%s@@M>wU*B?cZlAIG?n**RKVx%j}}ecaix|^Y7zR9-F&-%AmL#_Q)O0+#`LC#J~;rZ z`mM6mvqKsrI!P?*PIHF0RJ0?oV2##K>MRn5a`NVw;pGfYSZd=)3OS~-cx3u+eq!B> zcuTqdcPVlGN0Rb-w!QfZz0~zbbbjO}7V+Qi@cV7lJ+%i01h1xdwSG6UNPsbndd=y} zAolLQ;GM;bEsWC&p&eYXd^TMowP(!;vmHX@MFx!d4RG4=uO2d Hi_iZ9=k@HH literal 6777 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 mjxgx6ZB_D+++#_zeu;Wv{pEklTZLo* diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 6094c22c4..fee05cace 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -281,3 +281,14 @@ .button-normal-icon(review-next, 16, @toolbar-big-icon-size); .button-normal-icon(review-prev, 17, @toolbar-big-icon-size); .button-normal-icon(btn-dropcap, 18, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-pagebreak', 19, @toolbar-big-icon-size); + +.button-normal-icon(btn-pageorient, 21, @toolbar-big-icon-size); +.button-normal-icon(btn-pagemargins, 22, @toolbar-big-icon-size); +.button-normal-icon(btn-pagesize, 23, @toolbar-big-icon-size); +.button-normal-icon(btn-columns, 24, @toolbar-big-icon-size); +.button-normal-icon(btn-img-align, 25, @toolbar-big-icon-size); +.button-normal-icon(btn-img-group, 26, @toolbar-big-icon-size); +.button-normal-icon(btn-img-bkwd, 27, @toolbar-big-icon-size); +.button-normal-icon(btn-img-frwd, 28, @toolbar-big-icon-size); +.button-normal-icon(btn-img-wrap, 29, @toolbar-big-icon-size); diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index 43ac7fd15..ded87a9b2 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -145,51 +145,19 @@
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
+ + + + +
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
+ + + + +
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 7374ef304..8ce9cc211 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -608,7 +608,7 @@ define([ this.btnColumns = new Common.UI.Button({ id: 'tlb-btn-columns', - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-columns', caption: me.capBtnColumns, menu: new Common.UI.Menu({ @@ -658,7 +658,7 @@ define([ this.btnPageOrient = new Common.UI.Button({ id: 'tlb-btn-pageorient', - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-pageorient', caption: me.capBtnPageOrient, menu: new Common.UI.Menu({ @@ -694,7 +694,7 @@ define([ this.btnPageMargins = new Common.UI.Button({ id: 'tlb-btn-pagemargins', - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-pagemargins', caption: me.capBtnMargins, menu: new Common.UI.Menu({ @@ -753,7 +753,7 @@ define([ this.btnPageSize = new Common.UI.Button({ id: 'tlb-btn-pagesize', - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-pagesize', caption: me.capBtnPageSize, menu: new Common.UI.Menu({ @@ -967,34 +967,34 @@ define([ this.toolbarControls.push(this.btnAdvSettings); me.btnImgAlign = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-align', caption: me.capImgAlign, menu: true }); me.btnImgGroup = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-group', caption: me.capImgGroup, menu: true }); me.btnImgForward = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-frwd', caption: me.capImgForward, split: true, menu: true }); me.btnImgBackward = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-bkwd', caption: me.capImgBackward, split: true, menu: true }); me.btnImgWrapping = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-wrap', caption: me.capImgWrapping, menu: true @@ -1205,7 +1205,7 @@ define([ }); if ( me.isCompactView ) - me.setFolded(true); else + me.setFolded(true), me.collapse(); else me.setTab('home'); var top = Common.localStorage.getItem("de-pgmargins-top"), @@ -1304,8 +1304,11 @@ define([ var $slots = $host.find('.btn-slot.btn-pagebreak'); $slots.each(function(index, el) { + var _cls = 'btn-toolbar'; + /x-huge/.test(el.className) && (_cls += ' x-huge icon-top'); + var button = new Common.UI.Button({ - cls: 'btn-toolbar', + cls: _cls, iconCls: 'btn-pagebreak', caption: me.capBtnInsPagebreak, split: true, diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 583d10a67..69181f0b7 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -266,8 +266,8 @@ .button-normal-icon(btn-setmarkers, 21, @toolbar-icon-size); .button-normal-icon(btn-multilevels, 22, @toolbar-icon-size); .button-normal-icon(btn-numbering, 23, @toolbar-icon-size); -.button-normal-icon(btn-pageorient, 24, @toolbar-icon-size); -.button-normal-icon(btn-pagesize, 25, @toolbar-icon-size); +//.button-normal-icon(btn-pageorient, 24, @toolbar-icon-size); +//.button-normal-icon(btn-pagesize, 25, @toolbar-icon-size); .button-normal-icon(btn-paste, 26, @toolbar-icon-size); .button-normal-icon(btn-print, 27, @toolbar-icon-size); .button-normal-icon(btn-redo, 28, @toolbar-icon-size); @@ -297,13 +297,13 @@ .button-normal-icon(mmerge-last, 72, @toolbar-icon-size); .button-normal-icon(mmerge-prev, 73, @toolbar-icon-size); .button-normal-icon(mmerge-first, 74, @toolbar-icon-size); -.button-normal-icon(btn-columns, 75, @toolbar-icon-size); -.button-normal-icon(btn-pagemargins, 76, @toolbar-icon-size); -.button-normal-icon(btn-img-frwd, 83, @toolbar-icon-size); -.button-normal-icon(btn-img-bkwd, 84, @toolbar-icon-size); -.button-normal-icon(btn-img-wrap, 85, @toolbar-icon-size); -.button-normal-icon(btn-img-group, 86, @toolbar-icon-size); -.button-normal-icon(btn-img-align, 87, @toolbar-icon-size); +//.button-normal-icon(btn-columns, 75, @toolbar-icon-size); +//.button-normal-icon(btn-pagemargins, 76, @toolbar-icon-size); +//.button-normal-icon(btn-img-frwd, 83, @toolbar-icon-size); +//.button-normal-icon(btn-img-bkwd, 84, @toolbar-icon-size); +//.button-normal-icon(btn-img-wrap, 85, @toolbar-icon-size); +//.button-normal-icon(btn-img-group, 86, @toolbar-icon-size); +//.button-normal-icon(btn-img-align, 87, @toolbar-icon-size); .button-normal-icon(btn-goback, 88, @toolbar-icon-size); //.button-normal-icon(btn-insertimage, 17, @toolbar-icon-size); From f21567ec3132b535418286e770e33871b5ea57f2 Mon Sep 17 00:00:00 2001 From: nekurill Date: Tue, 11 Jul 2017 16:30:27 +0300 Subject: [PATCH 05/18] Chenged icons review groups --- .../resources/img/controls/toolbarbig.png | Bin 8131 -> 8464 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png index e6c0bf15247198ef62361b4484bf0be03ed66511..a61829eb0a2b500c5eb3fc724ac2600ff1630a6c 100644 GIT binary patch literal 8464 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 Hi_iZ9=k@HH From 6ea33aa303b87ddfb5c0bb1887b678291ca4dd62 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 13 Jul 2017 11:50:36 +0300 Subject: [PATCH 06/18] [Common] refactoring --- apps/common/main/lib/view/Header.js | 2 +- apps/documenteditor/main/app/controller/Viewport.js | 6 ------ apps/presentationeditor/main/app/controller/Viewport.js | 6 ------ apps/spreadsheeteditor/main/app/controller/Viewport.js | 6 ------ 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 3a6b03b91..107349cc8 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -202,7 +202,7 @@ define([ var me = this; me.btnGoBack.updateHint(me.textBack); me.btnGoBack.on('click', function (e) { - me.fireEvent('go:back', ['page:new']); + Common.NotificationCenter.trigger('goback', true); }); if ( me.logo ) diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js index 7cbe4cf05..fe6907548 100644 --- a/apps/documenteditor/main/app/controller/Viewport.js +++ b/apps/documenteditor/main/app/controller/Viewport.js @@ -77,12 +77,6 @@ define([ 'view:compact' : function (toolbar, state) { me.viewport.vlayout.panels[0].height = state ? 32 : 32+67; } - }, - 'Common.Views.Header': { - 'go:back': function (opts) { - Common.NotificationCenter.trigger('goback', /new/.test(opts)); - // Common.component.Analytics.trackEvent('Back to Folder'); - } } }); }, diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index 2288b2ace..d35e86f09 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -79,12 +79,6 @@ define([ me.viewport.vlayout.panels[0].height = state ? 32 : 32+67; } }, - 'Common.Views.Header': { - 'go:back': function (opts) { - Common.NotificationCenter.trigger('goback', /new/.test(opts)); - // Common.component.Analytics.trackEvent('Back to Folder'); - } - }, // Events generated by main view 'Viewport': { diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index 16706e615..3d2095fc1 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -76,12 +76,6 @@ define([ 'view:compact' : function (toolbar, state) { me.viewport.vlayout.panels[0].height = state ? 32 : 32+67; } - }, - 'Common.Views.Header': { - 'go:back': function (opts) { - Common.NotificationCenter.trigger('goback', /new/.test(opts)); - // Common.component.Analytics.trackEvent('Back to Folder'); - } } }); From d223649a8ad90c459209ec3a501aafb8a037f04a Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 13 Jul 2017 12:10:40 +0300 Subject: [PATCH 07/18] [Common] dynamically insert svg into developer html --- .../main/resources/img/header/buttons.svg | 30 +++++++++++++++++++ apps/documenteditor/main/index.html | 24 ++++----------- apps/presentationeditor/main/index.html | 26 ++++------------ apps/spreadsheeteditor/main/index.html | 25 ++++------------ vendor/svg-injector/svg-injector.map.js | 1 + vendor/svg-injector/svg-injector.min.js | 9 ++++++ 6 files changed, 58 insertions(+), 57 deletions(-) create mode 100644 apps/common/main/resources/img/header/buttons.svg create mode 100644 vendor/svg-injector/svg-injector.map.js create mode 100644 vendor/svg-injector/svg-injector.min.js diff --git a/apps/common/main/resources/img/header/buttons.svg b/apps/common/main/resources/img/header/buttons.svg new file mode 100644 index 000000000..469f3386d --- /dev/null +++ b/apps/common/main/resources/img/header/buttons.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index e96f89d26..1061a2bdc 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -260,24 +260,12 @@
- - - - - - - - - - - - - - - + + + diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 67c13157c..dceb753f4 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -259,26 +259,12 @@
- - - - - - - - - - - - - - - + + + diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 38f8b1ced..ebd1280e2 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -261,25 +261,12 @@
- - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - +
diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index 1b3547397..827f55a14 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -355,26 +355,7 @@ }; - - - - - - - - - - - - - - - +
diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index f0c9d2caf..bf64e4594 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -281,26 +281,7 @@ }; - - - - - - - - - - - - - - - +
diff --git a/build/Gruntfile.js b/build/Gruntfile.js index e4021d4b2..d10362add 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -23,6 +23,8 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-htmlmin'); grunt.loadNpmTasks('grunt-text-replace'); grunt.loadNpmTasks('grunt-mocha'); + grunt.loadNpmTasks('grunt-inline'); + grunt.loadNpmTasks('grunt-svgmin'); function doRegisterTask(name, callbackConfig) { return grunt.registerTask(name + '-init', function() { @@ -142,7 +144,12 @@ module.exports = function(grunt) { options: { force: true }, - files: packageFile['main']['clean'] + prebuild: { + src: packageFile['main']['clean'] + }, + postbuild: { + src: packageFile.main.svgicons.clean + } }, less: { @@ -210,6 +217,24 @@ module.exports = function(grunt) { 'index-page': { files: packageFile['main']['copy']['index-page'] } + }, + + inline: { + dist: { + src: packageFile.main.copy['index-page'][0].dest, + dest: packageFile.main.copy['index-page'][0].dest + } + }, + + svgmin: { + options: { + plugins: [{ + cleanupIDs: false + }] + }, + dist: { + files: packageFile.main.svgicons.common + } } }); }); @@ -375,8 +400,8 @@ module.exports = function(grunt) { grunt.registerTask('deploy-jsziputils', ['jsziputils-init', 'clean', 'copy']); grunt.registerTask('deploy-requirejs', ['requirejs-init', 'clean', 'uglify']); - grunt.registerTask('deploy-app-main', ['main-app-init', 'clean', 'imagemin', 'less', 'requirejs', 'concat', - 'copy', 'replace:writeVersion']); + grunt.registerTask('deploy-app-main', ['main-app-init', 'clean:prebuild', 'imagemin', 'less', 'requirejs', 'concat', + 'copy', 'svgmin', 'inline', 'replace:writeVersion', 'clean:postbuild']); grunt.registerTask('deploy-app-mobile', ['mobile-app-init', 'clean:deploy', 'cssmin', 'copy:template-backup', 'htmlmin', 'requirejs', 'concat', 'copy:template-restore', diff --git a/build/common.json b/build/common.json index 0a7255f78..bbe9f8883 100644 --- a/build/common.json +++ b/build/common.json @@ -1,7 +1,7 @@ { "name": "common", "version": "4.3.0", - "build": 1, + "build": 32, "homepage": "http://www.onlyoffice.com", "private": true, "sdk": { diff --git a/build/documenteditor.json b/build/documenteditor.json index 553082c2f..c630b14bb 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -1,7 +1,7 @@ { "name": "documenteditor", "version": "4.3.0", - "build": 1112, + "build": 1143, "homepage": "http://www.onlyoffice.com", "private": true, "main": { @@ -164,6 +164,19 @@ "dest": "../deploy/web-apps/apps/documenteditor/main/index.html" } ] + }, + "svgicons": { + "common": [ + { + "expand": true, + "cwd": "../apps/common/main/resources/img", + "src": "**/*.svg", + "dest": "../deploy/web-apps/apps/common/main/resources/img" + } + ], + "clean": [ + "../deploy/web-apps/apps/common" + ] } }, "mobile": { diff --git a/build/presentationeditor.json b/build/presentationeditor.json index d87eab13f..c8f72f99e 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -1,7 +1,7 @@ { "name": "presentationeditor", "version": "4.3.0", - "build": 774, + "build": 776, "homepage": "http://www.onlyoffice.com", "private": true, "main": { @@ -164,6 +164,19 @@ "dest": "../deploy/web-apps/apps/presentationeditor/main/index.html" } ] + }, + "svgicons": { + "common": [ + { + "expand": true, + "cwd": "../apps/common/main/resources/img", + "src": "**/*.svg", + "dest": "../deploy/web-apps/apps/common/main/resources/img" + } + ], + "clean": [ + "../deploy/web-apps/apps/common" + ] } }, "mobile": { diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index cea408c65..650425953 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -1,7 +1,7 @@ { "name": "spreadsheeteditor", "version": "4.3.0", - "build": 879, + "build": 881, "homepage": "http://www.onlyoffice.com", "private": true, "main": { @@ -178,6 +178,19 @@ "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index.html" } ] + }, + "svgicons": { + "common": [ + { + "expand": true, + "cwd": "../apps/common/main/resources/img", + "src": "**/*.svg", + "dest": "../deploy/web-apps/apps/common/main/resources/img" + } + ], + "clean": [ + "../deploy/web-apps/apps/common" + ] } }, "mobile": { From 394638e40d8886d3a2c0353ce76f678ff105f367 Mon Sep 17 00:00:00 2001 From: nekurill Date: Mon, 17 Jul 2017 18:18:51 +0300 Subject: [PATCH 16/18] Add icon svg-btn-edit --- apps/common/main/resources/img/header/buttons.svg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/common/main/resources/img/header/buttons.svg b/apps/common/main/resources/img/header/buttons.svg index 469f3386d..28656d8d3 100644 --- a/apps/common/main/resources/img/header/buttons.svg +++ b/apps/common/main/resources/img/header/buttons.svg @@ -27,4 +27,9 @@ c0,0.553,0.448,1,1,1h7c0.553,0,1-0.447,1-1v-2h2c0.553,0,1-0.447,1-1V8C17,7.448,16.553,7,16,7z M6,5h7v2H6V5z M5,13H3v-2h2V13z M13,16H6v-5h7V16z M16,13h-2v-2h2V13z M3,10V8h13v2H3z"/> + + + + From dcfecc48eb52deafe1d0b86191b7a3b1a1d54e47 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 18 Jul 2017 15:20:35 +0300 Subject: [PATCH 17/18] [DE mobile][PE mobile] Remove saving show-snaplines option. --- apps/documenteditor/mobile/app/controller/Main.js | 2 -- apps/presentationeditor/mobile/app/controller/Main.js | 4 ---- 2 files changed, 6 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 6d58ec665..64ddf5482 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -482,8 +482,6 @@ define([ me.api.asc_setSpellCheck(false); // don't use spellcheck for mobile mode - Common.localStorage.setItem("de-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0); - me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me)); me.api.asc_registerCallback('asc_onEndAction', _.bind(me.onLongActionEnd, me)); me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(me.onCoAuthoringDisconnect, me)); diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index be8911e8d..4573fa85e 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -456,8 +456,6 @@ define([ var zf = (value!==null) ? parseInt(value) : (me.appOptions.customization && me.appOptions.customization.zoom ? parseInt(me.appOptions.customization.zoom) : -1); (zf == -1) ? me.api.zoomFitToPage() : ((zf == -2) ? me.api.zoomFitToWidth() : me.api.zoom(zf>0 ? zf : 100)); - Common.localStorage.setItem("pe-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0); - me.api.asc_setSpellCheck(false); // don't use spellcheck for mobile mode me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me)); @@ -479,8 +477,6 @@ define([ me.api.asc_SetFastCollaborative(me._state.fastCoauth); /** coauthoring end **/ - Common.localStorage.setItem("pe-settings-showsnaplines", me.api.get_ShowSnapLines() ? 1 : 0); - if (me.appOptions.isEdit) { value = me._state.fastCoauth; // Common.localStorage.getItem("de-settings-autosave"); value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : (me.appOptions.canCoAuthoring ? 1 : 0); From 30c65658ecd9c625523b8973d0324cdf032628b0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 18 Jul 2017 15:22:51 +0300 Subject: [PATCH 18/18] [SSE] Debug format settings dialog. --- apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js index afb247f2f..50823c079 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js @@ -100,7 +100,7 @@ define([ '', '', '', - '', '', '', '',