From 25d0196b044c3ece3f2d072ea1d70a371df06e4b Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 28 Feb 2012 15:56:47 +0100 Subject: [PATCH] MINOR Merge errors --- admin/images/sprites-32x32-sa4e142f7f0.png | Bin 0 -> 14332 bytes admin/javascript/LeftAndMain.EditForm.js | 7 ------- forms/gridfield/GridFieldPopupForms.php | 8 ++++---- templates/Includes/GridFieldAction_Edit.ss | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) create mode 100644 admin/images/sprites-32x32-sa4e142f7f0.png diff --git a/admin/images/sprites-32x32-sa4e142f7f0.png b/admin/images/sprites-32x32-sa4e142f7f0.png new file mode 100644 index 0000000000000000000000000000000000000000..c4e8604f98c96a89327506758c6ecb09174fb43d GIT binary patch literal 14332 zcmZXbWmp_d)2MfmWpQ@`iv$hs?iwsufB?bW-C1C94UpjO?!n!i;F93(1ecJ*^StN% z&UamBe)RNAch}5x_e@vaRTH7AEQ^jpf&u^l(B#(+nI{;jhnL=JXhS z@S8fn6SSCom}GF*U)=Pxcjuc-N8GrF=W|(GXK#m{m@$02;RSRMluRWC{Cqg=o<#FM zEw*6!egAB@gWMkWhchb|=%u>9Xi4vXd`)%HjRj3#r+_XyRJ4SUF`BLuTf@0$A5ro) z-gyRn3BiWcRTLe%4y|u#&vx?-O(LB;*qp7~ixmIjB=U5~fG%tiiCYYaK&?U> z&Q2W`L;&dw6p`r7P^7C^x=f|(M`E*=4vZg8M1-3%(wL*O71+Tyg`SNr<8Q&E#At)% zV`yP27sIx7AT(TrkOB+@^+rIBO_5%_H`Y7G3EK2-49XTrBLt5iP`DpKp;|9q0Bcjx zupNIE7?j?nbg*s|a-4Dpc*4<6vflK=jds#w_yH~863M&>UDnD zCV#LsSyG_QV=jof4)1Q9NbWps(iq*@3BZ%CRWtKv-)Km5ai}zS_qDXP4|@LT%eUZ*_S<>*{F@0|p|x5? zh4#lTCALOyA-CU~!DFSgGD#oVWZzMs^f(t_YK><$aSA}E;TV>p70H>3Zr{T%4X)Oh z!8@2oZ~zUTQ>>TNyF~lRyp|FB6^9_a#elSk7TS+02|DcDSsvoyxaJmSec?u5RV96m zj5WDWR@%ZIWyQsTcsu**E_geHSdJv<+%X|}y<_m)_PAg=G9CVm#`p(*gy62@+w+ii zy}b-CelID~g95MVxjDs#c%+aWZR3G04sq>Up%Q#|`+HRoP4*6!kYVY*k=VTqJrh9_ zNXn11LGIjYzF}2X|LpFl$7%+Ca2ME)9 z_>hB%)ZHRXFM0jE;BTP{R3wHN+8&0Yjb1J`Oe%g%HxbX{ik{nUh=W?Y-I^Z}b6msU zfMU}DkrSYaPu3D$;sfXKJ$h`e;Ccon;dzOwz^2wmK(n6my{!)I4gufhrz#o8minBk z@1#lUVtE;lxj>_!+gSIbOK?t$l4UL;ZL|Hb$P)Qk!Fe(i8`amWrUviMXaL))rH#Tx&?@(heffYGgIw1>- zHWVafQE2HBs2Lmc&|C`U*+9Q67>_B?S}1aNj~s>rtk?X|X!S)tz4ipH(*&+%zs^-y z2%xK(7Ef#}uyUstj;89;LWX16<<_rPWm_t!b+`Nb1vgc@>eUdP(TvBrGhL#v$Fe+V z8vZQpE{m4qyKF_m7hS}ic+%gWZXL?o>~F`acIvhTkK}%u3>$GS*G?>&gQoieeQeeO z%-th(w+&c^2xA%WE4*w3Jb{#pd6w@01OQa%KvGc*19zh87&$*(hoTjlNIZEFmwno# zu>y0^-2WukFmr_uyY~_-8@h%o;70^&NTDLbN^5FSnq_`!t!15x;u~JdMn#4_pJ2iM zbrRS;LO~kC=@=c#urPy}!qe{v!_+TSMGdUkDMIdg)~RZWyVF~0BpmjtynMZ*b(EzR z3O@*Gqsh?yZW)xg)k$Is8dB7v7#jag_^42!h~038?1glu*=oS8X0}2wf=3j?pG9MZ zZNx9GMO+Njm46FUXJ}#?&P3JIlD;fNuoXrG$&sk1MSofNW3GTpVU-C{PrHyimP+|= zE&6cS|Fn3mh0I8;wcWgDbGzpQM76m*VN`%n4eBw}I`&O_M zB<-R9_h7S6w%fjGRv9CjRLyH!Bfl~KF2H?gHhI!d8M;J*(cP8kC+GXy?Y@t?NqByF z8IdO)z1@J7j|>Bh0C(*c)r%dzevZ_>-;w?6GU{C9;ynV?^zwW{%IqPV@aIjz)IJ?1 zXgHWB*q7kk{^WaKY%s>`?5q-^;Sn}$YCnJI{#}-=7#Oa{)y=JkVt@T|t^z5mjjjZ! z)z^;F_}%_jX!Fduds}V}Bs-KmE*U&HXVc&u8PQz=4;0rzv>d=Ec28xmzbept-rc`r z310-RtO^>gem_;!-~wkT^XA;D5`_xb9fXs(KzZlg;5fQTQA0r~-#!SxZi9CCtrv!fEwu>?`DlMDm!Km-Lc+#mtU?M`H9EU_)gZ zwH%yHo?!2u(}N$hd=EQ`xkcu}4d1_Cmo|oiprZ-E5Fe5_zc{JKq7*U}@zscGN@vE4 zraTCk!b1_1z>~{AJUA%HX4DHyQSumNm_1K*TTjFsrd8d=luuF1Mc(Y8ire-Qq7#|l zh+RxeOFQ5OD)=vuVG1yRDR;(&Swp?vp1n(&e_k34W3x4s_0n1u@@Pe#;%trKM|C zbo%i&Zu>Sv;>olf#dt?WtvM7?!ys(3Z=qZISip<@m_PH`JpI%Ot4 zgu|C9E`f~BKsaoS5g|UvS6dVhTDH2JVd9?GksXd9z??$N6@k9Z804lFnLznkZ?8jCvYe^0!U0k7eF_s!b&4g=oCEp>1m3i&A5^qlb;r(a|EEA-%~cB|Lg6 z-r>6q?&4W9yv4klNIVr~WeltqmLebqVEy!ULLPsxqEFrgV^oi|gcK?#8|dlFMCK37 zE-c8XQ37mzDRPchl}}|9z&6KlXGmsb01_Cl_cBlFg>~6di zZ2qjRlKb!7S=oJQp!lg|TJNQBQyK8WuYHxI3y38I*kq~w=W_$(GfGig_1GWYXN}8d zKXwrmyA=(m2)rYZ;ue1hV17QFt*oq!Pfe9yW=6a0prq$(38DEou!F@^yZYTOKiDMT z;yT?!`VOcbAYtokY=gw~jVg(kSdNSFBbT+A0euke5iL&22fILM_QzVce1kYmyL6@9 zdE4q9((vOvf!MFAx1V^y5h*S}8^@A%Kf09|5*5Gr3PWz=`DP07dV+ZC>sEY41wGns zB=%jFnGMB%v58R9;=jK#4~j0xe)>QHJaB_q+b7S7ZQpSbf` zoeNgnch+1(A9co%fVEmxmfb6s^eNc3mtggXr&D)iDEa3&g~>E49M+QQq_jT>h*3UL z@LHC1a-K}Jmfg<`QjVeq+oaHNZTke&&qn;g55dD(64V068RVaN@D!V7BN(ooi=t{x z^DgK0bayeU|C`)@(zYjS(pbG|}2i+Vm ze%R#awzN{>#3J?S$0*xfDl4uEmnYn8xgzbTuUm|LcwBTnDX^2;-@D2 z(CFxQjAV^;XR@^Rn{ibg$6;|@OK(784s=qi?k%>Ird%d7T*0CE(hVEo`Yg{u3zBt) zMdI2ccVj|M4SCx5&m#2!7xVAJ6)qz%dX`ViEAcv+kZYp5(d$D=iS z-&RRkNmfF9qB*^Sr$hb%D<7+zy|{vcm#X_+vHso&gs^wBmsH6$M@{x~;X5W*f9}0I zw<8DxBr!gpR|YP4tMYUrsouOP1Ah1=^Aze2jW(b*MocuOdVk+{lKhu9>b|nq> zpc40+-|VI*85_Y{D(2ZW@7G?+d^ba!wsVA-a0PH3gMOcokxaQA$1qSBysi5-(jsZO zp}f2rp!xyWS6|vQ^j;2|FE=-*A`gem!N5`mTnzQ+ITSl<`3fPXR zG_Qnw?)73W{X7q_xV(iV7KB=qJxenlnZ~H5UTUiv@grH=u@?O9DHSKjIAPTT);?AY zXw(u^f!&_jtMy^lfn&a(EjQAC$0U08Z>sqpQO9*R=+tkNt1AbxlKT^txww>Glp6%R zK>=ZgzFjmx^^%PX^;^R`=QRT)?l9%o^|LO6$qLUa7 zvRCJiB+qUS2g6$XwE$Z6e>OSz*}|D+Eb#IO5cr8>{Pamh^cPm_>X~Nw##MDE2N~xY ziv0U`x>#$m7<8yZc0XJ8C3u}wUB`*UVR%y9&-&yYA7p>OXm&lsY&u$AEw~*Uc8{lq zs+cD1dCexO48rBmQb98_GmTt&A!;dTTZnil>z+@ib9?#wlia?>IkU)0*fhrNUjV*? zQL^qKcs!ec95y`Nn||E6)sQ~qAuftL1!o(%^gGTL<$IB8nGd3#cN^l(R1#L<5`DW@ zmO%rdmncszsgx}n$?YW4W5*xw&f^|M!ae%#?|sCEk2EPfwW>U~(vL|)La^Ttc=9v| z2jHTd2Ye?4_==h!;v73}^}b2x>2aB#M-CL*B#L`B=2}cT#n}#V_fndR6p&-yL*nMX z)?cG=$yq5(+P>9oCaL??|MaUnv#%u0h~}PUXpy1wN1hdedh|bCw5$g{Z&M>dMvxg? z-~F?^RsQWg)vyGc3uMzu<&~43IR$sKJ3-LsVr@=tv& zoC<0w`QOdsimmI~Lf|ZcC2$wSr^~BXZ)RH0dqxh&2!!yM`!^eFdVhDn2Y=NjH^$93 zJdRFJz??<{do#k-r)qRG=kj@V@AUE#=7GUdh*tXTKQBmDr9*fOos{w8Q1E*yl=a!| zK!v7qLa!h4a~TwYd42aUj@K!Wn*1vmFBVed^c99yW25BlKyvpe<_lc$&K}!l8i)z3 z>tn^Q!8<355O_Jc?vdk=>;iPVMb`(aTM)-s|U$YL74#G|1zNo;xLTm zdG52=eJzP@1XSFIKJ6f@jES;;`eD1tATk<(< z>Vxa{G}%JF0XH5kV2VPcOVugw@}khO@}~qbe`eIo2&`;woU~DkP;jacOXsz1s1D9 zesWG4%Dh#M6w0+QQgpGB+Cy$i;9ZeVP3_1c(l!7}n-cbV{PJdUJ^u;Z#S{XE5bF1z zIq?|vRgA&*?^>_E zf1ZEc-V#=>@V+nIXkU5Bb@|=p3!1>@l>fqU#(&B&y@hJ-yMd3(%sQ*pcN967gX6fJ zisUIe+Ti@eZrrnjlY+~E3EZ_-FVtsiJxvLS>V2G?(4Q^jOPl@1W8QAev9Uw)^V`)w zPls7-D&b#zJ@46ek?DrIajUk4j3ha{B%)7}2~_R_zR^YB$dF$?#qUgzJlg$dVgnXv zQVF2jm>ZE{6f$WT$?=RzwG~~sVbz7yPFxd2jc->F%^W7u?-D}uO=x&DW@A!EW1LI{ zL|NT0KPAU`34ZPmmP9!BIcrH5*EJrU22iM19Qd*&*jK2}3p$%T&>KpM!V6F!ybXg( zx&HZuT6W`?EVA8*IT`27rj!3G|W#X%Wa=ru^5hPzSB8+wHW7u$R>JjCg zd;Fdd2h3qAyX&B=#YIw#hy*K9;)nt89EVl{sAc49F2gV4`MksX%5MR_p-iPl+ zR!0xAfj$99eREPW*}g*P0bSWvIc;r%1=im%uspMdUm1oGNXelW0Z-gFbWBBnV zUf9{Ry3il5G$=29l6an{bfs`?sE9GczE$NdYth-HvaGBf^OE1`sh7Tz5_+o15X&pi z)jmF}qN`h`NzH0)Q7_&#M0>G!69_p3*h5lpq7lbi4BW5LLzb!DSPe z!fj}-_$s#OqsBX&3T-JsnmoMgnfO}Cz3&7GJqu&dU|*Qgba$YPXZVu$N`C}7a<3J%o|v;(xo}bTTQVtSB&l*QG^M!;Q>((bKm4`?ph%)B#v#t3%|4+WC@e## zL9=p}KP7s8v(aQe4*f-=GPXxgwP}QdLB6azvcu z<1=lL8LxAv^Um754F-K!7vnYw-vtKsVD*%!nKY=N!#D#iGqO1R+dqsN6{ruzuYwu64@zF!Pey`sicBGEJ$()+%#SJ8=y1zUP9-Hm~~J6z*<`cp1P*;(oqNEYBLa2R$Bz_%ocpPOYA&KF7p9m+HC4?@u_lGmRm9!b|i40P={Biu1{C2d?^Xv3E>Uzcj#V4b!+m6sw zv7a0sacl|EDj^#JE*cuTzo3&sJgyH4>i3&{yuB?m>;&DRDn}ONRAANy`&AI}*RS7A z>-JHUc~35vTJKJBIX$JUvu5QvM$jL!78df)*iHPi#kj=*nJLTW?CBZp~i!|B}BbilseiBc;i{y#;|g zoQ39gL|rW^89ZLjuV6G@hg1D1ia#+;?H^h?ya`{V{wiq~*V&Kit)kUu5hsC1F~(H2 z$4aP6(ES9U-(d&kp(!|tqmU?z-AXOnPeFY$X>g`?{(s2r+*bI1LGP#{gZr^wr|HP0 zi9+qC;(;VxMJqi;D-Ic5y8a|ulY*Nro_~qyD+?VVvdYBz7p2M@Dd4^yu&JjV$Q{2T zQz=i}NrwIC0I^GaV4zr42o7ps~=|9_0?xW!pGgx*~? zgde}u%s1w8t3bQyiKDkLbow_Uv)a|*15Tt$D2O(Gn1$47tv3u3$?xIEAv>qULoW<_7X?b9Z4jOiN=v{>v-(9=NNh?5=lj-4o2kWiF+@yjG= zYIx%7?AiUSr0~SV#^hLV)`Awv;5v$CuKxrHk+u#p>3aL-j}j6#VmLw~z^`+p zH&0)Gv#lvP@$GaL`MK`SC;<@4-<~@)iJ6vFu>xo>T4NPI9<0UDVl6@mxn&#c&%GLf;2>5*4N@elxd z56xnOPJYvBHII-|P@+z|SNMis2r-_kWC^*nt*Rg^`PGc*{M$vmv7Bw&XKL+bAVDyM z!gsz2gyTt=bD_l4RnU8dM4*Pg#4!pEFLrp^PiWJa6t6hzL-=zAY@0=FB;^s;vgg6W z+H@CWA)Q5h*i8=Bx?{=ko=|V9^1QNd*}!4c6FR1LLwVZJ*;s$6 z=t&yVz_Joz9a7kh+P9Tz_5=m^czK8)sr>#}Z%KQgB46@;H`EgpCrk!q{L#REFJ@^) z!~_r!k@p70Ap$&J)r=N}q968It$2gFsJ|b4+pkfryN7_ymdK=oNWEr~&;DYXB;kDs zJN(bFisGoa@g@|1n=55!pogDA(BDhc;uM2T)S)a^V!T|?>`Nz~^bFk3?8|Ri5`ozTC7XgCU+xpakGcuaCx&*?S7FokCXyI^<$bE~2s6C=$C? zMrz~h%wLurjv@|!D5BIDeYYy8jUikxOEE=DqxxkWrR z?(=4hjzACq%Iz+ZoIyb1$VYYwztQm%|HrC6crSQ5=uc#7bo|?5bleMCBIQM_@}k3O zUQOWFlji7XWA&I7mfbL`a+2-B1mIs)kn$TVORlaF^wJq(pTkUPc^84)tGSPtoJ^?6@_?)%CQ`d@0_bOy9Rb>Pb&=$ zPHK93yangx(4gu?7Tp7c4Y2CP?Go!Y6!#|7j28Zl(Xo7Cb1RpwVk9BE$_+akq<|(Q zE@@5?LsgwUx2Ydk;gjb#GnawQ`DI!aj@<`eh}qnupXbpuE7iZ2_gjz=r*2HL!dWN- z`G*uOT^>e+F{b^13L=&wwslMzpjIz!bOdl~FcRjgQ;YVL=?wA$)i_>t5ZpW}2Mord z114x9N1rjoaRS{fXn#ns(BD=-q|$Luh=IeG+qtJtRaGp* z!^424RdkVTcmwYd8H5!|*3Th5W++J?0cea`IVE$*W_`al$Wnkj!ci8eqR6#vqL0Bb zmNTI^+I@-e;3^-MCuqu!jLADBHD)-lHDbNx`+D>hUHqk%Sx^-kzBB46TiFVFaaJZ$ z{?NxDL8h?gV$_=ao2=8D8n;SZ-%KPURdFT_Emvsz7;=iA*gi>$a2tP7yNcg*=-fLo zEpq-_02gokw(mE2f$(*Z9K5d>NQ}-Y`<51(Mh&1-F&>w9px8kCAT2Gf7lJkMS1Q%J z808encG?eyZRn4QJ%-?5BFr%-Bt8Z&OW8QqRv$jO zx5)S4a4wvH>%tv-=qg`Ki-X|iH&6yrmk@vA=GIB{UK|LR$PqKhg=f~1fwR&Y%Km)LfL3oJzUL+X=%o&) zE{r90jbue=UB9ZMkA;um6=GE&MZ0QtgGYcSY?1v;iUr=$^pE#2IseS2qW~q7pdd3h zRnq*g<->!LO2oG64&mzZ($ZY#t^Sb13S8@7ziy;>j@6G!%YEQ0L<(O`cf{@^b?g6Y z%)e@gz<<>vZqCBuKN9G6&@_n^*lf_^n;mykCB0@7>iNNysD}a_g9KEz@CG-IOu4@` zHXl`H^Ee9;Q^l#qV^0HcQWJ?rjZEI?3;BQF{w9vF7ry{YN0kxt#I$0Q#KsnCh!5;u z*Eayws1!B4i{lmensf1v4mb2mQzC&>TwEc^)PA#9*~p(^*&8fJ9*mr%e$BM8tYfOF z=2LdILP?Yq!-6Mz04Z*4??sj}rh4(%B$w1vnd723KzXfIwlZe{i(Z*0KEKYzkE3u~ zfgeD+>b3?yQ^ZlfgNxh3e#7EkIng)Abk=t!R??%06g5O)xYE;%<(jQ{_{2m3?aiQ~ zpP+!#l%(y6@5SD@x$>7maj!Na8F6Q~=-YOO>%}!JljY7|hN%i7#ZsQVUL!1)TS9%6 zy+p79b>Zvg5?7*o(O^9<&}%0TeU}HS$}L9WIG{LU)eql9Qr0AE<1)X z%mmAo##jBog%)`gnL}R<0GSes8JLq}8|Mdck`XuX7H-0$AQdA3uhSWX=X{AUn#ckh z+pN(zH@)VPW;fB6T{!BIn|({@--T>S2OGIMwe(<1n<{+$=5lC3O41T6eKwbAcqMpf z%cNY_rpNMqRlmo?%H#Kw1l? zOI;f!6H_pG+pqgod5QKg0BzQR>q-hS86#8lLGo9klo`2n`Vu(cHSS5p9^ww)<^Q&8pz+Mh&oFqcw512&; zXIe@iJ`;rIew#&7UtwK&-zNg=55Sv?&W59Wd9NO`-krjakCV`3=uV+{nBbL6Q@XOb z-5-mZ$ybbib}gMy1-Jtg=@3a} zq>a3rX0=$}RN9*3vbrU!dVPv%^idSYK^erZDWLTBMw6}$-&nH*Yp69~Tf99=KIS*mFW+%%C zK&(~uJq(~}raOmewhPAGx*OenTbrc{L*_|Vs5h8Q5YB7;iQLs;6^?|*&ylTs_-%xh z7=NmJEhTnqv2uugLZtxP*Z#H0SwsORpY`oE^{f7VYoTH#urp}7jJ@SttDt*FZ=DT_#^ZS9g{_OhkT^~6xu}5RE-1L_&DEHrn{kB zvpnV+M|dmxgmy0=Xms)GPEA6`Dc;!QNqNcdP9+z944x`ub^=Mh^kESOY+haAeaMJK z6lprBLnEhAqgSf2A>aq`10pq6fKtg9ImO!Mt$ooC5Cdt zD&ZG3LlpVNn}Y{AG1s$Y_!=Kxb*>d5&P0LINiAE?n1+4AQvU#)HN*=2jYaqsC5*0s z%EjG`_Xq^Rb6wh)XJHxS=OzYie(ZjjG`UKYUFaRk)%#v?V=d99O)ewn#59ewd;!6e z-xE?^aGj@Qs)fDg!9JSjcMme1pENoCja0a}0ba~Z=Sn)Dc+^%^VT?VetE1%P=5A)r zs)+un5QDHObQ;z#yKgnl%*?qn)g&h+z5Cqidbn+o>9)Z6VA_|+Z2I)H{`ZB?;C&b} zoO+R>&g1VfR?LpOHJ|-WdFSVMS$#H#&b^aN)$PugY1}rUTbM$FE{BtdF{p$rzG`H} z%!DZ^GnHE6rvENvo&EsDH%o(Q@B1|Z)DyT>IV>hKd@c-of)MYDkNqG3(~hUJHr|e_ zNkQHX%-@Vv)DHc{GnX<_fbXy2Hca-dhed){_ogMDLf+R0t@4Sq%<^uT-Tv1HKT?zR z-IxDJd3N$e40+nmmudQpOqnqts%mIlQxvEPjQRqP!#$aI0W}Nnt-E+XA%6Lnmfq_w zBGr8Sql8_>N_!JH_Zz;TJz#(A)zepASI4pAS7R}il{s6i59t6*S6Cui;9XNe0_dg?CK1oSkJDy z3(Q0vZ$16KYTvpUO4=FMwOIZ6v+Shs*H~Vv&S+bUEU!I$6`{-iOdis7W#l+syA>Ej zZ3;6fDQVpIxU%VNYI2h29{4&W>cz^xR+pAiR`$FkCE=X`9ruBCb#)&+V=Rqy%9Nmu z22m9Mg#Nw*d^Q0zji;7pI~}3j$2oi^yBx?K6$lj05ioif+c2BRK-{%lZNbB`+=`S+B2@MK$GF0h;@`ghv;PaiTytNC$}+($z7^l19iR)5YkF z=%HxymY~8TAURl#uxLUu@N|ptUqxU4ID-L@H4)UqSZePe z=qy>bMSGMZ1%&m145|r-0=khXUI@tu(WfI4Yd6bQW-$T9wmDbmi5y$cS5sj_=TBBg z0L$**U8AyS)8ZF=$W@|%ZP^%TYGRq%F|4fjF+OVk`JnAHs+fBbDNFlBFIN(*89-3W z%i;-3B-?NW@HzAo7iXgMy+MHS&Dp(3(2dNga!CB@{eC6>2kcsk^1|4uk(VO`ayZXDGqU9TOQ=w+$tLx` zf8Qqm449lNC8T>V`9@fHh}?hoYw#$W(p;m7#~U`Y85-}Ob3e)Ekp^RkP5S4n^&s#mJT1H)dQu4ZPU&H&l3Z90 z;xNor4W8M-(8^EL1X4eGInLlU;QjEWUg&9w1ifARHDpi+u81C=W}u>2;U&O^8|(ze zXud2*4pwmns2D^53MGan1&Q~UBRNgQ(s6NN(Y~zV-ROUPs30uTlvkKF1g^V^$_Co6-rrg1E3a@G6% zq(brtjEeU#CYDyqqg%fxdY9N)G3tnzHdM*BO!Do~08jlGL;$=EA##juP*zs$c3HW@ z<9r`xKz&IKo7HI#;kxgYOJT7^p>kdQq&X4>DkS@7ysSb;Y~A53Azh>R%5saejqT6i zmgJLWbF)u;0AYk*T7RqbJ@e5Mx;Bq%NDJJ~b^I|`RL6Bz)2x-n-1VaJYX8Fr)vYZJ z7vM2rS|hU)NohR)D4sL8Q4C71?^76*Bo>|sEff+zASs43C@Fm9!+wo8CXpjhUvZ$2 zOJY!JaLah*+rRa&Vi=SnK{!SVi9iVDYZbt278e9S<|rJYN5U~yNHhw9rOXu6n7&3Q z9|EyL7?fnhlU^Y^9{Q_i?;jZdPeS&eRVy4}qnWet<79f+rjyQH#z_D+37`LQ)~h>n zzja^Y8z4u{hQ8Qr)@hhm4z+r$;pfBgoWXv7t=EuuKKW^@tKGbgmpH(9^9BoDj+W1Y zuUy$*uYA^|{d$B2>LOd?7IPsayx@9o%G2lc>ObNMK?vjnMU}<`N=(H@`#aTKNk6qBL*Ii~n#b->5ix;}F zg-YtnWYSXvlg%4PWuifoMDOvzdS_gz87N!NvOP3S*yq6M+p1C{bZD8FSOay7=rzZm znyP{7nUVe#ag5iN4I%1YQwJUnYOZ_9ZwWV}LBbQARleLoN*hPiGhXXLr?~y=Su3C4 z^L*s%r|;dR?e$lYF{GQWYg3l|>|wM(_H?ly`4wK7?{F>aS|&)s&4Xgx+^+d%ck^^} zhAc7i5RKC2f0F6^ld~o+cGXps^ zQ%qKQQYKycM<>#aK)geu5&Vj@;b$;PTDch~E_A7P;nN78I`?bX$IkbY z(KRD0@{Z9id0jw+Wt>qOA+aA&=eSY?oB1!ALkU&w$KU)Ud;Ld>h7<)?iXmL);%$ig z!eZY6rDO`f+ya?klCmA@Cvdz|FIfRJtsAw3B!QdG$))1$-t>+wy<&Hl_1%nEBx7DE zC|nPelm5fp-Q}wyPft}SXnXUGknG0yulwMmq;_bY8Nw8{1gZ>6yn-xMG7svhu)coM zo8record->getCMSFields($this->popupController, $this->popupFormName), new FieldList( - $saveAction = new FormAction('doSave', _t('GridFieldDetailsForm.Save', 'Save')), - $deleteAction = new FormAction('doDelete', _t('GridFieldDetailsForm.Delete', 'Delete')) + FormAction::create('doSave', _t('GridFieldDetailsForm.Save', 'Save')) + ->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept'), + FormAction::create('doDelete', _t('GridFieldDetailsForm.Delete', 'Delete')) + ->setUseButtonTag(true)->addExtraClass('ss-ui-action-destructive') ) ); - $saveAction->addExtraClass('ss-ui-action-constructive'); - $deleteAction->addExtraClass('ss-ui-action-destructive'); $form->loadDataFrom($this->record); return $form; } diff --git a/templates/Includes/GridFieldAction_Edit.ss b/templates/Includes/GridFieldAction_Edit.ss index 0c9d6b18a..a3fd612ae 100644 --- a/templates/Includes/GridFieldAction_Edit.ss +++ b/templates/Includes/GridFieldAction_Edit.ss @@ -1 +1 @@ -edit \ No newline at end of file +edit \ No newline at end of file