From cc71c406707616402b918002eb4059cef0436735 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Sat, 16 Jun 2018 12:45:19 +0200 Subject: [PATCH] Add download button in advanced actins for map and datalayer --- umap/static/umap/base.css | 20 +++++++- umap/static/umap/content.css | 15 ------ umap/static/umap/img/24-white.png | Bin 19034 -> 19000 bytes umap/static/umap/img/24-white.svg | 60 ++++++++++++++---------- umap/static/umap/js/umap.controls.js | 2 +- umap/static/umap/js/umap.js | 21 ++++++--- umap/static/umap/js/umap.layer.js | 12 +++-- umap/static/umap/js/umap.permissions.js | 2 +- 8 files changed, 78 insertions(+), 54 deletions(-) diff --git a/umap/static/umap/base.css b/umap/static/umap/base.css index 271f9d35..a40af1dd 100644 --- a/umap/static/umap/base.css +++ b/umap/static/umap/base.css @@ -334,6 +334,19 @@ input.switch:checked ~ label:after { } .button-bar { margin-top: 5px; + text-align: center; + display: grid; + grid-gap: 7px; + width: 100% +} +.button-bar.half { + grid-template-columns: 1fr 1fr; +} +.button-bar.third { + grid-template-columns: 1fr 1fr 1fr; +} +.button-bar .button { + display: inline-block; } .umap-multiplechoice input[type='radio'] { display: none; @@ -421,7 +434,7 @@ i.info { } .umap-delete:before, .umap-empty:before, .umap-to-polygon:before, -.umap-clone:before, .umap-edit:before, +.umap-clone:before, .umap-edit:before, .umap-download:before, .umap-to-polyline:before { background-repeat: no-repeat; text-indent: 38px; @@ -435,7 +448,7 @@ i.info { .dark .umap-delete:before, .dark .umap-empty:before, .dark .umap-to-polygon:before, .dark .umap-clone:before, -.dark .umap-edit:before, +.dark .umap-edit:before, .dark .umap-download:before, .dark .umap-to-polyline:before { background-image: url('./img/24-white.png'); vertical-align: middle; @@ -458,6 +471,9 @@ i.info { .umap-empty:before { background-position: -160px -126px; } +.umap-download:before { + background-position: -88px -168px; +} .umap-edit-actions { padding-top: 5px; clear: both; diff --git a/umap/static/umap/content.css b/umap/static/umap/content.css index 6db1e78d..41734935 100644 --- a/umap/static/umap/content.css +++ b/umap/static/umap/content.css @@ -143,21 +143,6 @@ h2.section { display: inline-block; height: 128px; } -.button-bar { - text-align: center; -} -.button-bar .button { - display: inline-block; -} -.button-bar .button + .button { - margin-left: 14px; -} -.button-bar .button.half { - width: calc(50% - 7px); -} -.button-bar .button.third { - width: calc(100% / 3 - 10px); -} .demo-instance-warning { background-color: #c0392b; color: #efefef; diff --git a/umap/static/umap/img/24-white.png b/umap/static/umap/img/24-white.png index f5bf14e20eb0f01875606255e7f30520befbbca4..95edf1d611571579ab5d36eceea62115e74820c4 100644 GIT binary patch literal 19000 zcma%DcQ}^)+rRAF2uVmb*(*ZHO2aCI>^-w(?-4?hO_CM2k&wMNAxX&ID@pd=@9B3O z??3PH{_(q>Lp|<8w`+XA=lNOZ9j2@(bBTbO06~yTa)dmmGC6|6Qm`Y10bkW5ij2Pt%6!ElVC{r@! zD~X?;-V(;`|L^c^is}>gpAQMpF8IyH#wLSEnV6U) zY8SY^t$5<2RqJX?j(pZE{>ZFprcV)&J80FgG|jb^`0eJc#l^(|6%`fXZ;M-02tRd% z?e6Zb$l}rxJ@u1Xc?E^-`MEhqw8}D(L|RdtEXz~Guvk;{gQ7)vm+4VSX=$k#AD{iW z!^#X^@5I^D{K1nCA3j8Sh@~P@ea}N56sT{T7#qj<42+G9Q5Uf^tH>Wd%G~UY>$gPo z@d*jJn1g=yRS+U5#)0|yc`rXdf?%fVyu4*?B$Fv>b-a=E_KB(NYXEyY&+0 z-`}wya!B@Fnzu5MbmBFQ1qG{U_=Q_iD+GB`b#t9Re(-Lw6m+nMvIq+c-(+K3DpTXc zLEiP4tEsEM#d2749J@*CSugR;kpD9t|8T6D6+hM9^@y)B3yz0<-Im=AKF4%d2!dms zMJH8*gM)FAs4mm_qu;TzES6KfIu$nf;o;%OrIU6=DR-QHCufw|_oj;TJ$}bOE0?Fn zxy{xn#bEd~;<^YIE30{HpXw;E3D`~lQkCL3+tg8Gf(!@_BASjqPD-gbL zx<4K1ESl0KkVGVqbnGUN!eC@MgcpaW{mxG*c|&Ni`UVC{shYeHvSZzvXtU8kadB}z z4)WKMq|zhG<0WqEQ%kIh9}c{tWm(9>+mpQZ*Cw--*?+Uge>?QqeoHTTrUCaU<>T;* zWMpWl=KBvH#JbH(N8zWq(uAys!ZW_upP!x5o0^$Tw$5+9lUk4OGA+q3YB<_I-dk1p z02g_BHboh8Gt|EF@4@DLWhA`gX;&=U`5PmuFWliZH8nkVUH_qyWGie&$%@oC{fd;? zDLNOoSm+|z66Dc_RQv1kW?FFjt8{tu`<{yx4X?OWl$D(nfBB+(oxtlzn&Sp;pb@Tr z4l=RO!83l~eReL3?%&QRv7B!3iG1?m_U2W%G8(x%!pS|pb8TT3FDGOEjg~G2bEsyE ziM+e5Idn?Ad6shAy6jxi@s{?u6;4@yBWEhTlHt@j|IFv)U~?S9aBHDU5(`N%TWu~J zt~^^F;hR=4=P)7fnlX6fA7IPm@WHWvN(FGPaQs-3^vD8j@|tK$xOs*~tmm za9UaUU}N36!ur_Vk^RN5U%x)%`TzU(?_mMJ6e+v0@Hy3mB zYRGWY_wV1$coSDzW7(9Zo}eycN|~80_DTS=lW~*s-%x z!}UBeaQ-P%OY#Nk(=r@aNrqywva-0j`S^Nu%AWV_HUA}fErm-K!pGe`cAtlsPtg4P z!7WZsPJt*dQ8@BHeTtDb{J|~1%qiXJ@3&x7l4eBZ!cVBiPVR(TYgakWfuMq0Fm!m7 zt`%W-XOE1G_~tkUgzFGbU;M(ma7lLbpKn|y2(Aka4Q)qouXcteFU7==={q`ZHNp8uW%%GyFBmv_>ftfD=#naP?UpXxu#)R zf~SKPOI+iAeN}Io)xB@zw}QD9dEqGLbxfqUto_s`!c@Tao_YuL{OA`W?$7b za~$O>j=1n348t~_{;_gvoaN=^>)wZ)2}9LFhz$J z*8KgHgGl8J2;~m`eKUKu%7I>3=!(TZ&DtM#+%d~d2cfg42y&;l{^6`&16#J4*$HCQrwsb2?&_H2Q(Afn*;GG)1cxUzI*p>VK83>`-tofpp?A0Pkx z+xPGP+RXMbLbXJZI3H8q`} zr=!#VH7!K{BFN@4Kj~vuRa$@a*@94VPX={*CK|nHhFGCh4qp~2zfVrC=lSNeQAQru zKPgd3{LA=XPTVIQZS6X}A|tnAq)D*b8HK#16MrvmH&IpB;L&DWY}%hC7nz-tBZ)~Q z(KFuPuOjaB`@2D88>_)%)&UKKH>sTf*Sz$wJ7WvGY?(_`^e7=Ki{*Lw*pv@n(|##| z#_QWidVc;&m82dNhaFF!o~Uaf_~@NS@|I=_3f2TmW18(3$v@<(J%pwyL`qwQ&$J zx^*1Hi5<-lOjSoDg}t9jSm z63qI3{R&D=O}$5H{U{bdA9Gk(*f3GT68w{CQwxi8mR}XmZ@o|YvxK3+8Lw_XoZrji zQ>#KbnV6O)`LXbsLBrACd^afFbf`yKE-o(X`fighTrZze%t$b}^au^xL|@|nySMgZ zuib6m6`pA9X0m<5Q)slSbf4@RwWBUw7iRg|*0!_vqyScT&VY}{Y)fzqw9^K!i@N#G z)r;2u9u8RxPD{9Qp4u_8;2tcX9FBFS;2kBoRz630+tiSu9!Q>Ve7XE;PGevPf60MN9w$c6Z zY1{K##D^QnkF&d(Ncr?L;t~>mFb360ain0Smz0<9Izekg7=m(88sWYR1=^&yMKj9~sBy;s7Dygam@Z6ARIa4L>YI)pKRw=W6fpZ1m*cZd zEAF{7s8wn%jDyM?mZZUf5lf^+0B~a4ZwWpBSk$aclSvGCPYjL zjRlgZknPvu;rCrTIn-!wI~dB`zkmP8(Bpy{@Fj|$_EkQ_@bB(3CVJpUQq^TDIxf;< zUYfG$yNBXpNhzwpO7+PMB*}%U`-~b+;uw>U}BnU;L)j=P}kISpK~0R ze6QO@Vq{}uGuIMKsO04nc3E2a*)x~+2bgrBF)=Y4fOkURLJH@%59JXD(G(s%J-u^F zTU$LSeWKY&bGRye6urL)1A*A4@ zif3*NP}b5ql#-YKRw|F)is2swDAEm;mTscjX(^3@TXSQ|VTCHe4dv&4e!6c`VLLvw zGWoHl#?uUtNjF*816%~2iz=L$gnp%6%561a-8?l7jowX(Pz_F%Jn~YD-l-~}E0pJ_ z>wY0^B5SfEmG;ww!@5pAcTdAw!&UNV+y8mPEE8bQu%|v@ljFfuYo)s z{LHu?4@J8)5Rb$Tm62)RI8tss+zb2n;5tx?jckAlG8Ps~T1e>Y*VIe(tYl%>@Ow|5 zxVY>tA8s%CQ9ajVyq?tvPp#O)!(*w<_-602v*=N1t2aQs=^x1=>qQx#&gD&e-V5as zQu2xsR!wdzpjBWwRTLByROIAXD0z7upR4AnonN~&j!R7sOStdLmoFay<}8|gebZGw zYO^{yIXSMaqcg4B;C)!#EndjU!4YlXGWaY6SaFBf05vsrgP7mhi4zpvJY4_&{{A~0 z92|Uau8R~_#t&JQ=QNz|jpwzuw_^lL5+5??0Rah;HY)1BxL4WP=7TSB2w(EP-JkZ8 z?6)e9;oAM_Yi(_<3Mb+T1fkdB$A?2PgrBIDg@xs@qO9yYn_JZDlCJ+oW}%LM+g|Ez zbUR+HOvB^totaV{O2Xjv!<>nQ2mJz${fKLV=3y#%b^D#s%*WK%ue+I>nVlXwM&uit znD{Mn5f`W*>-qSc#w>Oxx_J!{5D-Z4!KssnJxJ^5=rFj1zJqn3nom`?*vT z%CD}D&hbAu=QE1W0wOjeq?7=i|Gm3u@*BwMEyTI`C5~vlek1Je#Udc-)42JC(Q`hi z#)CP+dw#=Zao)mDgXter-H{-P$pf3LDh-0>O(ko!$+9{aV|f zON+r-2)L^Cj`nu5qwL6Qf~?GpjEwj5)Oe?0u?=kh?m5=@@|Osg zDVp6XSM2iT%deqfd;p&Dp{=d013G$z{j~4H@BCLODQgjLqM7+fiKFLV-&_-X^``VP z(NLk@b>75oFWLy50(EC+=YO>9ez2tI@&^fuN5n~3V!M1xTvx|7u5zg#i0@ukyAXH2 zZu1c$xPi^z`QP+7X%YJ;#>MTJK71H_TSR2PIQkd5?>QN)B8kwju%z3{sc<$2fGSe@9!|M#Wn<%QJY1-Et(m=1@?&OZ8tr2meW+>1=084Y{dPR04{SFtUFPEAqVMkN z(h^}}#`6a@g6$dkfa#vT{?w9ivhAPmiP3Vgtm2=CSFHC}$KAqPXTM+o8PJhE5s}>a zd4Cc>L=9ZurqnujI)PN<+h4F6?0;`IxZ&ChC%ce{?Z%ao|&519tQR$RFDnZv5`CT{|uh9<;SU;rV>FrNENdR!dJ_ty@SM z-fq7(Q5{=p*!*%o&~WSFhI^eqP76O#O>J%d-uiSSCTj9N6^c6IwA8Y_q@Gtg#$1 zv9TJbtM-1!OW)$T0{6zwW&%lC+Ke}&Orp*JgIdt}9?S-qzvtz$Dt|AhsCcFd81m&eDw^nO<#;$-*=V|ljc~GF&cLYw|9=z{c2zjRS58Hv zHVtjvN6&9UMY2GvSbiNXwOFtIuf1jsu2UKsi zfFY5&0@ff>Pk?(06W;(XX@pp{??%heRRf8lzSv9VP_L6oXhqBHKo7FtIK00yIqOi> z0C$Vz{rmR~FK*NPXbmALvbMDqH!B_e2jJJYsI+wZO}laN;IChG{9b$io;6qae1CUS zi>dEMbV5kmqT{`yVLTzn0f*757xO`|mqXy4^z}dtJM7ll?-7~y&Mqw#oO#DVOG_IM z-#IlE6ixGV0+MFNt#O6(VZ&e$5OAbJoLyX=RhE^B(dFJelSXA2_?_3uP5<^mD!9Vc1X?;dDJz2g4%;;^{#dKSR}AF!jRXO z=GyHl@4ARie#t&MT`RJmtl5qK{Q2`S$Qut&q3W)WRXbVi0U7P@cY7}q2M0T-g@5&Y zhNX@iXIpS41F-PcEbZ-!fb0|=uQxU_{;Ih2Rl~q%R~w+IYQWU+uU~4h@$o`;$c1sF zpFJCFg}Rv!6xHdG)8#!tq#R1XvUb_*eSCZtf$pAu8>ej4i2^(=QR=j$xcy8+Z})R& zPUMVZwde7lM5ik{&_EPCJP!GgI(kY5NUsViOtWz8j{3^ z;S@ekH8e!lYu6i&t(}~&>0vU!{c zJE-0fDC{{`v~1S>r3PFFuTu%*Zy605@LECjKF$sw? z2`DMk&uPDK^6@p^0J6Uh(7RHXqYn+(+Lw}+R@@qRKmMuS`oDiRcJ}sub}TLjH=^`v zT~9wXZqs=CWk>Kb1HxIqkvvq0?X5)iy50B-_g%xN;|5J`3Scezd*Yf6A1P4SAE9Y2 zm20myQt;{1I52!yj!sMS%dV+8dKN6b`Dj{*1e$^Hty^{PFX)_0CL{gEr%#^@F2EbQ zVJ^3zK<^>y@{Joe#0AN)&XPA$nbh*s(m;QwNHDvUN-vI9TR#O|?~-E9fFVDXJKS25 zBehb=9dSDD#O`9?I*XY`-G&!1&mND2?t_p~OOTHDfYOKC#U4<4nN!1P)EHKV3a-dJ zdNjooFYjfd;zfM-)DEbDJ!aG1>NvBERh!>+^U`aBgM-5t-C+s0yVAVp{V!-s&k{|T zXQU2NpEkyPO=|!FwS%0XodvCubP0jQBDA`?$`$x@FCDY`0>8s0RK9-j@j}i_19e*g zsF)LU`IQKCN@C(ZHabphtCP9;%aY8Kbds8V|9Jbc_%C=X^7qjyLiVsdgJoI9zy(d?h*vu zP)PVUU2dI7?Xb>DqF(LGNACDz>a4aZ#>f4I!+(98i12g1=$8o;nR35RMnRE{Ac4*4 zesf`L+?lplI^ugH6&cce_O#5^)YMWRvnDe{%d$d4!v42Ns+wIVI)r+r9IE`ERo_%u%#=T^~n8MEEcY3%jQ3@+MyL=|EEv z;W~j}SD28HK)JQGMT|ZEm0q+vfky$yA4*u-bv=a!i^&=nlMjkHe**C6p6_Po4O+2+ zZb*OtOuqYQ?&pRKY5^&SwJtddLBH_mA-!mz7*voT)NPRZk#L^Ru(F zr6BH8xAJ?(c4e)ut=VDD5Ri~4#dR;rA%?f8d#@9{It7GppQrYzHDE|+A;}rehepEt zKuCUh6%j=-lEfz@tnF7~#>)#4H)$iwK~a9NmCkM|GlwwUxDjlBi~98KT@iBD*u2_| zjC%-!DT%qS?-`GJ{_ZpB&MIGCrJa)ryK?Q`T(wU*LexFE9-%vzWvBtDms&6PqcfRe z{{H=2tE#GM@aFYv`K>3Fqc)a6!7L@7UPcf&`+1Bvk>TMwpx2)orz>`a?C855Y|NU) z^|PTE9|lD+$MySprl=ibF}6KM9db?BrxpiLE%C+me*qC=pd*t0Tmi}(ey#Y%(%7s6 zP^whezNgjzJmso&C0MbuKj!9!YA7pjSV(tzBJ;?vE7HCSs3cIB=5%>AX#7`@6XGVz zD*A7|YMg`C0Vh*|4-H>qEKGt{CGO(8ZiGTOKr(mLzk zx>=9a2~yM_a7z;1R>!U?{}S{QW1d1a>1t~qJ@obUrC?lG1N^~)Y;f^D0LhKZzkoBI zGpl*`Lev+ajyUhLDqp9+O+AJib0`DjV>HyPG-a zHij~ys5EwU(UBa%#>7xjRb9%;&i>K2vMU_e>@Z|knN~Jxv&4aZ6w+$sc$>ytNk31D zA?mX90#FV{Zf+ZOfVQ`RXyC#&Cnf8pJv=lv{@q3# zs&#kT!mjZ3CJ8PDUtj`0xU8H0cR5GGuCS$Q0!oqev70OhhteKI@@dMj2Q9g|xmm!1 z*^q;)jpm(rDWs05rlJHModj4!zL@EQhWrP#&)|nbErgS=BJM$?FP=VqdT_M65-6;X zAenv7okUaA5i&%Xot!CHIvU^b=LjQ~QRO%fZz5MN@7s&*pE`sU*FT*QA8(0Bp;g5H zIg1)#G3>qy&WvlZDzEsY_UTxN`iT~-p*(rCCvj66im?cAgYBiorb(q2?$z8(VWFY# z)=wwK#yqX|{*C$}{;)Eq4&K??+8XR%#zPFD@0_2UM+(0C-z>md?K<6KMa5Kn1jv2T zihce4Jxg%VB`}od9ILG`Chnm;9Ke6|Z8YMc=r(<2#M^Y*t#4GWZGBQdZ18~TvL&Db z@;3oBeb0ZTiF@sp8jdW6TU2mflJfEPK1oK>Rr1s^-SPZ~*Nd^%5~vYl3>#i{c1eT?{%s{A?JKZmWQCj%QB(_cd@u@=SHjvILIud`@J)8xrG zvcZnF-rm}Jurgd!sVaYtfyDKjHJ9~t^S965FlCzEJ`@*DezJbb8!h|Q4=5&qMB21T zx%QtLe z2}=6C8K;jAy5eIKE!VWAF>BB&r`R<;5&KVSoE-j%2+Q{22@PU~a3Uv{o66FuLoSE6 zD#+I80Q@N01tfYGhXEJ4s9OR80%yKEfBMqKSNBwrj~EP4dj3KUm&9-%+dupB=Z^-M z2t`}I&>wP6cF8>3FIC9A1mzsK`XTZg%U{2!@){s8`8<68u4U)tIfj%`F4o+UxLbNUH*)COQH+~^(7N8*aP$2;dY5eA8O6*zLR>X^s^ zn>Vgb2!2BR;Vs4?I&!;Sf4X+0ho6X5DfMKbFH@#;*YlJTNmpjKla-g({&zjH9rk*? z!W=YpC}4k=m+yc_B+)D~DX6K0Useaw`lAfxTzXLpDeN-qd+g+(IndfRtv^o2WqjqKR?xFpy}B%r_H&rsY4aqA8AZGf<{EMy3h)@uR8rxLp<=Iq=g>?;f+}E9Q(B3@neWy4GU)8+9h11d)D3 z$0?@Av0^>vVP|JI)Y?mgILG&VczE#*hkCrjv=Ro5I1n{Z6%*9E_hOX<7VC}FhYAQv zoj*$hmU|50%z88Xm-O_RCJ@>`0gp}mk6?rg7_%Pp+H3FxeV{gboff!NVKNf6qOcBV z93kPM`TQ0&7cs5qj<=@fJ1O489FTG$kdr2hiY5$}4pU}VBb7ER9VL>u>zNEDhmVp{ zuVrl4LTGq+a%xhNhpLImd}(u8q>3kL6E<=OA^yVc6-p{_#s8g(XhC|qVX#Wx#Khp> zjdD%yMr0;}d+?9L?N4H9P61PS`{~NS+>ViawNL4&2bq0ArqR!G1`3|Y%6482Z^xVl zGZHVP6(c~3|7QV$h~&TmSWD_7w((IRVH z(06?Rx%F_y|FuN?ut@K5@boP^6C>VpdZZY-+}#pYKF6-f7PN~Jh@qCN6Y5{>oK}fx z*zcLSAfo+&HOWW_ZQ?`wyybA1UWbvy@( z){W5wzyPOrs^H+@fCtKy(jL~x(xKQD39R4Ua;mBW_L(0)7J_n9$FBWFjWc-E=9LnA zPdI;a&!YnM>kbE2ej<(0pt!%5`DsSId>T0CEUE`&_O7k)cqqM9a?kJE9$Ti>?Z)_4 zTyt87dy0|`YRbyW2m%Yx8p%?Yr^nm?baV-E3vHjJ9=MqyCv||h{`1VbfP|k zVjWHMlon2jDX|+|DfUAU)_Why$Qay+m(KwiHbND;u-}>p6_IegzTXeyVj3$;%R8Tx z*;Ue&cbYio5|7b8Ekq(dh$& z2<-y%3#=1zmEfV-AORW}B?SfR zp|37Y&19YbaU|i)Fq8=cQfYmxDB_ui(w*U{52e0v6ViMA#W<|Q~p0;Qe=McwD_wtE{HIW0hK@|GSG+>y_pK7T$bkj|*O=%j^k3Y5rqFbE64 zTvXcf_BCN~IbpBShh4%i0_dPEI^Lnk?VfN*bV-?Pp z*ujdpqy}aYk#hiPN$+%DdmFs+Ik~tra5GQng9mU8K-}gR5*77) zp{c3)N{WH1cWL{|wO7$$?ZyU`lB__w_damjlxP?1vc@i}fq>l3Q#s-2P`k*j27DwWFDA zrtXWA1Jrvdu|i9UUGMs5nSF0wt+OIh;5hj{e*FCjfV&*nbLuQ)5zx6N6?0Urg_9et z?Ctrq>fASTs|zB4}KYnak_kS4hQ6+B;gY+TC zBt58LKlj~>VCkN1r=9Dz&u^MzJnR(!rHR9HdytXm^9&to(d_ z%l_53-`!mx?815~1~HAUmA_I&-W~&y?zG_U_WcX}qPx5MzGuaFB6#pw5Q1Eb0Chwx zTJ}~t32*7Bjkw=g-J|?L32--a>vi`$l0corOzZWdYvP-6T@s|?W;DfOTv!IR-~(X= z4-O8Fn~Hq>6mAbf+(e7F=}|@7<`I~*W<+I<)m@T@ti2rXo4hA2%hp{|928|46y++v zOpRCqTunDj%79{{OMmrhJRd3QV~V21elQ`WD-U!6F9tIr9R|*LD;mayNV=y)&bSi< zGlEF3^{w}%tp(lmV8ciVGBeNDkBn$GwiXJBi1>l(JL;9dt>wrPS8*7VoLo!PB#F^E zODtHA-(>#E=cMd!ZOK_ZK9jl2ze#C1y+3N0fbaI+jR8Xje$jG<4LtEkGd9b;3{;sU}y?|)d z(PF)yCT3S}uV34I$yb9VD+=k(SUSF!_bdjopDaVLPbXe}@xiony}tdgm0cn3?md2@ zE7$1gQfVnDT%&uQJb5zxLDa?S1u%1KcAM=Rkfzn3>kT9F@6}B3$^P`o>gNUm3v?O4 zpb*lH@dcsF&&_q`dgls?h&EEs_yfh5jJ)GOOK!8I;5v{t5ha){v9Yjx7+!W>MZ5!J zlJOb&AdR&uMps18BpUJPN=axPBso5Tj{aEe4sn&|DFJAug_!%duUiG2M#- zMTF?oR613#0>Hnvn|B%3b1RkH#intq1ylvf$@qaj&GcnyU;L)w%zb<0Gxkh`40}dg zp?aPgAD(uaBnul`<1803EXn-5JdgEozJ@9&6V_irGNlCn@5%XAH($;$#3M~B$Gwh6 zFY+sG?d_*`$X);Q{J%33%X9dYeEj(FIm3&E-@kwJXqWxz!y%-2JOb(AWgwl&8};M; zB2JEu1TSr-9%fLoqXp~wip1*hX3TR2sy}qhd+4R@*>+{c^`9?px>pu+9}6OpP~H{s zOHvSja2h2pgaSW!@Omt7;ZpBAIXTGzmYsy`#|t1(21CDo*<{6iY-sT91-adB`QN{~ zsDuRdFFwb6i)X*CMoB>qf<7b8bDBUHiF^!h&0kO#D)AZXZ+2@YoC4ji6S5sE%NLv5 z{6QzK3KEVog9~vx)XZ&F6%`7vMjdVnYiO%QMU7`ic#wGJ`#Uu0*v%sZcY0Fq!ch&J zv|D!>iTd!N&IZ&>MyIbI5)%_qZk4YYgTz#|wC)%& z)H<%;Lfp(7r1C4@*;Ut7TLO4dl}M9JRXLIbN#}Z#6XJ?! zDxj)ERBEC~x2XKnw%zL#5ihaHvUC-7b=OwNo1C#EcDEu;;N^f#zBfEPe7+64AQ{%S zbG0rVYit)bsABsUqRuQ99`Q*zkO|E^H3?FXWuG9 zB1Du1>68LU!yd#tbo3qvs&N)zPUvGRC@4&4$MFW&HeQlnUb)aKcPpnd0A%a%k`s90 zEnGP1OJH2%uD<*ZPE0!_R(2kh#LJ^gK*g9d9Q{R^*u9H6Ve+;YQYd&f1rVzsC7ijJ z#&UB4%N)4~`{pCUSSaS8+`#8^fX`Mq&~6wbN+=F;6t=+?X@YC7y4ZrgXT{lJIuIht z^5?^b{AHH6-iv{v*}v>e2dgO|Pc^6EA<6^0X%!KEDo=^s_Xv@amTp;ZX>IMm^zSki z@ZIhaiBwDyF#8Sm%6cl?mPzRh{{CbUW@Zyt5I(t}O?z`g7Nrk-pX9np9-z@fX-6j% zsK}0EtcG=U@r=IbpL~jn3>v4vMot}mek=co_{XjW(=E$>0VjTp2N0{MZN zyL(O2`OnXDW%*uJc~yKyi;dGV7v+&JMy<|hl~Jx5(A!8TxiuZ42keu3hL%rt4GbD( zAQi3p?Afk4m|^4K&0Mc%{6|A96C&wybR!BP3z55uvzP~VV`Y{YA%pM1a=Uxr`&b3C z%O5+Nw~kvuGH!#s_wwn~W6z%a%76W~QXBBpZe9TpMM14WSuNss%OpKon2Ee0%-I;n1zQQ)q zon04md;0WpuT}Z)mQ(dj$9#FT<6G1ANmBtAZSDlRVCl;^2;}ElroA8s4RU7vsWR9c zz8lSWJY4FZsS594Mb94YGyJ?ec+83>k5e(=TQdXRsRB;sh&_h{KatbVD^jdJSzm7w zZ3}gmSiLf$P?onqNJ*uk7WyrBNn@yyN&DVIRfnl~lJK70_0-}cC(z?fv?iOlIeAVg zrEI|ivf#rNp^LIauunAp@RpDe7~31*f3NTDj`2myVhafgrB#%di_h4noZT)u3sU*J zvUsY57?x|FqxP*sq2laPLpz|r}2r2>l>9|0F3=hO8he} zL`^K>Nq4du6s2(?%}p!IgJ4ID%+Ib_J}Bk(y57p)9@nollj^)-%oHTH<}8|aBWMEG zt%*KIle=MImKGn-%UvSe!1me%A-jp&gJ-A5!zr*vlc3Yr+OCe3_k&(6kqEl7zhcgD z2c>~`u^2C}U4;}ws7tl39ysaGF66nahjeeE-Q7sqTgmwWuyY|A82%t?WuejHSo`Xs z7#VRf;O0y6l7)HVHQ@%%mSEGEQN7xYa8X1V0VI?vZo5H-KOdGs=b%x^7ZhbBzkD4j z{1_*JwSO>6C*A4gP&5;$a&!m1Lk^IvyM&Kay6~k}zZu6w{;D5n*R&vF6s0CC=_A`i zMF#Y0B!?oC&I4Wcji-B3nwldv$jqku_c#vKHMz%+b@jpOVjw3l0ktmvKOq{4!Ko=< z4NwEtAWVH$F*~%}OSK>jNLpeV?$!cOl17V<5Sn;T8iUs)QnuxZv*&Rf--Rz#n@mUrxaK`?*_9EgP;)CFQS5_n+G)v zPLH8cd)Ikv|4uvl4J9qb@6XSSCl^t{D^L>lMMftleNxRv!;dPPU#fWGLb4@^N?M!su7p5N+*wr{2A*0+rRS%vf`CM z4|@+|D{CRzlb2`tU{b8nycip^nYT)W4znrHs$6u2hZAx%fWau6xw*U5Nj&c(7YL*n z(scWU3xwF1XHZ=18)si#-vh~Sh)&Yi+YhY&$=zWCgPUM$OB=vQgR!x(I)oLzLMXHi zx0@A~X+dgacb#Q?eEczxt?AF7K5-W1=4v*V*wCTNFq(v5I!PhHOawWolw}c(OH9o9 zlk<3eXKkoq_!Y3G^`?4?t*eX+MpcwA(}M2)9pplMWjK5Sjo#gomc@$fP{7&Hk?y2M zBHe4uaS;y^Az0 zK)@2WPHzEZp~#j~b4*6lQ$Uopm^>y7;K%Cx_;6=?J3Bi&+;tJc1^0}N=dvK+avh{; zwxhRqj$%?%eebhBm`jRrxh$Ok&vN(fiW~LJp?g;|6}s3T=#To;mU;nY*u7X^5QK4|7ZessTV`>yQpu;MtQ>{aRQseIyrk3jrv%vX@-912yL6mkK8@rFYpms$x<{E$r+@u& z?&7;m&Xkv%ds_*mg(vlAG=7{97Cx?YXX8=!e$qXb)Kv*ggdS3|cxWA26vs=iNB?dj zr?%Cjim2*Hl`*V+>`vWY^+YlRd=F-PMn4O!iWrq6R>mxUQpej=6}vJoUKAH+WXytX z+GmfjK=vMt#xv8FfSQ7kYC6ozP zl8SuyOwwh5?G3i$6|bVHr|2OZxjK-ebbbi)I8GqMO}VT`mQ18h5m{6S$6Vd1r+ z{QTn;;2ysraMp7d1}x4R%z~s@h(qpQa-%f$fY_M7P7}!C6iONwV=v3;aeJ<8z*f@& zYIpxY0-ls;9BluO7-d(aJ%9FA1*jb1xAKo8G^{}%a5psME%7G=!P2UiF}&HZU(8+0 zMYVUSZLU3BQq1MAS|iUNfB~Oi3!YQG@x+uMnHw!xtIf&9T?@#@p5`MGS3niJf2Gly zdK1?#30q}X4-a(*g52?in#FT5wj>uBpkG;Xu@VYON{v}}9YC(*gW#$?!O)#(fM%Gz zcLNp^CvMVU8TmNaR{bX}RsH)tOt*lhun4j40+`P1 z;o{~d`o>sgMEj1Do!vcD zo`bhUu@{jpstfnk4}a!K)pT7lictxe*f5E!lA_`d_g6;xIdK$-AqN^Flw8yJuf#9x z!wQVfm1ISfN3x3OwI*Gqen}4WY*18##ZzD0rb=sBe8!^0ganC*?xr6pcb~qDLsW@SuJR?ek z`|=gMecM|}kJEZV^>oW9|6Vk(Gx7zC{QtU5ZJux}neuF>Rn1(D$dL>^9n#)GQzGN(ico=onw zu$4Z!i=haZByYLtJoGbDJ^%3L&6`~fFnC}aVO3sZ&`YU77N=6;x%+nnyhow{DN?8r zyD6=+&#P5@E6;ll#BuL9E_7;D>!xx>%QD1P*Z-_6FHaGqBD(O5hxzns%D7F{kDA{L zS*uX;>beiDB*c)ugcR8e$m;&A?klrqfZF9WA0aXY&_9V8hGD_Ud=U14i8ZLnxcD}( z%vu;8`8haPUQ|$E`vhv_i!$3Y`?ht81(r?gPaF#<;zQ?P~ zu1vxz>}XRMk@lm3AG@NG_iOzN2{0LBXXhPjfg~GW7~`M?qu74`r`rqcK>x1{j@4r3 zxneNh3u$q4V43LQs%vl;f!<3JP8vA|h@& zkjYH$PUMqxtH#|22+(*D6B2K|9Kr|VtRiEpdnCWCb_;afxOT8vNHdhF#6QSq1OF@O zGW7%>F_4t(i-o)2hS*Q6V5|e|CN_}KAbv5ob{(dR$si`V4!-N25cII`-@Y9=O*f1C zJ2jU)0l_#CT16cA0zW+}6mzUI-KX>OP!kd+r{W2VIt%6NQs$(=0?Hd z#*K7}AftEw*!{qu+#z>j(32|ewf(bN1{WRo8OE_b*uNiGw$Z;}d-hWo-im)DhW80f zhF&;PUlTJ*^0Tr`wIM}vqflJtH4NNLPfXNdHmx-CCeM4FP=rF|I`D3o*5if=wsv6H zYrVa_k`iJAnDg}K2O-agK5K*twy5@R=B?o6)kp+{;zUy=9eps{0pF;re@4?(iBN$`` zKT^eyV;Hti`@o>8f~Y4sfST)pwUDsm&=iIYg=I5mKA%e7jy9z1&Kdtv9AwN@N`b1C z1H1oTJ+U@7#XOv|elkoDKg5uLkG{A93ap}+NuYsTGOf7ay?gjCe$rzGNZoNRoMnuc zHvtYchoM{iw%PB`0S_s}hrTV5e5i-XqKS)WK74S4e&hV5q{pv-powO!Fv6JGVV9Ec z7RCkLxtM9_+225g?wq!ia6{P|=Ro^RA5r2ww6(StRF&s*R2PT&8O>;2Lur{;=p%!H0dHjLOw6Rd^X_LF3aV;ZI1Ipe1F13r_{XXR+D(Q6O7dQQPI;k z(lq6+U1ko_Wx;-B1c_&A7_xj?c46pYO^U$Mni5L+-*I*bs1-DL=<-t15Qi}SdE~SM zHwPZp4J_xJ0Xd~qv1%CE-CPQ^%}$0HzF3%X8rJt(g^z-`!?MB{L`sn6a`9;!=e(c+ zp293V!G)M(mHJyNVHI)c!!(C-SB?zXgAAq|jZB9#3kq(lzp6gafGFi>sL{8t*(Bd- zu;>hNz8Hea*C`@DW=v4Y`A7IXP7a92*VCqyiuK0U7!cfiZ^l2Ct^4;8NK9EFW z@>d-)Dv3cPLp6iD&6RwCfP{L~Kj7#X6w0VWx-QoOuo(@>{atEQAKa zzR%uonnz%K>Zy^@YQTL<& z8r=_;eoe<2TrD?hRB3Bt5<*)M`xr0z%GZj4oiD|$BSvxY#v&Q_zfh30WE--*M41`p zhBp4DQS84qG`5)SQq}ODK5#;s9 zm#($-#zuE@9{wPXkw?d2-+LU*at-G7zj{j)0^X#1-($WcH(aJ&@ChnJN!(ZYhfjZr z$IA!DvS=lU<2hwm9^Gu^pDvA;i)6X|wzf2a20>^#ZajbQ`zl*wF>zb+UdFY6X2Xq( zsfK)b3~%Va&N_??gHT|M$C(H~Dj5RYS74UjHD}=P$qz4BLp?or;A0eEq)JDPplNnC zqpG1nLWrNA;n;UO=c$}u*5Roy;XTqcpgMXl)M*a-*0nn z?p?yhtn4x0W{!B|q%MD&Iq5dNv%5Pfl^G%?zsJ|IzCR4}Qp44vcnGLj*5IQK!)W^5 zg%jS9si}rYqjxSZUTh}l?u-2}FRcg5r0yI462ZWR zLqBFykpoJWabe9%1}T9g?6>n$q}ZbxbokhqCb!=j=)mLv47>Vbni7ZeC6112`9SDL z)5)onu=R`6=r1i zK|jV^kv1?0V{dC)Z(Xk482a&@o2EC%os=JXNEHOYSplQM+Y-v7$u!u>FCppV*t2-O z+qK{XquIZ$I95wLmR~wleL9frj61cl;Sgm+^@tRE@6X8p1e*Y4{}V-VFMYnhzt8eK z&$2A5Fqur_rD?h}RaI5O!NCEnt*sRl7GDk{BO^2byf`|Le^5#0|H)($78VxH=b9?b z%*?bIjmGhEB_|@}H2@L8LzDIaVH##qqHC rG@j=pm1+-yAP9mW2!bF8f~5Tdg4sIGssG@Y00000NkvXXu0mjfjb<^e literal 19034 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 diff --git a/umap/static/umap/img/24-white.svg b/umap/static/umap/img/24-white.svg index 96865a43..2780170f 100644 --- a/umap/static/umap/img/24-white.svg +++ b/umap/static/umap/img/24-white.svg @@ -13,9 +13,9 @@ height="200" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.2 2405546, 2018-03-11" sodipodi:docname="24-white.svg" - inkscape:export-filename="/home/ybon/Code/js/Leaflet.Storage/src/img/24-white.png" + inkscape:export-filename="/home/ybon/Code/py/umap/umap/static/umap/img/24-white.png" inkscape:export-xdpi="89.996864" inkscape:export-ydpi="89.996864"> + id="guide3084" + inkscape:locked="false" /> + id="guide3086" + inkscape:locked="false" /> + id="guide3088" + inkscape:locked="false" /> + id="guide3090" + inkscape:locked="false" /> + id="guide3512" + inkscape:locked="false" /> + id="guide3872" + inkscape:locked="false" /> + id="guide25561" + inkscape:locked="false" /> + id="guide25563" + inkscape:locked="false" /> @@ -105,15 +113,15 @@ sodipodi:nodetypes="cccccccccccccc" /> + id="tspan4459" + style="font-size:40px;line-height:1.25;font-family:sans-serif">  0 1 + style="font-weight:bold;font-size:8px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';fill:#4d4d4d;fill-opacity:1">1 + diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js index f00e2ec9..7179dd9b 100644 --- a/umap/static/umap/js/umap.controls.js +++ b/umap/static/umap/js/umap.controls.js @@ -88,7 +88,7 @@ L.U.UpdatePermsAction = L.U.BaseAction.extend({ }, addHooks: function () { - this.map.permissions.panel(); + this.map.permissions.edit(); } }); diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js index ff61488c..326ad6a9 100644 --- a/umap/static/umap/js/umap.js +++ b/umap/static/umap/js/umap.js @@ -1263,8 +1263,8 @@ L.U.Map.include({ callbackContext: this }); limitBounds.appendChild(boundsBuilder.build()); - var boundsButtons = L.DomUtil.create('div', 'button-bar', limitBounds); - var setCurrentButton = L.DomUtil.add('a', 'button half', boundsButtons, L._('Use current bounds')); + var boundsButtons = L.DomUtil.create('div', 'button-bar half', limitBounds); + var setCurrentButton = L.DomUtil.add('a', 'button', boundsButtons, L._('Use current bounds')); setCurrentButton.href = '#'; L.DomEvent.on(setCurrentButton, 'click', function () { var bounds = this.getBounds(); @@ -1276,7 +1276,7 @@ L.U.Map.include({ this.isDirty = true; this.handleLimitBounds(); }, this); - var emptyBounds = L.DomUtil.add('a', 'button half', boundsButtons, L._('Empty')); + var emptyBounds = L.DomUtil.add('a', 'button', boundsButtons, L._('Empty')); emptyBounds.href = '#'; L.DomEvent.on(emptyBounds, 'click', function () { this.options.limitBounds.south = null; @@ -1318,27 +1318,34 @@ L.U.Map.include({ credits.appendChild(creditsBuilder.build()); var advancedActions = L.DomUtil.createFieldset(container, L._('Advanced actions')); - var advancedButtons = L.DomUtil.create('div', 'button-bar', advancedActions); - var del = L.DomUtil.create('a', 'button third umap-delete', advancedButtons); + var advancedButtons = L.DomUtil.create('div', 'button-bar half', advancedActions); + var del = L.DomUtil.create('a', 'button umap-delete', advancedButtons); del.href = '#'; del.innerHTML = L._('Delete'); L.DomEvent .on(del, 'click', L.DomEvent.stop) .on(del, 'click', this.del, this); - var clone = L.DomUtil.create('a', 'button third umap-clone', advancedButtons); + var clone = L.DomUtil.create('a', 'button umap-clone', advancedButtons); clone.href = '#'; clone.innerHTML = L._('Clone'); clone.title = L._('Clone this map'); L.DomEvent .on(clone, 'click', L.DomEvent.stop) .on(clone, 'click', this.clone, this); - var empty = L.DomUtil.create('a', 'button third umap-empty', advancedButtons); + var empty = L.DomUtil.create('a', 'button umap-empty', advancedButtons); empty.href = '#'; empty.innerHTML = L._('Empty'); empty.title = L._('Delete all layers'); L.DomEvent .on(empty, 'click', L.DomEvent.stop) .on(empty, 'click', this.empty, this); + var download = L.DomUtil.create('a', 'button umap-download', advancedButtons); + download.href = '#'; + download.innerHTML = L._('Download'); + download.title = L._('Open download panel'); + L.DomEvent + .on(download, 'click', L.DomEvent.stop) + .on(download, 'click', this.renderShareBox, this); this.ui.openPanel({data: {html: container}, className: 'dark'}); }, diff --git a/umap/static/umap/js/umap.layer.js b/umap/static/umap/js/umap.layer.js index af8a5214..7acc5a89 100644 --- a/umap/static/umap/js/umap.layer.js +++ b/umap/static/umap/js/umap.layer.js @@ -796,8 +796,8 @@ L.U.DataLayer = L.Class.extend({ if (this.map.options.urls.datalayer_versions) this.buildVersionsFieldset(container); var advancedActions = L.DomUtil.createFieldset(container, L._('Advanced actions')); - var advancedButtons = L.DomUtil.create('div', 'button-bar', advancedActions); - var deleteLink = L.DomUtil.create('a', 'button third delete_datalayer_button umap-delete', advancedButtons); + var advancedButtons = L.DomUtil.create('div', 'button-bar half', advancedActions); + var deleteLink = L.DomUtil.create('a', 'button delete_datalayer_button umap-delete', advancedButtons); deleteLink.innerHTML = L._('Delete'); deleteLink.href = '#'; L.DomEvent.on(deleteLink, 'click', L.DomEvent.stop) @@ -806,13 +806,13 @@ L.U.DataLayer = L.Class.extend({ this.map.ui.closePanel(); }, this); if (!this.isRemoteLayer()) { - var emptyLink = L.DomUtil.create('a', 'button third umap-empty', advancedButtons); + var emptyLink = L.DomUtil.create('a', 'button umap-empty', advancedButtons); emptyLink.innerHTML = L._('Empty'); emptyLink.href = '#'; L.DomEvent.on(emptyLink, 'click', L.DomEvent.stop) .on(emptyLink, 'click', this.empty, this); } - var cloneLink = L.DomUtil.create('a', 'button third umap-clone', advancedButtons); + var cloneLink = L.DomUtil.create('a', 'button umap-clone', advancedButtons); cloneLink.innerHTML = L._('Clone'); cloneLink.href = '#'; L.DomEvent.on(cloneLink, 'click', L.DomEvent.stop) @@ -820,6 +820,10 @@ L.U.DataLayer = L.Class.extend({ var datalayer = this.clone(); datalayer.edit(); }, this); + var download = L.DomUtil.create('a', 'button umap-download', advancedButtons); + download.innerHTML = L._('Download'); + download.href = this._dataUrl(); + download.target = '_blank'; this.map.ui.openPanel({data: {html: container}, className: 'dark'}); }, diff --git a/umap/static/umap/js/umap.permissions.js b/umap/static/umap/js/umap.permissions.js index 4cb5cc6c..6f7e7c92 100644 --- a/umap/static/umap/js/umap.permissions.js +++ b/umap/static/umap/js/umap.permissions.js @@ -43,7 +43,7 @@ L.U.MapPermissions = L.Class.extend({ return this.map; }, - panel: function () { + edit: function () { if (!this.map.options.umap_id) return this.map.ui.alert({content: L._('Please save the map before'), level: 'info'}); var container = L.DomUtil.create('div', 'permissions-panel'), fields = [],