From 036c0fb19af402f5213a3fa11336d4a604fc004b Mon Sep 17 00:00:00 2001 From: Andrey Panov Date: Tue, 10 Sep 2019 16:42:28 +0300 Subject: [PATCH] java: create empty sample, new upload style --- .../main/java/controllers/EditorServlet.java | 10 ++- .../main/java/controllers/IndexServlet.java | 2 +- .../main/java/helpers/DocumentManager.java | 4 +- .../java/src/main/resources/new.docx | Bin 0 -> 6994 bytes .../java/src/main/resources/new.pptx | Bin 0 -> 32731 bytes .../java/src/main/resources/new.xlsx | Bin 0 -> 5862 bytes .../src/main/webapp/css/img/file_upload.png | Bin 0 -> 1739 bytes .../java/src/main/webapp/css/stylesheet.css | 64 +++++++++++++----- .../java/src/main/webapp/index.jsp | 58 +++++++--------- .../java/src/main/webapp/scripts/jscript.js | 16 +++-- 10 files changed, 96 insertions(+), 58 deletions(-) create mode 100644 web/documentserver-example/java/src/main/resources/new.docx create mode 100644 web/documentserver-example/java/src/main/resources/new.pptx create mode 100644 web/documentserver-example/java/src/main/resources/new.xlsx create mode 100644 web/documentserver-example/java/src/main/webapp/css/img/file_upload.png diff --git a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java index b4f041c9..eae0bbaa 100644 --- a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java @@ -24,12 +24,13 @@ * */ - package controllers; import helpers.ConfigManager; import helpers.DocumentManager; import java.io.IOException; +import java.net.URLEncoder; + import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; @@ -47,12 +48,17 @@ public class EditorServlet extends HttpServlet String fileName = request.getParameter("fileName"); String fileExt = request.getParameter("fileExt"); + String sample = request.getParameter("sample"); + + Boolean sampleData = (sample == null || sample.isEmpty()) ? false : sample.toLowerCase().equals("true"); if (fileExt != null) { try { - fileName = DocumentManager.CreateDemo(fileExt); + fileName = DocumentManager.CreateDemo(fileExt, sampleData); + response.sendRedirect("EditorServlet?fileName=" + URLEncoder.encode(fileName, "UTF-8")); + return; } catch (Exception ex) { diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java index 82ffd590..a6d5268f 100644 --- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java @@ -289,7 +289,7 @@ public class IndexServlet extends HttpServlet } else { - status = (int) jsonObj.get("status"); + status = Math.toIntExact((long) jsonObj.get("status")); downloadUri = (String) jsonObj.get("url"); } diff --git a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java index d1300099..3cb2776e 100644 --- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java +++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java @@ -159,9 +159,9 @@ public class DocumentManager return name; } - public static String CreateDemo(String fileExt) throws Exception + public static String CreateDemo(String fileExt, Boolean sample) throws Exception { - String demoName = "sample." + fileExt; + String demoName = (sample ? "sample." : "new.") + fileExt; String fileName = GetCorrectName(demoName); InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(demoName); diff --git a/web/documentserver-example/java/src/main/resources/new.docx b/web/documentserver-example/java/src/main/resources/new.docx new file mode 100644 index 0000000000000000000000000000000000000000..99c1e6ed5490318f605c8aea512d51de67bf0336 GIT binary patch literal 6994 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 literal 0 HcmV?d00001 diff --git a/web/documentserver-example/java/src/main/resources/new.pptx b/web/documentserver-example/java/src/main/resources/new.pptx new file mode 100644 index 0000000000000000000000000000000000000000..f4e4bdf079b57d9e605ec753cf4f00eeeeb2fceb GIT binary patch literal 32731 zcmd?QV{~P0wl*Bwwrv{~+qP}ns@O@zwku{Osn|{`wr%H2J$;_;=k)3G_V@er{;~Jk zYuszBF@4Qz-nYCIFbE0&000C4cA~D3gP5(uJRkso7#siq^58|(2@1-TUlguxB+Gj4TXk!UUb?qV=JHg`i9$a}z!-DOWF>(MT>=d;$rDGwFE z0uI4*a$*1eJU+#X4N(?X0ZJO^O zlt9d2ea@*hFJ$t9{30;hf5Al13Fp9YoI!UjyYETjiJyW3WrWx}dnhb$Asp`prB=~( zzYx;JxiCP90uAbRAy~&IoA)K%Pv2$rtSaxAfs$lx)SEKZHHHw* z6+g;GZ+yfHz4}eM6^?0-Yb@zRsaRVq%@NmZ#3g}p@j$v&^rv>u`$H7|Tew@!ZsJGZ z+RRZgDeSbzh0)dGGb@GTAsT(d-qodRREdv71s(?zQ0(ztQFj~luOFR91D!(cdu4g+ z3w|_hHk(Jl@_+XN002S&^GD~r*H7zj0|5X)fBxz@npiv0)BXOgN?4HuW<&_R0No%Q z^I>11BAT(b6F$rudIm6JYR6u~5ig$U>df0TFrW?W92?`u-yqSjySGKTNcs+|+w;9# zAa1coeS_NF79XvdfT@6;156GIF3Dh4TemXDT$oPCqn0sJ@Jgen8|R{M%#$Fj6)N8Q z$eECH*HOANs&u24ytVuUJI$9VH;tixfkIr%2{fNq_!(b|%aCP=!bQB{Yne28lL`8? z;c+LWQ`}q#HIUrd-aA3xXQ&v0001C- zD#_T+NZ!%T-ihA8-u`!-6e+FPt}wv7p$c78CD>AgesN_igt)G)2HdWkOcxpKH6BLb zEI6yV%gdS5!>}RGo<;phXBQSWw}nXA$-`Sw@v=-xE8NgiV(80<4Eaceaq>{Mv{z9N zPb4t2ZjR1VxD6<;ZDNTm1RPJJ-wTANq=3i@O<7l(yWl=yF`35Hr->ZqKrf`R3{)+2 z)d?ndZOGQ1WG}Y~`>oy-1tn-ZzsL`jHSh3sEA=(cpi_EJo?RB%xY@@gp&o~VbA}4O zP{-D4XkR)upbdIje-PHc26o7X<*GroGxBr-tD6YOopeLIB09zs-$m(;D^c7=$F0E# zUfc(c1p!#z$_nOD$hCM^qSDqjWrEFT8)Cj`3NFR_sd5hPDTW`i5p1o>rNCx)Bn6EY z1;sG%J|5kRGNA@54_kvu6SwM~B=kGsVVzZ+VG~p~!!JS%QnBx0v&)oC7xivFfI%B* zaGGJDZ*}*t^bIdpq^+djj~}$V9AX0{$atEoDIHFpMw{rf0S|b6eS2aHZc1LnTs}W* zUh%U!j^Bo#?OLp^?bmo8e$H}`&Ns~YpFA6_E$LMjs z0RF?`n$gRW>EjZ`(w`Q0{R|7lzgpbL&e7zz$$b)fWPdWigkFeu2qk-E6r1?xHzfj` z^^uT7d|Az(TOmqkk?d{b#RkUt)&RF+P-USKBZ*J| zh+t2aAI0HKuD`?rU0_tHYg33TpjBs~otR{*rnH0M`6e3V0A#%>F``)Q)Zi$q6h*5S zV9a(6x7ROXMB>E9DpiT;XC&1vfum;#8KW}BxC$u5i!|+D`S^A2qWByTbx=MCWRHdn zu?M^cnD}fsRF~6Ha;phTR`X%|a9y1dYo#fAxuN;_3DP%hga5uFRM4e)+y6Brkf4IY zrFY(cFbP|~no+1{qtMlRn962YLA%QRh?A$6 z+Jt<39|@#Sp9QAgOnB_DRjA+HNAQS2`bU|C_%=hdl%s%z;P5=63;dxk z|2rcI4t7GdeyYCyGuY7os(NR07aK!c0}E?9OM4Tu7r&hkU@$;>b~$!1QBl!Q5CY>z zzl@%=fV6PPV1Iwmuj-uY8XD^AtxLatak#g*ySKEqw0b-RgSbC|Jhilf_JM$ehzN^_ zcs%x#_6d^&3k!>U31wgczN@Wu{QliB;?nUZA`a#qUmsyt|6BJ^_gHCPH_6Zt&Cufq zL=X=!FflbT2E!LXV&ti4>rJ}>CQHZY04YJK!s-GmLyN4$>;x@EZHBJK?glSc zvl%y4d--*!bT?_P;Wlclaywz>`*p-f`F_em(|ycDwM1fxbQYV>z?eoP8ofrF^;1N0 z1)I(KcbAoWTy8g9F7MsLx*c-a>^A48k$I~{yVZ`n%jq3*xg1`TjeFx9G^w(9F=>LwZrtdjz0?G?fvd)`Bqsr{N*JlA_T#M6$@}wmd^+ z);PBUEMMb$!4$Zo zB!;JbY=8j#X>9-ix6jo2Y2d$qpgync?VaiWR)hXr2l08A5P+W+GaLESE6hH<0{_3Q zvv)Lc`h+b8&K7pIza#T+wJWJdwvXVmc9C@fr?nU9xUiZY=|&CXNk>(~cQ?(Zhz9^v z-=C3IsJ8uL!Q+@1yu2|Xs9ebDB=KsHHSf_AdTF_?R^zN&Cs4(D~wWFsGvEV`2YBEOu1rQ3Ohc0@FpIyZnR zFUvGsY^u+GM;dpgf64!=%|bZjq0RF`;R#txzKFL??3`yAVbmrvTL6R{R|M@kAbX)r zqHOO;b~_T^7~{MYwTClaL=ur)B-#%u>^f{hwm_WD!CL|`(|OF2R>|_ImOXtu?=`d@ zZjloA9*94?l5Lt9b2_t6MH13z8doCfP%TilE9@HjPksJRz5h;dzx8fw=WOC6W8ma$ z;^;*Gzc2qCl>cM-zp`1wq&jB(=VFpiyV3mb5B=q}jDI&^^kffIF9QtNX8R_0(yC1} zuCVbL9nmS(4WMMIOMexu4eG-^nybTRj}!sq2f8Brg$EHm%rwVnULhz#!^qu$CEUZg zCkJ4-#ImmJ1W_0$F^l1k3OkPBBq0YDzJ$u9Ap_~*9Lz||J`K@hp5+cq?QbR{HdA9# zcX3!6Dkx%TU9bq)i4DAAQ}?8CwpWj_XQ4e59UOO=)5ZAY>LVIsxiDDB;F62On$+pM z`uV0A8-3t^Y77G4_|vhc0v>R4Kmh>8aDTh+ztGq}i+!eUWxK+G&=ryU)+&FOLRuh; zNbSJ>Wf{!H6F@WHrU#{n)Pnse|4U7yS7x?x7|M~_Ox2ocB+wnc6$=hr82%5;=%?3y z9hpj0(+j zq^-y(2DY>Nm-&;<!0?@j|sm_nM~i zc{%j?mMc(w7C!@300BD)s{1+u<;w|e`lg518Va=SG#DFs-Qj&((;-0Iq^oWC3)<_1 z6j;YAL+yt)5g1AXEYHlu8e9Z^fPCED>)b4N>~=$HG53ntTZ+RK5_={sRuCn0#r@AxD3!BCb|)YnQ%%uI7QiRFC@D$%CxFt9%+C%frDR%B2g{K~!S@)oUrF`gk% zKXcV}P2fUKpEuVQC_M7A06}zeyvt#cW~29Sh!o&EZR>FuYar&WSJ5uzxlod;)YS?b zZGA^dIrk6g`#OsHSggq?^zDuGjW`u&CqJ)9RtcmV#n>E+MR;)fgZ%Qj;< zS0{~OexsU|6&ng&`jcTigM<F(=b@$amDVn>QT?`!r(>Ht8$_rl?E` zS?>d$G5X9ch94aGrUg9hLkl{LseQTj?qRB}lR5A2XE!B&Y^diM+y-thY(TQ;aAHym z2`aVmTMSZxJh)s!{8*gRA`4CvViKoO+YAxc2Ajd(E={SjQDv&=?N^&TVl`HjkKw>I-_D7|8^Z$8g)`%JT`G~Jxol@RWs z8W)WBh3=sbyZUj(_kaqAY2we$gr5B`}FzauL(lS)|F`r%jLIHy?3hQ6t09nI+UJ z{lL4%i#k@rNca$<;%e8JIgcGO!f8hPra)UE*s#`hp<@r&lCH_EYN^tHN}1FW@a83h zOXU3a#S0k21sHS#o1*1@O{68mQxb-4s#KYOt3Y7-F&Nt$27=tX7nW}t44?n>X&90q zC<2UP9f$&U<`yJQKm<6+8USh&c`plqsnp!xQwv~t^6_tL)&NMRIZ=;Tsjzabp>s*j zvm$P>Q0E_QA0qb~+k?1X(ErTt|FeAl?g;;050$Jfj7|Pu)f4Ssto~QUQ?kZ|bM$lV zkI&*s^}jyzM-lnso&PAERdIEez>F}V4}u##=CMAhgh@zxDT+gJMTPMC)@xbAS=Kb9 zBzAg2Qo{nFaJY9;&$oGJ=Uj5ffgwgj&{eiy2%k`hVA1$uFDlUGX<`C1kn%#XnNHgd zO3uJ#Wsi|!8SBeY4516eeOW`_zSbLMF)5zimW|0;YJeqX@wWnww^^_iuQKOqG0gL+ zQ@qrIxpbJkLUZ5w+&-qfdWa@~lf%d{>Vvj1<*H9Tb3a)$v;p<-+?#*Q1|<;S<3Oi` zjO%n^JhL)KHoNKlsdNZ{wa=0oB2Nl__1TcQg8u^p{zCyyf5R{TP)3!?itRQ7!dvpt zMHw=L#g`&fND~!{W|5*dfJH_U&B6QS(BA6j3vLIbT=Y3U<#?)g0BuDk^!1NZ>T=4+9^pgq&jNSO9Nj`Gu6MY zq7*S@vEHFtNiqYQX5LrCSz0^y+<3Aa3o!3b+4`C{$~&Dk*|9sFC39Ye@CZ=lf^NAM z@P=ZOviI1{sjVeNHA(5r6YJkJ8G-Cx9P?M3SX=QfLmUZ6Mz+IG%xpgg&9*rC$7U{+ zrf;tQJaVx|>ljOOQ;J8u+0T?$70+fq3-QXt1uF2Bd|q)E1nLb%@SwNh9)%)OwKha4 zke#coQ?sKe7gKR}E$Ob`dXi}r#I?Djahd&$h5j6x}7n1 zQ}3fj%6&v@6DFmpHQG{1V3rTeg&r|TuRL%>It5nu!39r5(P{X25Ry*xgx74eUHs{X zZ1;tsblaLZ;Kb}-EOp=i0zjueqvcm;z;)Yi`r?z{{muIRPEr5dE1jiEeG*p)p*2MI zS`6<7?+jTBNfFhQr#seGQ7a&UDqZdF26lY8OyE4%N8lo*@d`mMwP|=o5Fcwo=5tC5SbRZ3YoiUM0@grAMxT5`$ zd^{eZvJ2^0hyPTEE=u>kPrSw-l-P{Pm2Y{1T4e9XLK{Ig+*A^b#-@`To?4BKD1~I*KuCfXAM)h$ zjd~koOIn}>a9QqbidJ^n&H;B>90KGZ*90?a+eO~x03EgJu0@YJ^R$o9fwVd|(62c> z>|u0W8C5Au{)X%^USDWYfhkS_T5WOQJpZ`n0!De#^%Ko0 z#rWa?E!+Jg#*C2MUxzj3{lQUt=1tG6@RgO>!dcLL;eX*68PQ_diw`eC zhZP!*=n63ryCxj~accAS ztR}0(b50_HSrk20;Xj-UC((5X_Swdy4T`jthCUi=mD^p*f?7XPssPE^I8l{`?FO(} zI1Ki(J9X@Jkl@r-rH0dxr5;+T4zd|l6VXuAMtC(e_?}*}ABLrcIDa`n^By8WpSFt>{_f57 z%(0uX@n;qPpU~+~=E3PVYLYhauyb+#e_^LTnTP+j{9l2m`RRnKrq7(m{uk!qUp(}e zTmOJh(UYB@%mV`WrOqX8?-^ND&{q~0#GW3JTfmszWv~^J-TcFqjOoCj9iO*%?Rr0% z0(V72^o~$XRf3@m{j3Yt)#|}{G!U~}w82e@pBWhUXO7d_=6%{R?)LE_3OrUAjxpRt zOE4^iqX@&P66iC*tx08Sh~v0kiYMjErMEU;xS9KhEyc;Tf?B$W-;BblokHPyc*w4w z#Dce{HMoe)Bt!b=lokl~-29r9N09)_ZRSqb?*D13^H=$4|10|k z)XRUQ0{-uMz@OaPU(Ee4Jb>x{tONZ2lb`uNTz;1SaQRvP!{ulD50{_)KU{u}|8V&^ z|If&e6tyfFmD|8f{y8gk{Otb!96$ZH`u~?de;}VuwKdxnHk2;>S~r9SD~&>5bIMYs zB}Wz*@x)wNeE$@4tx^(8lCx!OsN2RS-CLb!Ag_@4B;#R;^tPC0?8stwzHFziSTUXt z@AvEDyQZONSOcDdy`f-WeXK%h^YrA=_@{HeCZO3(pj65U3klKv82g*My-EJgays{H z-5p#VXd%O-SD@IjWQ6$;n;T;hs4?&cq9X6++{$jjcM~aYlgFSwI>!}2fM1{!lJ#|F zgG;mhL{dXZWG8`1`CtYlgM!bKY8w4o4aXP_5r}jK4R?7`hHAs+B4mz+Se}?GLy+dW zBSVQA*;u4>yM3LS24mMWq|c}|=a__+%C^2H^ObEz%iE?-gHbdp5Ya^z?DXj-t~Q0> z_rNzM+Nd^TOPw+*%8gF3 zKOM$`gu8u|tA2E}6%TvaCMgdT^w#`bsVOy5owS@c=0%h)NV6fE^J@RW@5hBX<;DYW z%s}XjgWehz4w$mocjptFDBX)Unt+apHfE0LNZKGcn_!a^fJ7VkL;f0xNfJ8g}U#CzZenNO#UkI1Ms2GEW*YBmruQW2m z?u~;2Lx92g+ls~BZea$>7WUg&gj1?4A0qE$1$_%a=`h`YU^R6NOUbEgPe2WJzH}W(*&t|#rG+4a!=5>y z%X9V6wnufX=;>Ce{loY9B()~zoi9lB%vX=Vj$l!nh1h7E$pwI%&@o@%P$m~$Yn=s0 za|h!|^|U=3T_(_BSJx*gMs2EH9Ao-z#Li;n=*xvdjgm2BK_*=vL7vDg%P-WoFX|%9 zYwQA3&Rp1;qjm`w0Qg{CVOZ&fc4tanR*O2ZDdH3Bo5!vNB8rE{*hgiOY_8FwZKSR> z3LUS1AA>*u{LV6`1gyc|J~@}Y&#i+*|EkaYYnJ(=!)#RjdzvBmOfw00$fN(2W-|0$ z-6kcSg_Dpt6I{<=L7z2Oc5WqH#U*00$bzyw*oj2qH#iSoCJ-kxnpe{EVB;gMO}9aS zHv|eP-6b-@!fy=H+KIs_qcf10*W<$LiAOxV-ge;a`qb;L(Jme}iM!3`Fyt~Ntr+il zRFn$`EW1H1Hdi7>v8>#a;dLpm%(|=7*l*wZDj01t&pUYbc=W2w1@=4C7YnCpzmmXM zUFxYQm*UA}29l8|02s;Pw->qr<%1gDI-U@;%h~Fa+E)|a8um!eZDOINC^HB86Wn53 z7lWFbOEfLpDj8BjGS-{k)T2N<(4QSWWO#*}TTF4G44&{guXNnUWx316@ZT!&tXCV` zi0Xsdki&g#W|o_*3_vb5M~@tw&u{ZGwNqH*sb4vPbq5!fQLb{@2xE4R5r@22xO=B^ z7>$&JV#V2J+-lxBb8BGCP*BbSS^mPw3%g(7X0Cl_d~_C-%5Ahu9Oa4_n>GX8Y1G#R zaZ_t6ewk{JxK-%DPebt2DvL2NgO~7`%c$Wom_@9x5Uca2ByxBqvphV2#nN;NF|dIh(cIlb`ZHtzn3Q*ob>)BXMF+8X0=wru5m`jU!T*z8Og**5_SkvCdEA;!?*A;Xx)iy{>X>Y z9eP34#wCm3H`73iy5_KdyCrifV3=67;K*o`VCj@hz~+}>{*dxRPDUs%W*t8IshQB; z*s3o(OMVL;z>o1P@JIpwcu5b`shHA|N_w!Gw428;O&Y9W@r&x_1xu=SD)J^>Zw`7} zJ0-r*%(%x~V(P`^?Fy3qiqt(o6ec&P$kd(F^4{YlwwEPFEIi|7Yc5*!rdy`K;~Z?* z8l(7zXTX z59z|qIoFDSjk{EA>+|r-W2)N%5?SuF?q=VHbx)fL3#H&;H}zE;>x8-cnbFe(f7iCr z_(9rr0WaS-_&+(izr}TqQm_!yCwdtD931@Hxc&n^%&V`(EOVfA=~-;_jOdzO;{yej z5lE|2%WxM6dR>r#RdP8ju%Wb-&n+(dWbzF!L#72LHZ>@v{K6)QiH-enlXbBa6E@kz z35eatQQSXdUu_MXOH_nOmqNTV&%;OzY!4U-gQS@oUnjKc?)r8@|I@Ks!WG)hnbto_ z;SvxBlbUcOz~ss~#Br#`JRFL%DVHYfH)^0Zy3C5oLLO~An;Idci+b~R9r12c-$aqI zXq!+VJSKoaq#*I_>LsF@8~*nf!3tqb}xC*J=h} zW?AIp{L`}aw8Rp)e}9Ulp$#qGcJ#i@zE-F9wOjEQ$$>sMQz47%@#4&&Nd!R^?u>1$ zv&%y?#?kSUi-t@~cC_Srl+3JS1%XpyKDqif$n;9PN2uDjJ+j3Iss_i?N5Mm6+)NWc!*^0ru` zn-F_>hss&tkOL9DWq?gpY4-Yz%@a7bO@DhvWbQysU=!>% zSs$AuDTGose&ug9rj9qGBGL#n%jIj62#bt8M_L3FUog=&Id_2=d0U>&qwp7tb-2csmTw?`%SRE+E#sYA)nUWO@I)`5i3 zAh0V9c^LiZg#4|Bft%jlL*b^KdrxqjQg4#wpi{W-Wx@O_P8C>RYY%EWR#-ffNDk&h_^ZJr zwP~s*k>N9`7t+OsPW=9|;rcg{(AJ-b)QJ$-}NhhFqMs}I<`A(2)^`F+z7|@ zm3~zwmG!l|r4(^%ATIX+QNkjpibPT~y6ycyUR6!-ouj(BY7`RTF&= zH{)Us@6S7vi*`-8pJ@lQ_-z&PbGxX#-Za+3gVVvA&5qEBPuP=heY5g#EsI$ z?pApZHEP8mJXgytG^s#;LvWOaRH$JL2-i`>nR?$FUNdUfpW|I_8Q5_4RSpAhG3>q= z;~fTxY3{L28!MEVHrVS&3h{tVPGa-cB{|u;LRygJ26dk5Rm&&j))n{HkXDmimvEWK zm7$wmvgFP&hYYG* zv$E%N=4e|{5UmN^fn(6K@W^0lS4gEH(Vh=)l926*paQiU$VBu|ffevy6#Xq}dbB7= zw!1+JVgdr^PQ`!52MGK40CT=xF*-)K@@yuiUD{M;liuV|M$;4(RCmJ$pjuLvsc>wK zLJZv9_w2%~GG)Dno=SKVE^2m%S~~PKnswr~!ek#ghESEuQVU=U%lgCTK>Dp1`f_>R zO5Y|_w_3}E#^ylBW{^*R@Fx$d?nzNh$M+SaN_anp%_;6ZMYe$xSY#^Pzdt!|lv;f; zyRy1mJ#TAZYVW{*ke)e(N`mD%a9VClTAul(GwOI@T|Cb^o2v{A#^rh7uY)9@_( zPI5_}hc67jr@;6s74UAPfuxm^py)#a4~?8tz!1GFWa6tURL!%roq1K_tShQGIux;q z72tMqevU{#%;~Oxn;htykbdbscj|H?S3o0CT&DFr-5Xsp+C9E)as+09C;IDq)F{ud z6V<~pFVwX%$G7XJ=8G=x_cs{LJ2)*W7hY{h&WY}HBOibp8rVpS^L+vBwksyDJ-QJV zhf$J<9ikk%h{Nkds7%nS%I%>BFaEhE1(@v`&3-twOsM4{36b`?gIkQZuN(zS4Os#F zY!TR{7vVH_vjn4pS|+F&xH1jvQ*2n_2=8d$Pofbe%;-9MX&C3xW3fCKuHc?eBY*r; z`0`ug0BL^$29eK+-oFdqKZy2m_0JYk1}nEnleKPK)5NN6p`FT zh`O<<(nF%~dDo5LV7ER&hiOv~!#@EfdF|>(=<#Il`_N&>!~$uRF?Fz#XkjnCstB>C z#W>*%mTU-;QOku;Lc6F2wfQ|bX{!yUV3&f@5T8<$8FY#kD&>4%plSNrOmI?$%Jize zqLf#(>Uzx-hR54NOg$w7~3Hl7t<6|8lZc(?;`y0k?XM3o9cRP6S5YlO-as| z$?2+w@2*VPX7%&)#0|fWUlA>*r~$kr8&zmqF2)_aoNS?nOGCgaJUjAROY7x&%Pmb} z*?zFv<(k_pT$s+c>RKweUVwE%+$Tp4@*;XrTx%gKK5_{#Tf*MwKG+~MIubo&g5 z^26Y(Nk<*F6(rv{x0xP(>`5lODV6@iCcd{(r{*c8xg!Dt%IHxnc1h0a@`^tI8vboq(T-~Dw5q$it91-*ydCShNOmmS(GQnkzK>idw7%aDtZpOp&Cdra4{`vVy_m%S@)}{y04}4> zV_wer$P?C2&es{+yy$F@!%z)IyGDQFH+x*p>cW8ipqn4o*1CG2k&sV%9tybf*w&wv z%PeEh-~!AJ6|jff;Rw)sPV}voP8N}v-L@S+n%7(o3;h{H4w2o0;8C!H3fB49cLmKu zPveW9(opR(^Z*NFWYuB<@=pB^0t`SQ-|m=eM0W8j}Ee{otQ?|H~}=H?kN)xxefG zL>8Lx|2{SSF#|hO`)ex$KKMkO%Y+&%(KyqKH(Vz|f#b6T#bXZ7IlOk$N0 z9DvCcf_tB@X!ms|=OXha>t-uctws$MREo%W_&6YlD;romt3JQ-0&L>NVxJ5y4r&p! zxRMOmOs4SWd3#Y$_o}O~A62(L1PH4j#fQg!U-F7Cm?dsq9rJ# z`vI#xf9jzFL$#$cYrlhIpC@B{Br{5*t5m#-jUZ6Ivf;x~*YQ{WmC;lSf#T1l*%!Jp z*2U>^FIS(J9zfR|^<&Ik?Zc@XNZK#a)Vz$HW&|dUGYqa0*JT8KQOA4OJ>;*VOUM@~ z>_AB&0_L(@wHoG4J>!Jj{;@F|jY6w>5#Qp99#xgH_+oa8kBK%WH({IynTK2 z?f8E1)M7V*ZN?}d&kwYgY(3g=%ql7XO|g|P=ndDXzbgc$AGu3EW?VLLvoU6n=QKB9 zQt`EiHZWbB(U zlUvkKMr|+TAiE!hwv78>0y4_qNXL-Hxjb`haKo<7CvPVaXP&ksC>W04@7ti~i6|+5 z%1Vj~h6ok7>tHZE&=>!-6S_&dMs^(X#FD-2JksgiyRe)s;haAVIjo@rAej=32Y8VK z!Jn17?S8u{d>cg@oQ@BRpADrq0hj;bCkd6Kq-d{7`b17mDXQ~PlH@CSG#IBiCutFd z`fFC1wI0ej z>yrhkKwT8lx(tt=DcD3tN3SgoCk3ACpmh%DdWD86EeoQWMz_I~lSO*JkNdk(ezQ`Q zmKDIGlP$?|QxLR#79gBELw*_2bBK^M>=-W{w{QLN86pB0#RbOSz*2J>cW^@9v=LU) z-*g*faG`PL5Lrh4n5E0c_9H%V3&OaLHOigP zuHL#e375J@KHbfrNtn=g&dEBg{bXakt_3~6?L+?n`tN*3tJpyO;wL;&!Tk3*;Ey@* zS=yRo0UOHT1^29*{vj(M;P%h@;h1Ql66RkdN?!P106B}Hze;{LvNJQgZ(JVyMP5b{ zbfxy4!_|yF9Xm+i`6%;dkrQXf?E+n-dYsV&lak)W-rxv}4mrVeZ>Q+p0S7yvnlWYs zWv{R=^%;rz?QQ;Z5>nwwBWE|2FxEnbL3)xWi)$37caZaBLJvG3W^i@vOqdd730i8%u`KxJE(lK1c0E&@^>V#j> zd}&*WW$)Q*wxtFY;GOVVrQO`mv3U{~!*gjrYgq+5#=H=o2y^pDDV?uPNjb$Gq3GID zs_2RLmQ0=83~Xt-_!u^9(BH5lC2Ld%&f1OG&!d>LjbJM~El*A6VI}w&t4MnBkKRW* z@4hBaUaQMwOi3lJ2MesTu%nxW5hHTs;e(8b33u>n7I@vTWjj z6JfRiXc{{iN+T`eJAoXkzALq5PI~foI7+Y&TE=?v%VC~_lT2BFE3|W-ot9470^huC znXD9Sz=>;7pnlGAgK~2b&>*<3S!Hvqix$mlH<&9zW?%^If>m7;uKNO|dQJZ`w)%z( z7qu(IN%K-}zoe<#Fr0o68n&%I?_my!MrrN7t8D2q89E~Hg2-u~Ci$#-GFOwziLO$= zw$IxkZR@3HMI2`dDidZ2Bc=lHWy}k_$VoErqYoW^fSfb%)!7;Idi*%b zy8{@7y4K@L$CwE!_{XO5kx4i30ASywH__EOa61Xj?^|_cTJ5IdXsaBqSG`u zgMy?^7YIAt-q=%wSF()IuRB%B*RoPYDq(SsKFxbz3!{`Kcy$-#9_1a6RtO>lUkMp1 zFS(es!9_(kFmGWe&t9_KY(fl-eJs{ri+WYEQ8^~?%uqJQTh>+Z2ipJ^LTms_lEs!T z1HaTHk(wKaL&j6KQbzf~8IWb-9j|t~t)Ji!Pk0a`u_0paX+$)xXk67Ir*7gn76@oaOCDvCz#uGidMWnD@$ z`??Or(z2?cs=Tmfa4psjMn~+|zSpLege}Wr&2}JkbJpuzW2=`wRZ%rC6>Nh$imLro z`a{*5S@Z@6bbt%cMh%;8Ub&Ksw;rLE(ej@adugTTEZacWbw_qHD;Cy{O%<6J$QLdw zOF|v^+HS^aDs;zh;K4mxOW8f+wHn@&kwns?B)37Q4VOCz6heRdw?(>6jOdFq~{}w zPzKmWKNzM7p_rL1mD1>;^9cmiGB54>IcbO`28WVZSw+wz@Ap4vD1`0-3c%HRg~fgx zmaab7g$gMoN8R*6=BI;4B)9eMiqBgF7h=B(e-k2iRZVG5UmliS-|jAV)@s6Xzz&>1Gd-iXHEc%r2EvyH{xTX0Bx(}W$gcaK`W%3c7r!0Z?lm1YFt zpV$V5Ue#kRvn3;Gj!D-bow;HdQFbYkitOw=U|5qMCNMn46&cLP?VOfUBkP~2hN0P! zm02McPlR`9w~<+_l{DKELGr__;CU$bc<~bq{xczRWh=IK{CWDq>hrA9zl*Iub{0Xj7>~*E{)wGql^n- zCt^*-Cy}*w4ziDeT`v^R1U; zZM2x@Dc_l><@L`**(e&><&3SJOR6dvO(z$uecnRtnzB2$qT7I{rt`p5lvb@c-ry#Z z%q_>I5~f+{ov3KN0hW@h`$#9xllwWoFiW$D!{fnv*GITW`Bdj!`38P1)LynHNQ%^H zHyYw7*lAN9ELiX7*~k#O(65R%R;TKmdP!KI@8wC!%@w$!mPO(b2R?0?rg8A57tahw zm&=^W$qd;Vi_Y)!IeaDrFKsI|*Q{hq(6wu@ag@*pSqAXM7|C1#ozpogEDXk_STveE zGiY9Pt26tyz`7wXRE0ZwAe>-F|D7fME0!5JluO{N9$HNz>7I5F#$fNQ9O0PasA$>+ zHqlnFERHvqgY4+n4aV;jk(rum8OP_K^y`%F0S*vl8=sNFWeMkV0@pzS0hX88w%&II zu5>E=&f;Q^@z80W{%nDR^Q?-w3sdf8*UrcL{(gJ=cmUEF5kpQKRVG!mlGPX=@&vd; zaY`Pv6keCZ_0GcOL}r1(VX^t-iv&*=&hEv4jP~+Vdd5@LZ@8T@_D#*Hi;C%U)Of5r zP;uY;CGaCx@iM=QxpqbNiI#FJ*5UJn8&T9xRkG45trJTH=BpDl$~`rr>SmY3ZUX{G z#S9Q_OPg4p_S^y~$A8{JV5oY#)A9+;r;+}Bp!~5#ZCw2~G{@+?klqN$TLb~wrvE!K zufON>2Xd4~M@TjvwEYJ%@75m-cSxAHC8O9r6yI^WsAsR6l|d$j z*7D^vO1TB)Vm}z|Yoy;%&?hjbXo*~HpdDp~PD=J<&W6L3+rOddK~A87*1k>;-o|mL z^KBZUTKKLav_ut=ma9fnQFeEvvA>Vpn%ud zqhO>wX&OqX3UfrAb#jHC1#8uLDVAq_TY+YZWO=9{dj>k}SS5H_Xe;|`o=yJET_)N! zB~yMCy))se=sT+kzOEB(8FykeyT&SBH(6u_uz7t}_o)n3K{@&Z3r;(%S;`fTl|Hsg zyRNEE;x6^9B++*K*5Z~8qRZH|25tJSlSEOoMI8P3`|hbd84&qx(3cPh9X<253}kX= z>y@h$^#C&s*nE6OE7Q#rMhSMu+fMfgafLLRuS=y5tY#CBNp_Bv%M~~*(2`fL^#Jw! z{nofIX!_@HmAm+?F%bfs3FPpp1F2;k9-y&~Q6p9AuS_HLyA=cBp|ep|IS4!7EU6T> zGoeI>C+2Y?kW!Cu^AB(MoYEE6XWJAFnzz!crY1+v4!yuP>BJy)<9JX<>o&-IQ>wX# z?ALS|%wgN-%#X(p#c+WbPbftSIaP1hPUw`Is(GHPwM zl7^JYv4=ulDBXxtW6$Tm&KLh_UIeG7y?qJ}~g+hHE)Ufz^W`z!_`ane&QSz62apGk_uX9(L90?S>0n zL_GI!5;9*2Fzbx5pX}BW#OM0S>M^{BEjY}kos=pmAa&UKPA&4}Hy1hkI%M-^9>}qN zMf`~8n{-WX3sRYSHpF9zwa-@Lbj2+pdbP+A@dcs1ySBGt$Ug=flh}-hiHGBw_hJO< z=g{-Q`>~`*DG#-MCNB+TmyV-PDNc+FSS9lckZh`Z9oW-#TA)FfELu%6DVeb3I{JVQ zyup6v!pLi#u=3bcgwt;QBZ|X1JF#y@yhV1Adbl|CfLx0_*!du zy$IlOm#t_BNfIONral;Dyz&35>@1+FYPvpt2~j$vJCzW)NOy;%(jg7f(p^&09U|RG zhcps`lr++p4w05dsqccH?^WdSect0*ifgfdXJ(%>XJ+=y{C9|2q_{L)R9+&U4yz*# z9VLITJ3zR9H#sfxQDKpL{z$?>L(n8S=b3LlD0Y(4@8O7qy^`9ufsIHMy~E-RhKpOj zMo*&(gJT$P|UjkFcMqb0qnSUZxlFxNM zuzKcEr=gy1V&zqUiDNI?*F!Y_`D9Pq(^*{3IZ|suvjO|1f#NA<>g(5N`~DW z`N)k=B%B#y6*!oQ`ijy)(M4)+>A4yHWQc{qZI=G*l`e}&d@KgT4w;kyR*LplPYuLE z^2kjHWVdn2@|7$+jP~PZfV}&rwyhyNN^h`ry$?mr;1UGupooz@za$*n)$3)ud+j zWxxBHK#BhB$rk(8COv-YNc1y{V?UwSnz+MKz@#L8lE8sbZ{RQkIb#GTZ%80PZP+4Q zXvskJ=BVBmCQBnUkaP0Z@E6x_F)0hQU8ZVpj*#EZEhujwWPlQ(s}Lo-)-qW>YcHGg zx?2KJZp$BthwIxs_8RGRKD7lNhTWyNWTrk@wLm@{hC9r5X-j;u zBBD4hD4~=}E4T|}A{L3_{7_-UmnC1_LVy{we4wR-z0g(;lE~MvMD|wQhC)O;wfnPLfrptxF1Mk33+&m>7R|D#hQ0*bb($UJQDZ z4DCR`5`dHpbR!s8_wqosOB$%2h1+-40RrGUiBh9sbOvBriQgD6M%w_8TyadkbZrb|rFeN))Y)NXVRT6`UnvDj1e zEO1zXxC8jqWuQDWcwDF$M}ygs@2wjPqT5AFSjPDI=vkIzb^$qK*F(>U7S9Ik&*OGA zhwv40gamc&bIbU{-8d*nU#lvPHPz$ni{$yFL)b<2l)YJBf3ppJos=%s7g;hnMrkw| z0IMnTJeY^7eWdQ4Cnk<(P|a8J*e^!HwoAC~GRBAYX5G=FdqT77lUqGP^U&((>JR9@ z^b@hGKNz&x+FXyL>!+)&D_j1)crx2`c6{CsTZ!vp^STfF zZVh}#)UD_{s6?y)1xFz>3=7UV6PNn{Dovuy)>B+6(`vzI@a0QU@NGC1cVKi(=Y+3NT0s=Cfa)TNsg#(!r29!woDh<(FuTgt3#7=n>__dF3WZ9u-`uc3v zjvdd;(R5_S+4k(kJC}x@czZ$7*Pq>VGI__UsKfUtm*0Awt(s2-nis_Q-uGQjLfMc~ zpDa1j#yX3l+LoZnD{Y2mJTcJe&wlVdOrhO2A<~ACk=nn}gyA9iymC*HNJPI5r+(N< zU3zq64Cr8QfvTdBmEWVWC4#9XdUU~AFifqx-YP&Z<%z}BQJHhN39Q3lj z#Perufq+Dvp(>6p(z=f?w%&{+t&vSz74z^h%M5ADislrf5hL=zA~B9sXBybi6xCp~ zhq9!2)(EnvkW8m-#zQ5IrkN_o+K%NezFtkrj(W208yVkc8wXGsFn!s6RL;@2xHq)G z*(2kZk+3G2nb1^+Z7ZdPt)oo)whBIQ&2BO*hFzR$mqI{QZVVM>>DKy=;PV&W14Z}4 z+!*f&d0KqW(hiVsOm}{k*WQfH5|;qKv``ZhoBw2xFSb(LhO;MHDx1@bP6QqUB_(xb zA=sj<`W@jouP;*w{Q)vc9r09vL%%_hc=?k)7HQuO9V49%d1Gx3v{N0jJri|TMdZ9X zRT{Zvs!W#|zwbkOP$*0pyUDwKxeA>}(qXt%Zf%IQ{CXyC&%35F9?=$Y?XaReCTh;Y zmsp#xc=R#)E_r81L0q(ACw3765!GFy4l7gUx2ITdG0iRXoKXcIVA0n1?UKyn1id4D zm#j068nG=dm#U*-oBudXyA;dWBSN3nEkSP?zk`r@ax%iWn@r9mY43yHzIVB6{81H) zC!1W`S<#7xI>`zm*~$@Hcr|OPtYyWy(?qC@0|`cLqxmsvK@I_; zYDbnefn*|kl+$^^`yXyk19@y*8zN6e*pdJ_T`ZZ4c2#Kmtr^}6e5>>IuAS3+PnXyy zn3OcyL%;3tzagNXQv;0Ci%!)wj@rLdgW@qqSa|{0Np(C?RNJS~fQE zGUK15!u^*Gj5(YU8XvEpktaUYefAZt$JbFB=zf=TXLKn`+q35`FHAQp zv{$|OUU*D{WzLkO21;>UGL6Ua$a%KrTD7WefhazG9ABA;ku!ZFJ@>H)8PT>nyw_j? zsslOe1db=?MdRAZ8Taz0g7*sfZdnJNGGmFRtofiVjpowelZWtxu=ua@K+X0jxvsO^ zCS<+eLAZeqNG1baILJtqsUQCa|L*qz}oTuJm(?E=V31zOv$YU|@P*{RT zI+R|KzGBd<&-&y&P~Jbr0VRCicqOT$t`zD;Yc0*N=jWCuA z3f=Oq-R7#j=G4%^)&R14-8oU6t`yE}I>=%b&hd*F{q$FqX)UR0*ZSv6Rd$)&c2A_L z9sP^P+FKfgosl`-+C9Ck#b9qjW3Q1cYd-Zs{c&<%=hD8Erfxxgz7#E0hZ}X@L0J-) z`qBZtU2nQTmYYNQT$$q8JsxDy)}lI#!zYN|GuK(QPM5Dwe}V zrkb42vbSb4Y`9g{AJ$~%WCef0j9d3QvpqEP?{cB1RN5}^NLyx=f|#@_}-a1;0aCqc=$SX$E}SNhU+&cYBGI}{Pg=5_C{?|e1JZ2e1j znypw#-aHVcUHlerK%q$$DGlJ(2$x!h-Td|j*TKWx7s(jp}I$Pm(pCj&S;ee%)7%_LB!#EEM zZ0VO&gBlwicV@!vY9a1YBRGPpaS)vQlZGn#41+uvRul_mP38ilgK!Tvib=xQY1hTM z!iAz%uon}<`Swvc>W|HNsDXmxZAPscm9wJZihijYFP?kc7LCLatp`l+w&%Rs(R{(y zG#h^bwEqoe42v;KnQ=XCGS(GYlt>y;SK zRUi5{xr^V_F@B!d|H=I!i#iVDZPpLw^?^r0q`z~244AHN0vYubMKYOv03!Jv30?RM zYH`=5$Jq4IFVD^89DauhDWc2?G=HFJa_&BzO=%_UALioneFkO|ReLXsugpr?AbkXx znle==>wU|~^6^*LptdJg3gi`~q^;@oO`xWQr7YqdT;>8vvMONEl9B#+I0yGA4aJB| z>c@?&Fhk(PH&pht3D(|B8Z$UMf*h_}h|8D`X$(^BO{EI6;^B;4+D4SM=(^PKyC6&$ z<$OArpj$;MyWlMvA8*^%E1#rR9^c>Eh_j28DT!@lI%8u_WVHK_vdA643V77Q^X2|$ zY;er|3_P#K`rR22H?%2&4<%bV-km zF!W_ByeaT*>Cu?w&MOc-#lCWsyRhG;xADg^d;7!$n!A~K)glTB_&E2RE|jCh#gyM6 z+!;|QO`-CCq+($bt%XP@y7@I*%Zh15{W({pC@ zFYoF#3#JJ`QaUASP)%{m<_{C(y0fI;ibhTM%}}uicZrtQ;2KT5OPcBFaGX7@$WoJK zLH5}vV}Q+dWAa6&P{*&WgdtD#NQjJ*Q>5!^5y)-zpd$o2_Qr?aYh_86dB&?>T;=rA zbkO86{1{1@3x}`gQj}W$ieUCs`>N+)7p&j3{lS04asR(norQ*HgI}Oa37N~(2$ym~ zcDj1zh6;Ah=7zSH2ZfP)9-(*xaRufZ0v(Od-RXs&P-3=_(mAd{(Z-Oi3K(Z%EKVDK z+l^xE<(JHOrMh9j0&_73g;B>kopl>7+|@^4VAOir+N46K6amq>YBrn4TF%+F08?ds zAjde-3NF*uRw%$iJiUfDUhT`~!Luh*7PUxO8pp1mVkx~=hyoX);f4cK-m~X>lV(&j z=XNg#m`K1pbzy0@RvaCv%{!xg;2}`X|MOe%=Qrr5)Uutip@rcuVoF=!W;Db%L(_wen!L7(_tM#;>GT=qjBWU^uqz>r|L)?o!@dqIkpo!@_ zWJ*?QdGbo?2RZWFE>9{&q4U`HO{%g@^FGiGGe?uiEi}tlVdP6>ec(Iq+gY*Q(0BdZ zlD(MpLKu7oNOY{UUky$`RQm4IEX~EknKvVB0Gv_@()3$v_{<+drEnOV_sE4gq2=r6 zR&>WYedCkZWr(GimR7#NVwGD+tD*Q6mJdtg@T$(k#dCh}gF=Xx%4BcXC!{D< zNnnX<_ZK#C%X`Uu?vvm|aBzB}pJ45vY+tdcDQY;z1vEV7#DWJI$n+(PjpvDG3H~3#5-c>`4~l7pj^o1Le{6ufe}G5%*k?U6=k_-6^?keM?oY1BE%kVb2!&8uy}NK$ z{_;b)(%d-(hT8c!IimU7Nis@P^mkD0-Nnszh-B~EIOr#LQ41p{um>V>Np@!|WR{%T|1Jzb^F+ZOND>#(#C$5wW3M}bs~6V0Kh<<_@uoqyUXksI(BD2=wll}unhn&yi2(Kj3U z1m*Rz4CUQp0snV!G)j>$E@+0pRAbIXa)mOI9T-kgvYJPJaj+J}5#&wffZry?dNC$w7lsAVML&h)3q z(xSI|gM+2Upb~vu+9#0(XwAD!{@WuVONBnLRE9~WXQFofJVT(Q3BsyOJgpAyNu&^h1>-ZY+pFl@pVs{0xD}?6G#jedQsGVeyW`iIG<$}vdr`Z zdoQq}qk9AXk-A-|Y7fzw<-=}YYo-@G1-eQKyyt|79{}%blh#dfCCV0_ai<@gN3E-F zr>^uIkY?`Sw&?{MD8*V-qFbzUdv_xwOAghm*}xul#Y}q-J@GJpg(3~ak+QrOPZRCB z+*WDFsvQ)%VpKqd&_(I9M{6XZ%FTZN(?gvdaY@C1|ik zSeap;Y_mE0#TFPXo7rmSHpHws20G57VVYX-vZ~1SP6}-zp~6Z!zQ=B&KMHs|gFI?f zl$XR%FxkG2Q0FPvck0DcAsaY{rDXTO5@B!w-8LDXc9p!I5D{otV>VTNnu5dWFRL2o_|GEo_aXVm*dKg12@BPi zz#|t0*%goHKn43|y}_;Sb-nE)_K5}ewkQISMhBE6_)M$G0c+zc(&quR$y*>O3+6?) za(%T2=z7h?5%3R0W&;KYtp>C7>9XfURC~*oCmoEJ0a!UtUOdHZV8%~}#lM~X$kyat zc$?gNH5v)vv|K*AVJJc(G3T;huWCr1HIfwwb1`da36Ns*sriNV;2_)Pn!fs2vAPsh zPxTi`7oRoeu|&Eo@#op%9j)0J+qXT&)g~RyP7-T8hEY%EhqP`19+5v=GuQEXUI0S; ztO~CgW2vXVI;EWW8`afjR$ zafC)_LtHFz0%Ptw4NgoTDg%+PGW74Tj(s|lTUDr~J{GGt%}Ey9Q$yECRub}%+L3-Q z7>5o+@aey21sg@x6aT^+I9Q=sZ{}acSR8D*e5Vw~D@!RDql%2y1ouI@aSQ0Pe@i}% z;LN+z`QGl8_K8Itqi|0?*WIO!9Xb4>#5CM)^^&HO(-KQQrgOLR&GlUEwH@j9i^Ij- zrt@7t;!eZ4f|8W8^M#3m68@9LlU#f!fA4f8egIyVS04kRJf0IwnY2H5Cm_li99VjQ zR#S~*HsGE@^CkQlV7<@*e56E}R?-W_N&mY*dTr_;jX3^X(F2tiyg>RxoygU+<;UgW zIc=)^Y{?&M>H&o7FT=+4CQ@ZZBq@@+ID8Pgc^|YOwwJz`qCV+F_rdn6hymhq#|9M zHkd}F;J$$(G8p3!#zEu`Ts!f+I);cQsiDRPC`^r3_kc8vts=S$VthJjW#=b{(s|FR z1Tu9^LH4cT%fnXB}NXB+H_qK2L3F$RANIq9*FK zZQP`>qLl37OVxEsR8mR_gwKH?E5wf-+7;A^3Iu(#LU=AMXm9zrgV%vsiir5XRbY2-inxvk-Vyq$o@qgH<&WE1_^qyE)L! z`Vf6z!%9znmPkTtv*1HNR8`}IBF3>`p0^dhc=hpNddLx=+f;Q#sh?k*P#z}p=~5jb z+|$Au&gTYAO-t&BCo7z0yq#7o-te>JYOJE#79yaNxVdt{9PfRPxD;Gro@_@iD@8QU zY#43UM994tbgw^sy4<`xcHJ}lIrYP0s6OM&`zf8+igeUUU&LujWrBY8as7| z>^~t-IneqjI67p^)%`(t8+5|7-^<9owT)&Juvh+7{xYSWX3~ z;QmQHEDAQ&k|k+FuV!|Xe3G{Cn6FBu{kvwj$gtXp4bEdT7m;N+DUxXz>a-k|61c$8^6I)fscwsNi`y@|tyZQudd z*h_PTNrHtfM;do7oez&R8in$h@0_$eF=@45Z5>b3Nw1pknS8xU_dc{3u`E}ye&9`< zb7oYfmS*m`V`ruZD1`BCQwRq!3v*cJAc?=*GKKhrZO1J>AbEsy06&X-@bvt61WSp- zF8CxA6g1|Q`t!{>|G;xw0Mu3B=<=rHl)5zk5ig5}`^EhC1XB>m&C}-} zkW2CZm*A+uWr*PC5+%gvmp8wjx#-gFhtG?Dv%9X%ea(%37UHtW{kSd*aSs2Z5Wl3A zxr{CTEX$wfmtwj2i$6YnM>$vOtkRdn^xxeGC+8PA+-@0;b#b0ngw~_tL{P(Ur>?ZS@yYlP1 z0wGmu{b$Hk3;j{7n>)puw#7lngvvM6?mF{twY}UF@Z-81pIT`Cg8Tb0{`Ub>-0y}r zJLvkRfy?{;7?rl&WPVkRo1Jpgsyl=>r1e`ZARLGzZeDMNAP97SAg-;xLI8ihcHlY4 z|6iA$-1!Ok|Ao$&nTaW}i0>T?yR-a7;lw~urYg7Mpz1^S9RNGCQ#|-# z5&Xkd*H5dxyK#5!zGZc-i)7a@_&5OjN_RDD>2an`h*g5mH5?MyF+QgUFIwfZfS(05>$>cWr7V&`kTq z$)CL8AUQFInyEQK9WPU-horanyZc8a6ab(WNgdH;GZRNguE+LvucDhA{CS9EeJ~DE zDKZNR80V;o?}=zWxGwMMYJ#KH2%aXuJvqFVNi?+mabji7`k235=hZU1byG$av*n^h$BIWz<5_w5;~(hnJ3?~2A|!YuG8b;;9z?B3(hS%(oF-Z33v&y8bn zEi(*~)+UIKNgJUlL#GFN84x;sfA!$xdREhy*1D)jdZQVpoFw+fJ=0w36KQJYP%KPA z6D5!OMPJ0>Q0Yo#F_pzFuGVD1JCj2BQ>=cr;d_cvv0c(@;dJ`6hbRc)hd`cO zu1z>c#wu;BI2*PW5X$g!6*HOt`rul9-Pk*Qxjo@y2fP<9ahX1`;M`BRR=~mkpp+%fg|x2E&61 z7T+}N-&c7Or5EVm8onrEuvn*!C#(@s2>YcYC)6lUtPe;ydcny@FD&p+n$+5_7R zk~(U*j?1l+AE#bfhniCQJt=OxvOBP0-8VM3GI}H(QaL133Rq3=X34MbZsrsz>+jOo zLK7z;yc=>N#!0GuO*ikZAu($-_PEs~abH!ENEx%=h8g#rse182Oub2v^vavQX8f??WWtml%jofRRo!HoK^X@iCtc!#=jYXs)|6`qq`vg!8SH5Qvf zLB6^);L@prN2Mp_xIFB7G4T_fYmjnDpBIlZ%|q)i@#XRdLaOjoEj|RGEq~55i z2<=j1&i;{Cgd?fgsLx8Rsbs3xVs^3CGpzbVD`r~w4!jsz0l=-Qn}Ds2|HWL z^b*!CwO#yEyPA6aJqX;7R4#SUWycDbMw6cbufz3>6__o1owDFg3o`rUA5d{R0ZjP1 z$*OGMPujX6Ira4$gLmvBYfw_cW8S%GtQYNq^vS(e7P7fQD@|Jzp_H}W5h5*VY;A_I zkw#?1B-MpuQWO*D+NgCOc!2Tlok6%Y0g)2;QQIn7+gPCTYPYdk`SR5_N?~JSs+O(% zs?(&&Ui#DaLKBY;woX+D*}{`a$T{6i5H-T^xC7MQB+rnAOoor{-h>6iWwtxN&-~B4 zbykXzdCSGx!rtOi_M%YLl_FFvg7=)?2VV+Px{1$OudFy|-ji9qii4w0M1I|Ynn*1_t|nHsLJeK+ zyLRJTC!OjnTdV_&F-bo3)V_VEjgl^=R>H5BuNui|o&*$;97i+tTiWR6}=4Ml?`a!i#mmx%KnHlyvn`VjczxBou!v)@jO-nr?^S}!n%wXEt z>~w@Jy4RDtXzjil`XN|Cx9k7pbvX+P&+}IKRnDRr`$wKXPz#@SWwyC;ue^1|C>?dH zUZ-i;*IHk@hOmcY`CG5v#?U15j!>0h*<^q06LF<#J>%1oy9oxjG)~hPoNRm(O-S## zD+Z;8lL8*}V4B{AY+ayB(^5M>ZR6eB_-0XlI_#(TTwjIJyd>nzDDVu>acCDt0UC+w z%;@oE1RUDOWX7uT+1y_U{lbjc!p7qB?xX6Y%&|eK=x_^zP~A7SkH}T&{E?qm(>_if zr@6yeS5y$EdFr+36`=+D#}oZOjt|Y&+vlLElE*TUR_s4M(@7l6f9v0oDnU*2K3J?~ ziA?q0SwhT+e{2*Lp)OcQOJT$;$ux8H&oQ-2A{^lH5s2_dpAExQLWiKOY-OX?-U^lt zUd}Aoa+qfnUwle#<;HHX7vt4dhWS`T0n{jdS0Q0x9B#mM2npuvWX=OQ%`(&VPaiiGPg zmgBhKnjb7mm{?^DH+rWz2Vk;R^}){zeZ8F2O^(L%GMB*busnp$j=8?2u9Hm^nK4C@8 z6|5CCC3Wl)jglMEg`n)baN))x!O3c#+0v>a=&V9!8ogXM$7fC)*}~v;{CCtHY ztR;X`NtGfI!YqiBHBvQcZn;ED69<_vGExjg{c8Jm)I8p)?8XM2y30_&t7w!@mz&llNJ=P|%@#;7*?O~BVr*|F=XT<9RW>b5IZ{H`-Pgn)a=ymp*HQqO}%WUJ_O{6jHS#&?FbwhrV=T?t&j=9zXN6S^bGM zIU%)4oAxv{+~DP;Ew@86{ z;T|GRFxs*glX%3kOsKjORAe9yGEQFBQ(m5b|6v)5ja!+MnpBvpRqd7n_mx`W%G*fR zpz8fRNg!xdoSy=+uwSl2rDULkd4<~AD z4`{fZj`K_ePM)+lix&=Vi#lY@9hFS&*%y9(w1$(re!cRf9N}Bj|Keb_GCUSq=b@0$ zzT$jSS(&}RDMvHD)W|OP$0xkTWEwtHen=#W|53D%UJ*iM9Z~2x!9J?lVC+ov zVSL2Hk&IMH{xye$B$+KWe>=l>4^>782is!eNo1_~Eoy-qeOVFQ5qMb(thYgRg8EaL zJ;U4jLHd|LHzoBETp8VdDb1L6?a>k&4}Xx=5Ad7gMj2w&+Xhmax88K%_T37lei6C4 zk|(pq@bASP5{MOp416Y{hCMhtd4Ai2XB@P_^HpBH~91!Gqy4hT>iyXU=1 zV->A4n%W_V@uNOQP3?x@%5hTG+c_`yH$f*)uUs>1%2nv16b`I(wQp*W5Q-u1lZh>f z$D{!sqx*7qw+A0TeL{ZgX@|UH#uvk9-psOUG&+>TD@}vS{?lFZ`ZHkzo-cNE%p($E zOBJsnqEEH0(G#XyJ|;b?^B3w4FJ6a<}-WRgJ-T0 z!e^4?biJRVkY?ma&e|n<2i8z=RlCFz!e(<^`7ph=ih{sv%3kd)pv9{2fF8E)7mS6f zw%B2o3QD}m#>qO}tXMmT{qvVPoHLyUBg$h}70I&~`gw<=e;exHV&ULotm*D(;cWP` z0ghFMHuK;IA!2sv3Jlb#Mop5Kaf7|7g|f@&h=>!w*$O}^%+n_hCZbAS_)Rc%+XjRg zi%Rg^qq%a@>u;J8Ox3pKFpaRxPHKT^!=I0(&E>nO=KX>pc7WE$E}ncT4vhEP9z??O zLT9sL^K7kwWDI`aNxW!p)MIh6LmksVY)QYs&8xbeEIHg4^~-ZLzs! zT}Nt_J7)oq9c)#}NZ1`GKZtyD*(Z~5mePN9Ym@j^GKo}n1X}HGm0M1G2S-XaQ500sZ)-_1Yph_a z1N@@nM@+{Ec{SeZM=BoA(efj=XZ6TCfr1JI{C71C8SKb)Cj6YOUzz0>=I`p-nI#H< z5&69S8}l=@{BO?A`rh+(=1dqF1eXM<3x9u;q|RU{0D9!p_%iGtf$GBP-({5x^ceDX z|91LIWVwLUB>bfOhvP{di1rqEIXL=o9;i&b zG1PM~P{u>RxhXz|u!(?^6Q`#lGE`p5_^gCt}mv4u2XTAb!DBjRyDsKVs97{_Eu ziC1xN8qES!MoCDCXe}xwR1jvyKt`2@V$*2ezD5lu-HMYyJT6zNdEh`*EeI%OJTRIq zVv00@xI!6X(&CY(uqdf%tJG5l`uYIgMwAjz;UoqaRS9YxYUF_vx+rCvk6{p)fRI~x z;QOE?qHrLP(Bc3aa&wh35d`3HAjF-`;UElv#Y9*zle#&sh&#&Wpezqy@&YMuTGk(gSF3;8^dQh=078OrovAp$m&Ensm25G080$#)OndIkxY92VD|>&BVl@(HP4 zg{#RauIvMsGb7hL3MvidnU8Cg+i;mcOQ?W}lu_l(vAE5sH_4UF9EnnY~Zlb;xUm@Q=%Glc1-Voa3N4Fe|i$B@x_>Nv| z$AQE9{Ku_QAqLNGT~%MuWPvfSXhB1Lu zIpt;H8O}T0Z?8#Esd(eVd3kxq9W5Lz7p%{SR@=yp*Y(&7bf1m z%kkwkHDM*u0Mkx63;lra3E|e#Uz)1t`4@Ghpb?exJv==^WX)00Kwyh(qv$nW+omwKouoSMB*U``t)(iFdvu8oy z9&UpvIrm<4fotuWF2Bx}gsh6n%H!cK`>{ol7Dv_PDHXR$#fHt7<|bRF{j2WpTL6FJ z_`_I$*C~YaHnDEWuHS&?gJ;h4rVYf!#RWU~aGq6lJs5xUwzs+Y3t8joIX$psXp^qK zBJ>nA!YXa7KA>E_zRx7j{d2%;5OIL@ufS`;5!#|+yLBUR5rZeL86s+|M*8`s)oCrS d3&&Poq%F_h9PF%bXPAF4!k{pIS-|GhzX5kZx&QzG literal 0 HcmV?d00001 diff --git a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css index 6bf48dda..1eb16a32 100644 --- a/web/documentserver-example/java/src/main/webapp/css/stylesheet.css +++ b/web/documentserver-example/java/src/main/webapp/css/stylesheet.css @@ -112,13 +112,14 @@ label .checkbox { .try-editor-list { list-style: none; - margin: 0; + margin: 0 0 16px; padding: 0; } .try-editor-list li { float: left; - margin: 25px; - width: 150px; + margin: 0 15px; + width: 100px; + cursor: pointer; } .try-editor { background-color: transparent; @@ -142,6 +143,11 @@ label .checkbox { background-image: url("img/file_pptx.png"); } +.create-sample { + display: inline-block; + margin-left: 75px; +} + .button, .button:visited, .button:hover, .button:active { display: inline-block; font-weight: normal; @@ -184,27 +190,46 @@ label .checkbox { border: 1px solid #E9EAEA; } +.upload-panel { + border-right: 1px solid #D1D1D1; + float: left; + margin-right: 25px; +} + .file-upload { + background: url("img/file_upload.png") no-repeat center 0 transparent; cursor: pointer; - margin-bottom: 8px; - padding: 0 !important; + display: inline-block; + font-size: 14px; + font-weight: bold; + height: 45px; + margin: 0 40px 16px; overflow: hidden; + padding-top: 100px; position: relative; + text-align: center; + width: 100px; } -.file-upload span { - line-height: 21px; - margin: 2px 12px; + + .file-upload input { + cursor: pointer; + opacity: 0; + position: absolute; + right: 0; + top: 0; + transform: translate(555px, 60px) scale(8); + } + +.create-panel { + float: left; } -.file-upload input { - cursor: pointer; - font-size: 23px; - opacity: 0; - position: absolute; - right: 0; - top: 0; - transform: translate(-300px, 0) scale(4); + +.upload-panel, +.create-panel { + padding: 10px 0; } + #mainProgress { color: #979b9f; display: none; @@ -311,4 +336,11 @@ label .checkbox { -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5); -webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.5); padding: 0 !important; +} +.clearFix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } \ No newline at end of file diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp index b989ca49..b9ecc36e 100644 --- a/web/documentserver-example/java/src/main/webapp/index.jsp +++ b/web/documentserver-example/java/src/main/webapp/index.jsp @@ -47,41 +47,35 @@ ONLYOFFICE Document Editors

- Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC. + Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Upload file" button and selecting the necessary files on your PC. -
- Choose file -
- -
- +
+ Upload your file or create new file +
+
+
+ +
+ + +
+
- - -
-
-
- You are also enabled to view and edit documents pre-uploaded to the portal. -

diff --git a/web/documentserver-example/java/src/main/webapp/scripts/jscript.js b/web/documentserver-example/java/src/main/webapp/scripts/jscript.js index 607064bf..038d2e2a 100644 --- a/web/documentserver-example/java/src/main/webapp/scripts/jscript.js +++ b/web/documentserver-example/java/src/main/webapp/scripts/jscript.js @@ -91,11 +91,6 @@ if (typeof jQuery !== "undefined") { return; } - if (jq("#checkOriginalFormat").is(":checked")) { - loadScripts(); - return; - } - timer = setTimeout(function () { var requestAddress = UrlConverter + "&filename=" + encodeURIComponent(jq("#hiddenFileName").val()); @@ -194,6 +189,17 @@ if (typeof jQuery !== "undefined") { jq.unblockUI(); }); + jq(document).on("click", ".try-editor", function (e) { + var url = "EditorServlet?fileExt=" + e.target.attributes["data-type"].value; + if (jq("#createSample").is(":checked")) { + url += "&sample=true"; + } + var w = window.open(url, "_blank"); + w.onload = function () { + window.location.reload(); + } + }); + jq.dropdownToggle({ switcherSelector: ".question", dropdownID: "hint"