From dc2475af7ae19c2fa39745ebb0c260138bce0dda Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 16 Jan 2018 14:12:13 +0300
Subject: [PATCH] [DE] Change settings for table of contents.

---
 .../main/app/view/TableOfContentsSettings.js  |  25 ++++--------------
 .../main/resources/img/toolbar/contents.png   | Bin 941 -> 733 bytes
 .../resources/img/toolbar/contents@2x.png     | Bin 2079 -> 1624 bytes
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
index 2d3167c3f..e3684197c 100644
--- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js
+++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
@@ -49,7 +49,7 @@ define([
     DE.Views.TableOfContentsSettings = Common.Views.AdvancedSettingsWindow.extend(_.extend({
         options: {
             contentWidth: 500,
-            height: 445
+            height: 430
         },
 
         initialize : function(options) {
@@ -66,8 +66,8 @@ define([
                                         '<td class="padding-small">',
                                         '<div id="tableofcontents-chb-pages"></div>',
                                         '</td>',
-                                        '<td rowspan="6" class="padding-small" style="vertical-align: top;">',
-                                        '<div style="border: 1px solid #cbcbcb;width: 230px; height: 197px; float: right;">',
+                                        '<td rowspan="5" class="padding-small" style="vertical-align: top;">',
+                                        '<div style="border: 1px solid #cbcbcb;width: 230px; height: 172px; float: right;">',
                                             '<div id="tableofcontents-img" style="width: 100%; height: 100%;"></div>',
                                         '</div>',
                                         '</td>',
@@ -83,14 +83,9 @@ define([
                                             '<div id="tableofcontents-combo-leader" class="input-group-nr" style="display: inline-block; width:95px; margin-left: 10px;"></div>',
                                         '</td>',
                                     '</tr>',
-                                    '<tr>',
-                                        '<td class="padding-small">',
-                                            '<div id="tableofcontents-chb-links"></div>',
-                                        '</td>',
-                                    '</tr>',
                                     '<tr>',
                                         '<td class="padding-large">',
-                                            '<div id="tableofcontents-chb-underline"></div>',
+                                            '<div id="tableofcontents-chb-links"></div>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',
@@ -102,7 +97,7 @@ define([
                                     '</tr>',
                                     '<tr>',
                                         '<td class="padding-small" style="vertical-align: top;">',
-                                            '<div id="tableofcontents-from-levels">',
+                                            '<div id="tableofcontents-from-levels" style="width:220px;">',
                                                 '<label class="input-label">' + me.textLevels + '</label>',
                                                 '<div id="tableofcontents-spin-levels" style="display: inline-block; width:95px; margin-left: 10px;"></div>',
                                             '</div>',
@@ -183,17 +178,8 @@ define([
                 labelText: this.strLinks
             });
             this.chLinks.on('change', _.bind(function(field, newValue, oldValue, eOpts){
-                this.chUnderline.setDisabled(field.getValue()!=='checked');
-                if (this._changedProps) {
-                }
             }, this));
 
-            this.chUnderline = new Common.UI.CheckBox({
-                el: $('#tableofcontents-chb-underline'),
-                labelText: this.strUnderline,
-                disabled: true
-            });
-
             this.radioLevels = new Common.UI.RadioBox({
                 el: $('#tableofcontents-radio-levels'),
                 labelText: this.textRadioLevels,
@@ -359,7 +345,6 @@ define([
         strShowPages: 'Show page numbers',
         strAlign: 'Right align page numbers',
         strLinks: 'Format Table of Contents as links',
-        strUnderline: 'Underline links',
         textNone: 'None',
         textRadioLevels: 'Outline levels',
         textRadioStyles: 'Selected styles',
diff --git a/apps/documenteditor/main/resources/img/toolbar/contents.png b/apps/documenteditor/main/resources/img/toolbar/contents.png
index e9acee2a3811f13151816b52950a767e2677eb6a..83210bd7a250c18e476663f092eafadd0b3d2a43 100644
GIT binary patch
literal 733
zcmeAS@N?(olHy`uVBq!ia0vp^-+*`m2Q!f5Nle=dq>KZ6LR>*KDZs_W#ngJ|2B0><
zk|4iehW{?*cXz)_n<=Ptro(tuXoK1Rx8E5Um^?gP978H@y}1#aCt@hz`mi|mUwQSR
zf8pJeY!(DwSmE1T;9MJbF!ZE8`|~-)=PaLpTfz|WMBDq%oX)qA(@w2Fw{GhCEV13$
znh9C^Ki;ZkDdgr-Pm{ki<BXyzM_{E&*3u)2p%orMj0?K0IeuQ<YVUF?L#8=x%OAIO
zUw&9dx32s-P5R`H%Wo3Z|9x|Q&*2<2GpnHH+_{EB$KO2m+Z_D#%p0x?MXf(fteLn}
zGQUWltqVDKM$fXrRJ4oh=Yr$QZ&osWpBbyYJS}+=&*WnoEgDOo-<)*m@|*nGb`1;4
zr>?%lsLTG(`0#>^PxCngyV^kRzcY7Ll>eoSoRwZe={n)2tG85aSla&gU>n!88$nuo
z3O25CG}<PjDybi{GHcJ#W9zz@^kY_JDf)k#+9P~z^{q3X%U*t|3Y}ee`|8;RD~b;l
zg?d+APuxG_TAK*>^~%uCtDb=Zsl0!cS-Xi<^oxsPQMZ<^3hOb`vYugiJIMRD`Knuq
zSAl|8SD7Uz@`G4gSEU6d&A!R4`!*@Gd5YQWy)mWNS4#<Ox&0<lCvsiZHO1cCH2p1G
zyhGnkm||7Gch%n+fA`L{wn${?Xq327f4%aTyilQzaq60lbvu_vUR{#~jBf@9hjP^o
z_hK#ImxpuxzB~1E8IXHF)-tmEX>Br)+yCyA&i0(`ISdSUr`~cYPkrFL<YIYv6;S2n
z^6-1tfy~!HRp;Mzh2~BS<z)aGW^^HT<0{^gaHh=ir6BoGph>mmOQ)BHUyHoDFEx~z
a;Q=$No!(x<Sh;y12Y9;rxvX<aXaWGGqfW5^

delta 919
zcmV;I18Dr+1+52=B!6#EOjJex|Nk>HGuGDDv$L~ZU0r>BeMw14zrVklnws_X_3P{F
zZf<U;r>EfH;Earn%gf85p`it1!P4FDtH9$$e#&i@(~hj$D{;l??)O@X&Yia3-R1MR
z%IAKe*Yx-M#nbC~oz-HG&>(EYP=w5~#pa))Yli>;0{KZqL4Q<u+U(ecuH!Higy9(<
zGxYBJKW#~r#ds6xI_i8C7pI&bA|fIpB5R@pU>?7+fZsD>c^1j^zq513uW}?-SAv7F
zocL<j=7>w6+cCS7ZD2Gq0M0YE*Q=d;BQtR0L&8%fuE52=z1lAxsTK5wVkq$oF{AqT
zY$gnjuUHTaSAUw_Y{zH&#wWN&G7T1>zh_4Pbg$X{O0z@8p4k}>C1${HX8ZSr0@><?
zX5TXQ%udk(R+x~O5Id^h%#H)Vb!O*`U9({%4Mw(>;5-?&vq^@{>>rDso*bVtjtU(p
z(c!~10}=;5jPs;7h=_=YT&b$nK(>M<Wj<hs`Ko3a#ea7!>1OA@+S{|16cTotuWAp$
zuq02?uyI~h!<R2uRieYjX;sa|fprDL4)axQ#BsTFdc3L)zwGK_Kw`zq$yF`zsRHZ8
zw9-hQa28dy)v2n9h=_=)+Gu2}SVHwS(b5i8wPYwQV+A8d!?vY;LRIUQZK9<et!l$3
ztRdS(OMg37)r<^SX7)r&J6P3#5Z0PKUv=lJ+Job2vzuYYd{wgwgtpA=iI#S#s&$f~
z;@hj*OSY3+nyQ+rnuv&qh=_=Yh=_c!dpmYvEC~$6K(teknbv!he~ib>pTILO1C<K<
zPzpdy{48dEE$Z;urSP*-W$^9R!%4G;)F-n`8Gk}j?U_<osY?YelC%J5C(QmJvHE6o
zc4XHpwb0VX*;-7^Yu)6?2koG@FM5yAC9SCq<KyfKD14Yb4xC*8b}f*;o1Fj!veeso
zvsVoew-!r_I%w&;*>wWv%_d5UM5*^hNK*cOwxs-JwiS86t^s3ugr&(LUi_n%ucTM6
zUw?e@2Irh}&bg=GS+dl(xvCZmI}LMh1H^2wszHths~Xp|4OX>Kr@^W=>oi!^W||nR
zYFY0!4DhPvRn0l)oOAApcb3_u-pp0C71_O*dE2YnOv_$Xi&Dm5RfC-ERW%^UTvdw=
tayM7ihNRrEz^mHrc~x`HIp>^v3+DoIbr2W!ea!#>002ovPDHLkV1jb*;Hdxr

diff --git a/apps/documenteditor/main/resources/img/toolbar/contents@2x.png b/apps/documenteditor/main/resources/img/toolbar/contents@2x.png
index b622082dcf878f44e34d9d5b6d9f489d01d726d0..e1946694c9974e5160557535ca55c6a1647179e8 100644
GIT binary patch
literal 1624
zcmb7CeK^x=7@kT#B6T^Z$)ZnR)ljsP96HOIB&r=1c6`hZmRV%JYKqb!A*IGaMJ>9>
z*fd`eWj<nMTSqg$S<@*c`x)kJq{i7wUFYBPUf28H&-J|beZBYdJa5J!Z+Am|Q+)^o
zV(76Cg@Hh{K=odyyI7q;zGB=|gTtW%K6^Fze-;Xb+Tq;DP|H@vV!VHaJezkAudGOr
zUEI)gq#z8H^4aQ)F9f2^_CO(h5&`h>IW-fKQlct{mTRJg71r+^D_(le+F<Q+QLugE
z_&kfc^hJoraSC?OqA;k&eosaomv~*m<u8t2-!@yk|Cv-~#c=sB`5;uk(vbQ~&6-b)
z>EZ#ZGlOo~*FNtD9*o^-Igmoqwls3=ny3z0+vX6nxNcZwvaeN7WR=_PHucBdAF>|)
zl@a2;eUWw28Y_?f+o4^D+a3ToA$D0Lh2h}t73Wlu(iS1R6mY@+sBiC{t`}jEY}dMA
z%IFo7JFiY~)+Iv-Z=G_|e#8dgkMyEfUt46N3^0qG*#VX|kMui5-1DyRzpvC5acN^(
z*FV~<WVcke*J)93JqHpIhM_g)$3T604P2O&cIMd4_qV1ax#4dx{QbNPTRn8l6W4q;
zJ%^JRl7f@?;5*<#Ds4+$Q*gdEj7kd={^TFU4m_goS9m$Ubi$NEurgw|a8E-Kzn`fv
z0ww0W4aJ^v(<TQu2e7EpSc$u*kl7_!Q%7=(stT%^sgD`sTO4p3>#XkUTsdguBhZa?
z4;Y<t!M3D7?=oWUc6EI)Q0ET?+tK&RN{k{fotQiCMv36F!x<u`VbdhBMhE7;zPnE$
z-O@cZLAG(u)gHEp-`aNd0cS=jzohEVL_U-yb}g6EInSg~Cj_wi6|JfQQfOKwzElO9
z93$VzNLR>0hpV)MfTsGvr=)cTw3j}dJGOK%x!&V6NLb{u$@sjr`>t@kIb55O;Mlhh
z0uVOU^G(kO_HFbf=kd@|=szJ_C1Kzzq+ObP#+I8nUIKOFRLAat(btc3D1(TbZAh%L
z5-6pBhE(UAMuxEu<5eO;Hq!2$T*=&<dI90@$>Zn%WXDknnrJxBNLJN0cXcO3(rTlg
z-ye3*=b?$hLWy_v+j<hMR_9Tc>Y_$JhP1nk1Qby;Gh}s;Zde9Bn|o^JDx<=aC6%C^
zwI9u?gq^m<qpRq%^?cxbpuza+TT>=*7N3W9gBg+>S$r1%TSYAX(+C=z3@>d?n}L;K
zKE?5J0Rs7>W5+>X&vMl+f>UE<so+$WuK?3E#F1OCtyM}(hO^8>PWc@e4smO3kPf^t
zTWPO6C~)c2sAEKg)bP(fTj^?TIf>PnXVaS{E>F!9pee23)Qa#<*-NA+k>=7<EU@@`
zGl0%i4PMd3PfJTmS^VX8V)m3!yo;dj9J?%#V%~(+ftO~-3$s;R{O&sefv_>g=}s;_
zL2ZM@FN-tZjXjY1o8T1aZN|ER0DM}&ljb7fO|@|n>rdCSsFu8Sy?Cow-uL1)<$o*w
zKNt;#B`|Z0c>^QK&`&$Hp3f(M^YM!cm*t$fks{0b+$8MM8(Fexu*2J==t7fF4}UEh
z>Wqtwk%d@gc?kl*3rvrPnK$hbehEzDPRkFr@omDd<jODPBn`PnO}^|k7Z5qv(fR#Y
zy5K?MkCLqav)z+n5do{Hj;QYrb&&)qPUOf9s$7-!sP;*aEJgsY{pyDPCb96KMMI3b
z71!OP(-8n4_qs;iuE4-2aDc$1?r1m*8=J)vX#=yjNGy8Nl4%0XtFFZhM%qk{&Orc2
z=P;?ndcGx|NV}b#hA;&P1a<Ju34wN!jR3ayV|s|Xwi0v^=blYNqAjsJ&U|BDZQr&A
zrI6VjDz4THodjrxjrcNV&6}zku3PjN0@xPsmp`<M#1i&n@`qliok>T<Zfb~EoTeiH
zT<fe5Afzkg+y(@|>U|TQd0e+jj4tZQcWFq3!OL>w>F=ADd^NS;PHUk{6U4JR<}K7*
T@?DE@P0C}hH>zq+@cDlMR1O%`

literal 2079
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
GKmQx8R_90n