From 7bdf0b8c19adf24ee34e651dcb7b3980bde777cb Mon Sep 17 00:00:00 2001 From: Tim Steiner <tsteiner2@unl.edu> Date: Thu, 13 Jan 2011 18:38:32 +0000 Subject: [PATCH] [gh-73] Merging from testing into staging git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@425 20a16fea-79d4-4915-8869-1ea9d5ebf173 --- sites/all/modules/imce/README.txt | 4 +- sites/all/modules/imce/css/close.png | Bin 421 -> 322 bytes sites/all/modules/imce/css/collapsed.png | Bin 160 -> 104 bytes sites/all/modules/imce/css/delete.png | Bin 359 -> 320 bytes sites/all/modules/imce/css/error.png | Bin 615 -> 498 bytes sites/all/modules/imce/css/expanded.png | Bin 157 -> 101 bytes sites/all/modules/imce/css/folder-open.png | Bin 1016 -> 948 bytes sites/all/modules/imce/css/folder-root.png | Bin 377 -> 338 bytes sites/all/modules/imce/css/folder.png | Bin 284 -> 228 bytes sites/all/modules/imce/css/header.png | Bin 188 -> 147 bytes sites/all/modules/imce/css/help.png | Bin 707 -> 525 bytes sites/all/modules/imce/css/leaf.png | Bin 156 -> 100 bytes sites/all/modules/imce/css/loading.gif | Bin 1105 -> 1058 bytes sites/all/modules/imce/css/op.png | Bin 340 -> 261 bytes sites/all/modules/imce/css/ops.png | Bin 203 -> 164 bytes sites/all/modules/imce/css/resize.png | Bin 370 -> 331 bytes sites/all/modules/imce/css/sendto.png | Bin 575 -> 488 bytes sites/all/modules/imce/css/status.png | Bin 572 -> 440 bytes sites/all/modules/imce/css/submit.png | Bin 336 -> 261 bytes sites/all/modules/imce/css/thumb.png | Bin 1096 -> 1004 bytes sites/all/modules/imce/css/tree.png | Bin 389 -> 349 bytes sites/all/modules/imce/css/upload.png | Bin 393 -> 502 bytes sites/all/modules/imce/css/view-box.png | Bin 0 -> 509 bytes sites/all/modules/imce/css/view-list.png | Bin 0 -> 493 bytes sites/all/modules/imce/css/warning.png | Bin 577 -> 444 bytes sites/all/modules/imce/css/x-resizer.png | Bin 152 -> 102 bytes sites/all/modules/imce/css/y-resizer.png | Bin 157 -> 107 bytes sites/all/modules/imce/imce.info | 13 ++-- sites/all/modules/imce/inc/imce.admin.inc | 12 ++-- sites/all/modules/imce/inc/imce.page.inc | 6 +- sites/all/modules/imce/js/imce.js | 51 ++++++++++------ sites/all/modules/imce/js/imce_set_app.js | 68 ++++++++++++--------- 32 files changed, 85 insertions(+), 69 deletions(-) create mode 100644 sites/all/modules/imce/css/view-box.png create mode 100644 sites/all/modules/imce/css/view-list.png diff --git a/sites/all/modules/imce/README.txt b/sites/all/modules/imce/README.txt index acdd5af7..1c7f1c0c 100644 --- a/sites/all/modules/imce/README.txt +++ b/sites/all/modules/imce/README.txt @@ -1,4 +1,4 @@ -// $Id: README.txt,v 1.18 2010/10/06 04:42:57 ufku Exp $ +// $Id: README.txt,v 1.18.2.1 2010/11/08 04:37:21 ufku Exp $ IMCE http://drupal.org/project/imce @@ -54,7 +54,7 @@ Having nothing to do with IMCE, it appeared many times in issue queues. This is - Upload does not work in Opera Jquery form plugin before version 2.09 has problems with Opera 9.2+. Replace Drupal's misc/jquery.form.js with the one at http://jquery.malsup.com/form/#download -- IMCE may have problem working with Google Analytics and Secure pages modules. Just make sure to add imce* path to the exceptions list of these modules. +- IMCE may have problem working with Google Analytics and Secure pages modules. Just make sure to add *imce* path to the exceptions list of these modules. INTEGRATION METHODS diff --git a/sites/all/modules/imce/css/close.png b/sites/all/modules/imce/css/close.png index dde4617b16e415236b50e85dd7ef995e2899ac95..ea709d08e8fdf90941f1f98e9973618dc3fdf7b0 100644 GIT binary patch delta 270 zcmZ3=e28g+N_|d%Pl)T%<-5h0^v_*+x^($2aVA53d3Q-B6J0qMZ5bzXEnhu3HxqR) z3vEAJgCHGQ7cFT=E8T!4%XaB2xa-I{dppMK%Xutcx!2Ap*wrdhlF7`=G0s5VW7+aO z9(FN{mh8}xb+$DMl3+4gwdTNu>(5n=`UEjBFsPIS`33*~Kk=~G#0#AD|Nk>Y=<xC~ zFfb%~x;TbNTuu&fW9A7FN(gEb6kyc!Q&@OJnMph#AthBnI7zUb+hDVHQRk*YL*+9G z38|B(Omj4v(%3w4;(STP0|(BXICxy?41;jOqm(J)DG8|$TUSqbFpc>V)20l*!!Ju1 a!am7nX&*Zp%)r3F;OXk;vd$@iu?YYt_h2Ic delta 363 zcmX@aw3K;*O1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_p+N0G|-o zywaY(fB&|1PFlEV@r3DX7)5<qgv_-~{LP(HJ^Z4#?K-(>)28s~v`3Ggq-PhudGlt~ z+HI%LU5m}=zI*rHxr;aSjqSt~Y|fuQ&%~vmW}fx--G|)=&ixSn@#FTr7Zr6A|NsBb z)zYZJz`&p|ajtSbLrjeHTLuP(^`0({Ar-e``cDfrEAY4qD=c8j+M2LR<lldN>05r{ zd%Jy#)Yfyq_5aZ4&pdnQbom)<Lbhj`<P%=3)}6+uc1uq|YMqy<(v}|zyZqd@8{b|d zUctZP^D=`COA8!sv)pJ{5z+9OX^lp5{)TIr8LOH_zuVRyjGfeF>ibYj*U_zO<6%p~ z@Hv$Mo3`j~mew`y*E}D0&a7v`(zMx4@A|ifEs_lOa{Rfs=FG#QinV_)p54nL!C<N) W5ZQNV-&zI+1_n=8KbLh*2~7as-lW$6 diff --git a/sites/all/modules/imce/css/collapsed.png b/sites/all/modules/imce/css/collapsed.png index 53462448a522b9a9bb0eec5bb5b241c928042ce5..aa4a93283a9b73abfd282038ed3dcc04195addc4 100644 GIT binary patch delta 51 zcmZ3$m@z?RVvLj)$Mxg{2L?Beh7B_eB777Yg2mQ}voUb>Fj&8+uTx=QU|{fc^>bP0 Hl+XkKotF<= delta 85 zcmc~;z&Jt0l)c2$*OmPSGYcQHaD3UbA_fKq&H|6fVg?3oK@euFPl=z%z`($g?&#~t nz_78O`%fb4L`7Mqidz#MBm}DEclR(bFfe$!`njxgN@xNAf1VZZ diff --git a/sites/all/modules/imce/css/delete.png b/sites/all/modules/imce/css/delete.png index 7751a6896792c8849f98234595b321b43780b59f..277f9f325d1c6356a501ed7b25bf01fe859b6dce 100644 GIT binary patch delta 43 zcmaFPbbx7s%0$l@9QmFujv*44YbU-;7iGIxEnzX&H-9Pv0|SGntDnm{r-UW|W0((1 delta 80 zcmX@W^qgseijriBYeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK5+iHfs13O!vM kLn?07Ogxe<u6BUoVzq<?N1t~R0|Nttr>mdKI;Vst0GwAGSpWb4 diff --git a/sites/all/modules/imce/css/error.png b/sites/all/modules/imce/css/error.png index 513f819ec13029524996535ce11c57eb9c33a1ee..b92fb75e700f1d5bd2becfc54ee5074e2096f06f 100644 GIT binary patch delta 473 zcmaFP@`-tZay{ctPZ!4!i_>!_|MYSS6gcKTdu90Usk6k^dRb4@U7)}z8Yq|>py;@F zT7Qs!pbN`))mvx8PCm^}JNI>007vYPe><L^c|Uum@pFyKCZT)RO;vY1HAyGv;I!2B zs<R%?e)y)@sNrR5Lb1Gs9Xp?~LlwKk+@rQ{3(u@)+fo?H*~7TJe!4>m;|EuU_Y4pC z7}wP)7-=p`je35Ajk!#;;y1?&$yEpMGA`(T&=<Ghtjf>Er6OJL76f;G(Mg>jlX1ga zQj_8CL8&!W0bzC`Q{!8nu)Qm><~-TAQZ;s)Ae+sUo2~`v@)y=^o_2D9%LDV32iWdR zvs4P*(AfGlmUlO2-pAU2XXW)~okwpTNNQ%{Guo9CzF_G=>8+o<4!zNm7TI#}-b}kp zz1>HrEB|QaT_z^W%)L@~?p*)K!t-0}>@|PPJu-9k1__??7P=`v*%xYPZ3$E|J=AtU z|I7IYlaKre+~}^E{A8lSUTwCo1@{_x+3TL%*l2l2W4&DRSEZ>oCbL?XNQ9g|cQdGJ z+e7s>XW<`<B%Ui>jen|if6r7?%l<u6ax4la{+64+{!n<m-Lhyc-hYmq)7(uZ*$)}+ loLP4BrhWY5`gx!Ezx}`08oT0x90LObgQu&X%Q~loCIF`T-Ut8y delta 591 zcmeyw{G4Tiay^4&iEBhjaDG}zd16s2gJVj5QmTSyZen_BP-<dIW#P$G8wLg@PEQxd zkcwMNg3tR4J4)2vo+dWot<<&&ZUzy;E0-y@RWux#Az)i!^l`z*B@a9518u*(ieKQq zE^Y(cdoC$qmY4h`xsm1b?wfCpT_tByIBELapWmwU)AqgZ6|ZMuJa+u^y_d6U%vhzH zqNM87Z-{M?V?7%F_~*SH4HIT}pU5?RRhm%9sPVhO&|x|Ep8JR2{j;+>Xd^svxuhqn zh`!<1LoMD<4y!+TDq6J6%kTW;$;By!)7Hc(zQ2>KRCreQquY~Zs`vN$Pt%_>(Oc0{ z@yVacOWZ7WJF6ytOmTIcRUhV{mYrYNSM%Y<#O0~(o(U_9+}vhzrb!&${@_>cw${aW z=7_D?xQFM>mPQrE7bo{Ve8x5ThU!C3l_lTv-ao1`SiSk|oVDMaL@j>k)T^pmF|@Ti z)aYbu&U>kRT<+7GWTyp1_t}^i2(3Ecc5vG%{!4c|_V>E@C4JFxUAic&An@_6`mg*< zK8-5dUN@O~ZZ8hidDs+pb1K6+kzKPrpZn}Db8*hzFsJm!J@&Wi8ejbm+&|&Ny4UB# z^(Hyll?S$QZMjz?(wJSUowLbBec5Xj+a1=d6XSPvTyOTc96fVlosZ}L@N1P?wS7yT z$FuGgIo_l%_GtP}sr}x5X-f*VkH6X@z5R&CE=7NpmC7xGmSP`*l3mWN`ExvZR{Qp? zt8#gdYAl`f+V4Nhi*Fl@dkQ%IeVVc7f9*MYRtW~S4F+{(jpa8O7#J8lUHx3vIVCg! E0H2x|`v3p{ diff --git a/sites/all/modules/imce/css/expanded.png b/sites/all/modules/imce/css/expanded.png index 7ed7671d228717d3e4642999e1f79142542d38f0..5179e82cf0141318890f57c17a2a296008e453b9 100644 GIT binary patch delta 48 zcmbQsm^wjaVvLkJ$Mxg{2L?Be14omX7~Ps)B``2>-e53)o#^Aoz`(%Z>FVdQ&MBb@ E0D1%u0ssI2 delta 85 zcmYeD%Q!*Bl)c2$*OmPSGYcPw@SZ07oeT^NoCO|{#S9GGf*{OTpAtWjfq{V~-O<;P nfnj4m_n$=8iHfpJ6}KijhziJm<I7@TU|{fc^>bP0l+XkKeK!@L diff --git a/sites/all/modules/imce/css/folder-open.png b/sites/all/modules/imce/css/folder-open.png index f42a75234f35095f6eb8ff9ff8d6610bcea5c1b9..ce473f4aa5023e94edef01c6fad31f95cddaf484 100644 GIT binary patch delta 130 zcmeytzJ+~)^2QV?=JF&@7sn8e>%QkN3N<KjxLkCN@w)Qs|Nh=Hn?6^hConj0H!Y2P zptYs(@Z6j2%dctZoJ$q|u;g~g8nuGt`okAjH{Dy~-~OEA>{=hcUcqUitBwWT`gW_B n<)r<rM*^O|JRdXvWYi0(VmTRQCs@zGz`)??>gTe~DWM4fz;Qe2 delta 197 zcmdnO{)2sjvONQ5fk$L90|U1p2s75F#7|^kU{FZ*2=ZlMs8VHMXlQ0&`1zlKq2VP1 zL#Y7+!>a@a2CEqi4C48d;*Yv*RFq+^O7(Pc45_%~bHb6SMS+L;z?4ZEOH2R%zir#` zNQT`ZZCRqX=Oa0<NiLI?FeZeCUfp|{q3=PN)Q{v0$yvNM5&kizvOOWX;U(<GCes#} zPe?vq!o2cvVVQZv{|{*mruC-G48IxvF*Afzv7BVTz0{3?fq}u()z4*}Q$iB}Gjc>F diff --git a/sites/all/modules/imce/css/folder-root.png b/sites/all/modules/imce/css/folder-root.png index 1a6c5f7e90a0922520d1c730dae4c94f097e56b1..140d5f20a328ea3eaf09cd6d3728020607e24a6e 100644 GIT binary patch delta 43 zcmey#bctz#%0$l@9F3kXjv*44V<*0>6y@%C%GZ_ucj+7k1_lOCS3j3^P6<r_d_WMO delta 80 zcmcb_^pk0VijriBYeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK5+iHfs1nmt_{ kLn>~?OgvI4u6=-^<0)U)tc+w$1_lNOPgg&ebxsLQ0JPT~IsgCw diff --git a/sites/all/modules/imce/css/folder.png b/sites/all/modules/imce/css/folder.png index 7586a2de3b1a71beab02c17c7112c34dc517883c..6e059125533ee733ef1aede1f678763b566f7f1c 100644 GIT binary patch delta 32 ocmbQk^n`JO%ETByCXVY9*CYt^c&^*Tz`(%Z>FVdQ&MBb@0KZlXC;$Ke delta 86 zcmaFDIEQJ1iYa@Er>`sf4Q5_(BS~?_`>Pok7&r?&B8wRqxCKF&u|6e!A_D^hOS+@4 oBLl<6e(pbstP>RjnJR8gEJ+YpJ<(g8fq{X+)78&qol`;+0Hf~~q5uE@ diff --git a/sites/all/modules/imce/css/header.png b/sites/all/modules/imce/css/header.png index ade32cead984ed91065027284576f3650b96c724..4a1e8c6dbf17c26db56d7cf6a80ec5b08e2d628d 100644 GIT binary patch delta 67 zcmdnPIGJ&R%0y2yOBGKS#}JNa*@Nwj3<3-X47NW1|6Yr8;)nG7d9NP5b1we$AxTJ| Y*MMPB&N)$41_lNOPgg&ebxsLQ09`{FN&o-= delta 106 zcmbQtxQB6qijriBYeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK5+iHerC8lEnW zAr-e&4z}|$DDWKE5b*8S|5&9&;hLlEPoBMc=w1HpOPZj610w_1GKNlmzbS?c3=9mO Lu6{1-oD!M<UqvWq diff --git a/sites/all/modules/imce/css/help.png b/sites/all/modules/imce/css/help.png index 4b3252a9416e54d7e20a631e66e7eb7a068d72f4..8f7af95ca2dc05eb32fcbbb11c6aee8d61d7b80b 100644 GIT binary patch literal 525 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L+;y#YQUuID+-FK}e+oBRKN z<k}re{{O#r>l&x*x5f$o%UhnwYJb~*@c;k+KSFN)7t%bk=l|dA|NkZRe{swF7uQ?M zy6*+2`Ty2!KT?Yyb4gz0Fh9*9eURP#6PLqHPT3D!3jgi59_JK$#wGb*F7hjv<0Ve< zE1a@tINbiL#s5z@|G)Cbf7^gRN00Af_q@nq``>uu^XUI~IOSd`>i@p;=#!@TYsa9! z`TtL_*Zof|`TzLYfA^jL-9!HSA9&1Z^PWrUznsa1>(6IoFz_=lFxZy_`33){2r%@i z)rd1NFdXo7aSV~T9NT|A>`;IR>vzwc3e!zYmIx>m`5m~od(;2_n`<`cO#f`*Z~VaC zVbaAsYwy0pFQS*I{|s{3aw|oXbCZr$_#5Gl)kZ=+pZw+}$xm<HVW%LW=X&g^$+ySu zuftfjFT1q<_C$GEt5|_EuAxu9{QS1SbhpBc6<S{QKP}|XWHnU>Pc10Ae<<WW=f2QI zpRD#v`mEilB9S}i)Xe$jX)BnUYF7As+Wq=kqU~R=^S}6*FFertJF_}6qjn2dUH<=1 aoSL(gez}RxT+YD2z~JfX=d#Wzp$Pyg*%a;o delta 694 zcmeBWIm|jivYw5BfkFQB|3n4`2F?PH$YKTtZeb8+WSBKaf`NfSA=x9ymw};5m4Tt5 znStTwe+GtzmkbQ01`G_Z5*Qe)W-u^_=TC}1>c+sp<mu_+7*cVoX0pFWNTA5E`uBS` zZc_WqtN3r>rIlidE=R8{i&aYF4b)cTXgyH6bwv!zqn7&Bx3&srJyu|G)!cDPZ0ii3 zW=3@uNlEd=J(r8!o?D*#{C9WmJ!up6^Uv=6zWZM0obCN`)vP1u&iO5Wz3Y0bz^cqy zOOrNQT)%j6B9n|mLBNe|che)U^*pwi_1Gfy_O|P#vHv&j*kQpT!}?@ar&CAO@xo(A z85d^WdfwRBn5OXHxo7>qV})~e=$z(fcotm$<HJYp>`GqGNiX+aJ-au9pJ8WA-maxf zm&)H@$T^z*d)*?9#SAy6hRWIZ3uf^N@4bAu>g1E#-{V`Hv>qDgvNRw3JkcX1H7O~H z(ZG;LIVbYkmiy0^uUwz><gE3^Z`%WM|K2<iZD?i}X`8<J=6nYU3z-QjFY8z7oSyz? z`JMhU!N{|hOM+M(u5Z6_&&=ZLt&q9XSFK8KbaR-TdpoT0!Mny^Pl7z3zr3J*=xuJy z?xKZN@*FI$8mkl(!nLNB-rn{#>eQZ|z01CSvHbNrPdF=Q#iM1J(`+qME$5&AZ^ok> zx%$AZHrFk`kIhT*@7$8ECGOy<Hu+-IuKM%(I-R|~weoV^N81`sA1J)f?OwF=&W-;^ z-2L5Llk~Q-&z?JXF4L}tvIhZI16Hk?cOu2;eXGDa|G21gU1u*%t1l7mJhEhw#@++2 z3lg^rGKx6#9)HY#`Q?|AjS*+2oK9UEprNxoXywd@4<Cvj@LeDrVEgYLmt4geWs|BP z&3gy5^yk%fJKQ|{P4vS?tM|2~^J4T87?*7i+y7-hBZJV%n(Y>GkE<CN7#KWV{an^L HB{Ts5>6l4u diff --git a/sites/all/modules/imce/css/leaf.png b/sites/all/modules/imce/css/leaf.png index 022695c8977e4f0f393e2ffd7147b297711638ce..605d3ac811754459a0f16a464244c4024925cebb 100644 GIT binary patch delta 47 zcmbQkm@+|SVvLj;$Mxg{2L?Be180*CX>+F@WMJS_VKA0{U;KxGfq}u()z4*}Q$iB} DZW|8k delta 85 zcmYe9!#F|3l)c2$*OmPSGYcP+;ELpJ@(c_NoCO|{#S9GGf*{OTpAtWjfq{V~-O<;P nfnj4m_n$=8iHfpJ6}KijhzLYTu)ShnU|{fc^>bP0l+XkKVR01_ diff --git a/sites/all/modules/imce/css/loading.gif b/sites/all/modules/imce/css/loading.gif index d1578b5499591d0be9be180eb141a69e47bfc824..16baa5bac9a27dc206ffde16cca51081ce80a932 100644 GIT binary patch delta 908 zcmcb}v514m-P6s&GEsm*fZ?myL>@^GUtiyc4<DMCnDq7aiHeF&nKH%7%Ify*+XoID zNKH+RiHXV1&USWoUbt}KtXZ?xty|aH+N!9isHLS<U0q#JP@t-+`uzEGadGj9xru`R zx&2&2f}I@$T#fV$m>C%uCSEbF|H;D2#URF@!@$760J4^W)o+1n--SYl<XKXD3>Ix# zLct-ddd?@ViLh{VaT`wHRNBv+xY6T-4(rL6o>?MYA*Y!ab|kF4{cbu}=9^8LPL2)N zytv=GyA-+E%e~!WC(6X22)2SBVg)|~7Xt&U&jaN?w@}ICSxNPd8#p{C@m-%PqkAap zT7_m`m+Rt(EDQ|2Z$1V`u(3KdHlER8pUUQ?a>F1-$vJUB6$b}Pqh#}nDWT1*i@y7H zo-7UIfZ8C+pu@z#z`)1A&A`Cwo}k)w-gusRi^7Bl^G;5V=(;3w(PhF!7lDZ$jzSzh z9+Q|856H-Lxz}IxpJ1gR#U}E~G0{Td)<q@<yB62SpLR}is5tnVQBfM^d|n0}HU<U; zE(U%E2G)QDiX6U~W^8Se>5($-hB4Oz_@<eLbQNvo?LHL9D5WDR7LZ`MCW@6;IoQUP z`O4%42OM>#@E&YCcwmAL3md}(&p8~8rN=Hul~{?@Cp16MYh{3Xfrmkdm4S(Yn}Lsk zfz98ct>8xmPd`tSN|K8a7rUphrh>p6cPHj1Sr?IxmlwFjxY=9R3JdM!67FVwD8S*u z(!<Eaut4FJa0QEe4Wp=_a2^|94Idjzg>#NVjE5uC4n77QMg}$pXhhU6Q0`k|EaJA( zO00=f`=(x#q5w<Gyp@|-dV0?#W`wXUa$#fO5Sho+?NsQQHG{FwEqP*)`!pZ6W)2p< z&eN=xUMegSpOws{LbPmyU=aaMO{~y}@LZ58(40C?<B5Ss(>`_ueSN9(UsoE1^ht>x zVQdl-sOMPjp`aki!_#!g@zVwlHE&NvAxkf%Q0_z_O%stWw?_}PxD=cgo&Uly-wEmg zUQkM6ghT~f@PRgii2_os(|pntE!3<S93DJ8<6_^km_axpXO@#Q$3e}8)~P-Y!4_th xUVkfWu#7n8*M0OsUW^ErSZ#eHbCnpg6SKHDGb=lLkvp4&L`^L-6PqK0H2^l$6=47X delta 955 zcmZ3)agl?^-P6s&GEsm*fZ;B~L>@_xS+i!{zJ1%**Z1MWhbAT_2M!!aO-)_6aA99x z-@0|{T3cIVVqz2(6-7lwwY0RXtgNO?nUbBIU0q#WP*C9P?5wJ)DlRVm{Q2{VxruB) zSy;IklqTLcuK&;N=Nc01>=@u`q-Vg)$iTp$!@$760J4^WE!1IR!3_%;slzFk3K$vm z*p^P1P-w$+j>}Q&6blnqU$Ef>E}8qxj7*UQuB|6O`W_KERTAiQu;9VV>e~7eUWw>R zPZn0Dj;bQoUQRyY_6|<Y-kGyJ9T^lM)`M)SXJFuG;9_843wD@TkWpd7b2uePh{J)U z+qFobQ-{x&^>UMho5XbXLrFJT7#O-kzN9L!u{temTDFFrpC?G;LdYB^HdbaYB_<XY zrZyoi{#Gw$0j}77&!(2CPDmCpF)%RjF>o_5u=zSn44C1;(|^3p>7oE9Oa1Xy!Gj42 zTzx!^FJ=gE@VO@nainxiK3sOdZp!&X`Xx6kGz{2Oj1I1hnN{T^z|g|p*wn(%*3QjU z*U-+)Qi)^*8v_Fa7Xv>716!EGL<a>eDOa}6BLzBQeC>x6gd|1SIgUIynBX!?iRJMp z25A9)wTK1_o!PAQ-mO7)$C$q?Ua%q1;fj-#sHl*O8;d9dg9x`f3uBjvysv<)EJuP8 zORp=EU91dD4BQNS3=C}k4igJN-cdSqB+;ddtKCyrQ$b*kJJYg8Sqq7-mlwFjxY=9R zZWi3jB`(nMLV&}9Wl<v&!vl?1k`*j+HH`fAe3E%=;x*!IN)^sI3Nao?mM}7~LE|RK zVPb)Y2rpOLqM()l4;JqvVJ1-ljth?rHJezpX018VP|4H6&BY*~v4fR^O}S~?8fNKk zR>ArFf+8Y9T#StD+=7DX&fMHgLahRU&dmJ$F)nax>OqNs6&g1I4ig&<1SI=U99z05 zLSa68gUBZrx8+wCZ#r~RiI@NA!bTAR4tIA214$m9MTZh632+*{_B{B|!e6FTiA9o+ zRf2~{LW$EaRf#t#CC-hr(H(3HCl`Yf$P!qZjs|%~M@XD|v5@0JhX9sS4;L{rum}Y{ zYzq1+ut}*=CE%jN;<gD%!4~fFQyP{sh#h=d^1-3VVaGvk4i2_bB|#n@j@I^0<|gJq YW<fz_R(AHv1U4a|mR9C^XGaEW03;6%UjP6A diff --git a/sites/all/modules/imce/css/op.png b/sites/all/modules/imce/css/op.png index aba39c2e0a4c8b836fe4268e7c8276be8b771ee7..74055e2b73e083bd5abdf305e9743a71ae50ce39 100644 GIT binary patch delta 233 zcmcb@)XFqLrT&bki(`nz>Es{(|JyUG&Pco<mB4nSy77mxKt1y#W``XAHH;4({yeuA zsrmg^UQ$Ka$U&szep85<-2cz>cm6+K-?mTwzq8r@U;l-ZR8F{d{owInUU}>HgY)%m z+tzFB`1nD8hPKy7$qRfz7fU%Zim$SZyxIOk`%J^kA3PdND=li0o?owTn-i|FqgMP* zgIf)ohST4l`?Fs^|DWS|{-5y?+rRS-e*gVHfB*l+mU^a*VhbZq{OOkt5tz+q)9}M= s(y?|284o|NDbD@d7ETuLIL2`JysT#6(oI_#7#J8lUHx3vIVCg!01x_cX8-^I delta 313 zcmZo=y23O;rCzecHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|Uc1PZ!6K zid#v4{{OdUR&D5PbaF6eKGRU4FHq0+DBq!mq2ukwRV=NHQhe->?Ef!(aQprL6AF^C zw!6{-73#QyZdUv`U;pf%{C~+`b$|G8{(1f1zhmP3#t6Yk{`y_wOpOs4_Yd#q`TD!w z=+EDO(;FWik8d-bUT<6?^PhLpbH+ykHHiy2l+M}xI(*>6Q*$o6-w(`vdbu{SiJ36R zHFJ1tF4#H0ZlOm+*XBbr^gpmJQo1t#|L$#d|ISbQ^2Xlz&gK7{oA3Ys|MR!J#}9RZ z?1$Vg0_XnpONR(_u}XYnFnV;`LrR{hP{C|#56h<}83AMFkF_ye676+qOdJLbYG=%3 V)Au`HVPIfj@O1TaS?83{1ORSfjk^E< diff --git a/sites/all/modules/imce/css/ops.png b/sites/all/modules/imce/css/ops.png index 70cd625fe28e45b45e517c21bb207488c468011b..25b4c2cd306c8c88c53f715a41641169506ebd1c 100644 GIT binary patch delta 43 zcmX@jxP)<n%0y2m4oy!N#}JO|q7x@8iZTjcWZ2ehGHo#f0|SGntDnm{r-UW|D4-2s delta 80 zcmZ3&c$#s7ijriBYeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK5+iHfcq+MX_s kAr-eoCgv%Ma~d!RUu4*}zui59fq{X+)78&qol`;+08`r<f&c&j diff --git a/sites/all/modules/imce/css/resize.png b/sites/all/modules/imce/css/resize.png index 94314890822161104723f3bac239c2c58b872f09..2ee120cb0f6063d90394c36c94c27e5fe076e046 100644 GIT binary patch delta 43 zcmeywbed^`%0$l@995n!jv*44V<)~W5@og#7kyCkt>Ya70|SGntDnm{r-UW|Yq<~l delta 80 zcmX@j^oePLijriBYeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK5+iHfs1YCK&W kLn>~?OgvH~&TYV8BQE-&!mw=t0|Nttr>mdKI;Vst0FyTx@&Et; diff --git a/sites/all/modules/imce/css/sendto.png b/sites/all/modules/imce/css/sendto.png index 64bc32753630dfb21e7961b695709b4d754e95f5..90309230d3fdef07717510c5b687b9f105706e0a 100644 GIT binary patch delta 463 zcmdnb@`8DSay{dEPZ!4!i_=FZ-_}k|lsG2e-gE2zziUxZZ9&U+T*#O;#p%@5Ge@=b zrYt%$bxFpVcm?rGcUDSHn&NEfKWX!v)2&Nt!dp0V#Wl`Md9o#U+x6WyRNB8~OzDn4 zUv=;5@8A2vbOi+evG3_{*uvcB=TP!<((V_}pDW5AKBHmWR^C^rQGcwc=Rp4h@ym}N zM=kptlyCS{czM#A=NwKl%o#m5&9`sTocl@RdC%@&;f@V2j+W;dU-;TNN%QRN2NN&P z5U)M4Lw|!r>himD&+eEh?%8@@Q(azfQs1M!MQq+R0e0T+Ynr#MRt<HC-&1z$uh)e( z9?Oo_jOm49J9YHtOpbW?U3Jmp`d`boGo=fM=%rQ#-IdquUQ@i=_<joeGoSDd>m1z~ zPgt&1hABn~yvTVfz3rapmCv1}0rNF~Ub(}$$i;un?RUqt_<DFJ*tPn;>s`dSQ0IWN zqbz?`L=dlNxlCQoKUUYd`xT4DQ_dt!e|~q9m=*VjEeoVB)E$~+zu?}#gNa8NPsDf} znYZT1jx|mq+z-MJoW5`>A#-WKGm&jyi+qaf*H8WYM^H|D3e&If2scHM^sc*qx#GU& b?_pu8J{sWH+47o!fq}u()z4*}Q$iB}`ibSO delta 551 zcmaFCyq{%)ay^4&iEBhjaDG}zd16s2gJVj5QmTSyZen_BP-<dIW#P$G8wLi(hn_Bu zAr-fd1p8~`1j_t7xA(L9Clh{s)uY*;l7!y3w$5GjOixAC|FF~f+a4P?h3G7MBeFYO z=cwD>4Kp@P(3sMySTAO?*e7Mt$)1aQi{D$;wNIS=>C2{y{Z{qg|NPzedG7n~yL~ts zzqd4%w>j6@oiX5$GF&7)r)siTamJck>n8RtY`G=V+m@g><xBT|4UdbJ%9k&hm_KAZ z{-b}{d{Y*_OI_de{R;#u)@<0f;GK~8k9Y4^xczE;@{u#2Mft;q#bKF0=DgOmdVaB_ zqW1TM!k#@L3oicNK5vQV%N_N~@|RwOc3ljc_+Hz0iIB~nowY~w4fq<5rZX}2_HdVN zE3circTW1X*;jMERDQCnQl7}cXZEeXlI5~Wy_du`6R!a81zWTH?}z?je4E|2BtFpK z&8MBGCfPjnaGku|;;@aR#VH-8Tbvz*8Hu01`)#v69kDYeXg|xIsRkF;UR!jhs9q|s zF3s&I=d@POm&}$)<{n{5?^GtMNaeD2SK0ks7qn4l`*GgCQSD#Z4U4(6&os)tbD8sr z@tE8}^Vn}z4>&YS4*y(#W1mt%_Pv)5JcZf9iA8(n`yGj2dt|wSp<)^H3t<i`>A;+I zk2(%8m-vRfTb(ax)8eUey}{JmZIy(J9G}9HH{sn+_W$qw&cwr@^LlqYcgCY{3=9km Mp00i_>zopr08E7k5dZ)H diff --git a/sites/all/modules/imce/css/status.png b/sites/all/modules/imce/css/status.png index da78caa9c43cacfbb5f2fde6f422180315c95af5..33594977a6e0fdd6df40f3ff4051f2c4828765d2 100644 GIT binary patch delta 415 zcmdnPvV(boay?_cr;B5V#p$IJy}g+dMcU#^)Ar@NO?s2$=q9-K7K<Zm<KMPA$K7TZ z<5$$KZZeA%TjZB@!7XabW!DR8TvIZhpVFH#`-HdC!<RjoGa~)ARHV-+-uL;;@4f6U zE&o^iE3led_Qb(saoAr@hTvGYOB&~b8)B}%Gg|a&S+2u>vyvnAt_Q=V7Y5E!IdWC~ zNSn<z#*UTJJEknnoTWPFrEAL+)75$04J$q<u9|LR;t{p9{l8vO@<h?2b`Lz*CJKh? z^9l<s>gd>Z<xMGT!KL6g3z}xlo^Ul==1yq#f8h)J<XU=X9=jXtaoT(e&*>`3Wiwv$ zaCC>ttX6&UGa>3)MQZu9P`~=$i_6ySRZ<gr%eOy<aamE<l&GVN{X9-h-!-{M;fadj zhC>HF#xrIK)YfchkY=;_aDml2^N`QR%bJVx6%Uo@7iFa0DayE3FilqGRQj9DxM+rH z+`p5$uZOzLi=FeKI(%JpsWn5h=|T^k2M#;)^Ntuk;EMR_wtqKsnEvVe5}(ZXNz|8o a;8Xl9k=^|DL?HtM1B0ilpUXO@geCz0FT-yD delta 548 zcmdnNyoY6iay^4&iEBhjaDG}zd16s2gJVj5QmTSyZen_BP-<dIW#P$G8wLi(d!8<i zAr-fl1RG|EIEvJMPA_|0**QVvqn^S_ok?Cilk_5@xTYQSKH?_0QDE(nb55?(flUHV zE<vn1I$MLKk18ky3b=BlvzU71Z7$z#Y<+)!`i0vQT3Ffd)o-x={Qr0Tzu)nO#{bf1 z=3I^v-xykV?#Dakbz4P6d!NX^m~4@-=;JMmFA)OD52SBaDmMMQy^qCtJ6r#^?{!DD zE|qt-O6>@n@!<Kt2SR+Sf<k!{pH|vB&0c@u$@i~LEdLS>ILxMhmwl(bKfjLQ)xYZo zb7!3tExf+;YH3f!;)N4!>OGYr?DiX(zWx^)l%ldIxAA9z2)C_a&CHK0pKKJ+DZQV* zZ!V9^yc%N-W4Fs|Ra<Jr7mFxOdmX-y(?7kzB>mTNHm|wPGtCQpe(+6Pk|O`RvRH=8 zJwUN{`?<!CQ?kB2y(V79k#XyubNBqjo7)0IxtyyQ<oZ>rBs;&HOW#&dlUTo7=x?av zhCHEClMl{yZX4X^L@r{MzbLdha#m4%nW~5XWhsGq2c+edr(Tnr<|8FkD=H>kQ>s3( zsMcZYGj5k1{nz!}%u-Hws4kyfa&7H<3x$~?vkz|x4_J61{EqDAjtQ$|o4a4OL_OYB zQzv}n?zzla&p51dm0t*d;c{|R>R{oO&AFOC`N4JuW`^QR8?RSR<>qE!U|{fc^>bP0 Hl+XkKG|lw- diff --git a/sites/all/modules/imce/css/submit.png b/sites/all/modules/imce/css/submit.png index 8dec75430499ef45ce1d02b55db919e95ef8f812..4e045722935ae792a92e4dd18097bf0b34a4b936 100644 GIT binary patch delta 233 zcmcb>)XFqLrT&bki(`nz>Es{(|JyUG&Pco<mB4nSy77mxKt1y#W``XAHH;4({yewm z`Sb6aJg17Vk%LIb{icwAmY06~cW3|nU;Zu6|N6DuKmY%KfBt`fxaK2c1>QA358nG9 zUo8>vVSRG1LHLwM#tUSZJUV`J-G6yCqXiGv&;FahcIHUBgP_OJr1j6+|L>o5vY~1J zy!>{_3mxYfTvyotuitm+>;Icc+y48D8~v%TH+lHq-b12+L)U5JgrD-}D-_IRD;PfJ rs`T<VT1=QTMWbCV*I8X(pqKGpg}f)*&$8<b3=9mOu6{1-oD!M<Nq%sN delta 309 zcmZo=y1+C+rCzecHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|Ub+PZ!6K zid#v4{{OdUR&D5PbaF6eKGRU4FHq0+DBq!mq2ukwRV=NHQhe->?Efb|_`dzWhk|6R z?XI*yg*xt_pU*uW|Cg6N^S^$J@t^-&^`89yzu(^R(EP>-!TL!4UE)lQ5ii~!uH~`! zzhe9+_2=mi)2B8*{Jz(eXTN`0!;{Je3zkS`?pcgo3Xjg;-psQ<@?uIuQh=gp4ci{J z_BB&f59{-VaE3{GOMGVC=Md8J>+}ET+OhxV>!$twU!r*U|95xcfB&0X7&|T;67Nu$ z^Hbh@g@OpT!5hXS+b5dn*|9uw$jOrAe8Os}kjD1t_YM&QzQ1Q!1QHmYcj|O~`%!R_ Qfq{X+)78&qol`;+0J1lUx&QzG diff --git a/sites/all/modules/imce/css/thumb.png b/sites/all/modules/imce/css/thumb.png index d62878d8cfe0029a8b0a8b21be85c4e44d92d854..ef2949794e01717117d4338659cbe1d8e8e383d8 100644 GIT binary patch delta 156 zcmX@X@rHeZ^2QWP=K5++7sn6@N!Ejbeuo_dSPjx84wZLvtO$BvzroA3MLOq%-J7Rx ztz4J2TK28qSHpZD^f)(Xq-1cb^t)4TBJ(N|+Mlr)3COOO(O&#>v6}pi4<}cC=#Kr_ z7$+lf%H_)zBe6&^m&D+AI|N&0`E3?TIyA^lcbW5Q%9c8IhCj@_GG>ASOF0h(GcYhP Nc)I$ztaD0e0syF?K4<^{ delta 247 zcmaFEeu86yvONQ5fk$L90|U1(2s1Lwnj^u$z@U)q5#-CjP^HSi(9q1l@bf<dL&Hl3 zhEf9thF1v;3|2E37{v1@#UFLssA$bxKh4v{F{I*F%(>fqO%6P+7w?uWQ&M<Q@R{k` z|Noc7J+Az{v1am=%gK??Dy7;AWxT7o-qnORu^I;p9=yAg&3N0)Q_)w#m-9b!Uh%u` z$2xAcqH{Z}HC1;dDA*hCvwAr-qv@f*te{1l$7<KET6M+o;9WsMQ{!`v2gAcFyKkk1 z?7pDm9OC%%=VGo~x3|9Ey)IL)w07Msg@3<z80s!?=ARJw9n8SMz~JfX=d#Wzp$Pze C0A{uT diff --git a/sites/all/modules/imce/css/tree.png b/sites/all/modules/imce/css/tree.png index 28203b2a18b6eaefd1fbe0f2e9a4001d0fb47e51..645d25c31da9e84bf707c5b371bd59d0f7384c70 100644 GIT binary patch delta 42 ycmZo=zRNU0WuoT{jvh}J#}J9ju@hgmiZmDsw@;pY@*4vK1B0ilpUXO@geCx3QxCxa delta 80 zcmcc1)XF?TMM<*6HKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNmZM8(-0{hlt4 kAr-e`CLU=OXX0UKFcfb0`kuCefq{X+)78&qol`;+0D%r16aWAK diff --git a/sites/all/modules/imce/css/upload.png b/sites/all/modules/imce/css/upload.png index 74d5aa59777c78ed225f82b390629ce87983e379..6cba6092c8ab16c01bc2ae71754540d2aaf471e9 100644 GIT binary patch delta 431 zcmeBV{>D5(rT##GPl)S<3+J`BOE$H1-MsUvzP|4E?c1kLUEjQU&(+&6H*DCjV9B~W z58wX$`Lm*;>gdsvM~)no*vyz)P!a!-!E&8W*)xW|*9?xkO^mKHM4#|pvU2mhMQdcX zusNJ#48F!t_k>}=(v8xW7}D=Bc-&!_Jbi(|amG^@?oWHgu=E4N`j0^jiu)P6`)8Dw zw<>StKY#T}=zibz8}?kd{`~sgm)m#jx_kH0fdl(ao;<O8_c6IGoF6{CfBEv|!-o%E zym-EO^Oo(~w|VWgzi|Ee3b75k3=9koB|(0{6AwyEyub-Z_5c6>XE;>7(S?D5VX3E! zV~E7%&@<PCnhXRS0-KaPdcEH7jTGFt=+FOnPR79Zhtr;)@!PP>{~izbHT(4@rge-e zg>z!|F{qr}rt0~RLBRFm=UW?JJH~B`3^R9Rj}~=$F?$(5?+UqH-HQ?y2(@vg9P`(F zkv8);yGB-n$K`O1*lst03pQbM=au?Ss+Mv*u<82oxf-W$syIxz|Ln(<$2+zfofdrH p-gH3A@xghMz5|gxmcF0aTsYM~{hRsQlYxPO!PC{xWt~$(69DMK-fsW^ delta 335 zcmeyy+{rvarCzecHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|P@sfKQ0) z)^ls`zqwMnJayv1;w86p_dc2N_Vep$S0au+TlVhVn_ahOcPy=6bFHUzW$e|rd;kCc z|KY>CW#`&of4|py);4Ui>)(HW4n3c@Ve6WYA3vl_4_>x$Va*xc-@<=?o`17x!-M+& z|NpP{el?MSfk9#7N9B5km>B7|3=9mDJzX3_DsF|Gixz5D;Bg4#F<{hU5!mW~^S>VN zi!I;&6>|8vJY68NBE6~K&T{&n$2+&Vu)Z{4xgyk&{2`Ca<>Au3JKWhkByL@0cYhHu zXQ5BATJkAQtL$0Z_snJR)MPXLI9cNNaw+qw$6G228BVzJGK!yM-o~hJXeMP`C9%kM w!M$6rZ2q@SO*;Rtd8_!3(gRy#8yFc*zZ2Lx&Exna1_lNOPgg&ebxsLQ0Kf*O@&Et; diff --git a/sites/all/modules/imce/css/view-box.png b/sites/all/modules/imce/css/view-box.png new file mode 100644 index 0000000000000000000000000000000000000000..45086f6c6c9c3c9ec139790b6e2d48cc91106903 GIT binary patch literal 509 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L+;0|7oEt{l}{X4d`x^6ur= zPwzz=xBbd<vYL0-YToVF&%giw|LfQP|DV46s9Vh7H|GI+)s{~me}8!QhqGqOm*4*z z7Bei}Y0qA>_2=U5p1n`ox8D8#|36>dw(~bz{{R1A*|pt#?(M&MPW#sWnSJB`hfTGA zCq}qVKXPQ#|A0C7=QRGmdiMXS1MV9R28uQ9@SFSK|B9Z!1@85y{_k7y|J(onPaod@ z^XvW7`?ue}c>eSEw?Dr={Q3R$@q<_IpFMhf|K-;||G)qF|NsBL3)i13e3tfNU|?`4 z3Gxg6PZ?l1RK3xKfq`L-r;B5V#O2s?$HkfqL|iY53verhPQ2hUYXRetdq4m0H#)-E zZG2~P^+H*eT%%W018%S<-)a$kqxoXTbU(&8?#nSYePz>broTwYdRO-Bi_@!FHj){e zUZ0Y3H=AvF+(9>GXTVQUMeVqS3q0H|O9<6}-g8;rE-W<iefEyKZRKo>1dcaZIJYy; zGCbfU!YQ%X#{E7Y!}QmsorPTiUAsk>|G%>E!Qn}447>Oq1WSBjUbjO2^hDJJO$G)A N22WQ%mvv4FO#pK3E*Ag* literal 0 HcmV?d00001 diff --git a/sites/all/modules/imce/css/view-list.png b/sites/all/modules/imce/css/view-list.png new file mode 100644 index 0000000000000000000000000000000000000000..c761f64536aaa2afd542cc82f83233f0d3c9642b GIT binary patch literal 493 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L+;0|7oEu0omnEa%?-_v`zw zUq2^In%dnvv2ViU&hEaCA3r|4clZDQzx9nREo~i-A3bXC?3p=xZdFa)*Ds$Nn_K_? z|Ic2vg`;|lXyZ1{>Mc*6JP~c&ZrQb+uWsA7@83A8wum%tbDe%fpne-y%~tcdx4-}R ze(lPouOHw4`1+}(t!wJ^nfv$ddH(d-lZW@de*W<1@1GOLj$Jr&=E>v7yeT^$K79E2 z(SxsFzkdDpZSvHaZ(hH8|K`Q(XHVMNyZ-+B_wD1GzyJPDnL6{r_2*af^9vXl7#vE1 z{DS{e1{e-iZ**Z`V3_0S;us=vIriLfp(Y0b*NYS9s66)YV>>fLl==Vv@Gk*kL3f@; ze#s8ucPf43HaUKxG_%Uh724hmL94^L9(2t9ykm~jQ_m6(n~PoHDY53-rFRcK-fOzf zaUQ$)!+VEh-b$8f&el53$#RI*^=;gfN9|@#46~iun;uW?O3mBi>+oy6mu|%Inctp< v%+oaKW_V}c#`wqX2ZP+U-5b~qRxti~F29%gR1gaT0|SGntDnm{r-UW|v&JGj literal 0 HcmV?d00001 diff --git a/sites/all/modules/imce/css/warning.png b/sites/all/modules/imce/css/warning.png index 50910c9d05a070b26dbecddd7f67ab0705ff491e..6d2756033a1c138f87cacf2bb8422f323c4ec2b1 100644 GIT binary patch delta 419 zcmX@evWIzsay?_Sr;B5V#p$U*yS<$XMeHt$@UHzUxr>Weam&{GwuPnp&i!NO)pdHm zm3^;5a}MVsg-uu3jAyspuC12sc~i2F*_>xf$&Ux0YxJkes|s;SwFOOlc3QfGtD*nX zMU979ll`KeUtvF>t~KH4lf!bg1<EI5W+xWhIi@$^=%#Al_&4wCjTriFN3d?1vg*z0 zs_ahP(?Jc7+1}n~irmGUzhU3mwnU8sh0Wj68+De*^RGC*K66{{Y~z_dOfu#fA9{2q zv}S$pODSxZJ^nC8Z#lzpUMU-A?j@Bwt2(~Aev9djz5cYuZarA|!#}MFho{)gn10Xp z<@>L-^KH*Rc3QZA;W%%-l+6bv<A{VS{V98Q9%#&8Et#?XcGnMMlZpqfZrm+Cr=2<N zwKu)XEtF`JVQFOBbaRc<;i6_X{yirYyv1FkD(#L{b?u&bc&^{`<ws0>U1i!JQqy05 zIp@FW-I^j1*RF$;4i>CA+|9G;ip6C2;Mu9`&ik^RROrs%pjPkoUuLa~4d(>MZ_>Bx XRrO_W9}8w+U|{fc^>bP0l+XkK`@+Mw delta 553 zcmdnPe2`^=ay^4&iEBhjaDG}zd16s2gJVj5QmTSyZen_BP-<dIW#P$G8wLi($DS^Z zAr-fJg7<q%CrZ@q^DfGKFEqL0puD14(q>UFnHZ)f*AN%3yK|;wEhq_CKFeN7HtIHC z?nSQHS1;6VENoib-94LcQ9@L%sOqI_Gd|babw*UR@B2`2zTWoz=YKo;e~0KzZw}ux zCnBGd^<(FsHC-QHmhap&U7usVf%A;hTap@Ts`-mQNqqVwX?NNBap0F!E300gU+WzG z-d^KP`L%kR*iF5kOde;O=G<B<bz(`)BF3LCtK#4Of6MIX*Sk~tyo1`=Ez4c{`x9RM zoN{g79(l*=EX#_D9?8nL^`GuKsC_Xz_QBxRmDP1&?1G&xCMQ-Jy7%WZ&-}McnOC^e zP-AJr?QLw9rq5n{%u$#tum1Q%)H!9DtH1tdJM>ysz4*Jlk;AKQ*7cj!bL{w1XY4w$ zNr$&6>&!)G{p@w}j|w(7Z;^a`%#dyCfkjRW3yw;jG3{7>Gt&2c-SG_`+^=5O>oEED zTGUK%HM#IjQoT{VAU1q)gwCr&K`TpkwklNZ>-ao3Fem5HljHg-JTL#6<S5B>JSmit z+GQlv_c$Zw`iq6rP1l6pf41@d<yMub`-_C+E(^bw7WnGFqB-&ZO!jYT8#lEvZ{68) z>u-;4<o)WWvU#G>w?)l&1RrbPob_~O>2amsaX*f}%)fGq{YQo30fr4seT>@AtLHK> PFfe$!`njxgN@xNAq)Q9+ diff --git a/sites/all/modules/imce/css/x-resizer.png b/sites/all/modules/imce/css/x-resizer.png index 54ad5c80de2390ba6bb1bad762307bcfa4fe1cb6..e54941fffd927dcf4b7428787277b9bd2d19b6da 100644 GIT binary patch delta 72 zcmbQim^MMhN!QcGF@)oKvcQAT5SB-J3SsFCLZuFW<U6VzWfT?kn36c#{{R1f*ift8 ckBxz$D%0frFF)4v3=9kmp00i_>zopr0DO@cp8x;= delta 122 zcmYeB!8k#sM6$#+q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHbWU37V1A~>Pi(^Q| ztt62Lp&=;=2`5+{?bLBl66^48oH27|bL<DB2_LyS(vAN8|39CRZHB}IhHi!VLbf~% c90m;AvP4W77~{?}FfcH9y85}Sb4q9e0M?}|uK)l5 diff --git a/sites/all/modules/imce/css/y-resizer.png b/sites/all/modules/imce/css/y-resizer.png index 8e9740dce0398bace2762b3f2c867f535be6a2eb..3a32f6549b0234cb844ea337f268119ec2cc1223 100644 GIT binary patch delta 77 zcmbQsm_0$o-N@6$F@)oKvcQ8-5vE603Soc#|F>u65Ef!C>}vR7FHo+ic|e=(kq1Me fzQAf_5St-_-Q>K#3YRDY0|SGntDnm{r-UW|@%0!G delta 127 zcmd0v%Q!)$QnJJ~q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHbWU37V1B1P%i(^Q| ztt62Lp(05M2`3mI9er<qcQ^kMNtT~eK6Gtl=wwmIV@Z-z&`WM$*psB-d%7V)s^htl g0z;f(0|PTd<zrzp2GO)81_lNOPgg&ebxsLQ0IP5;p8x;= diff --git a/sites/all/modules/imce/imce.info b/sites/all/modules/imce/imce.info index c939de2d..9b64b168 100644 --- a/sites/all/modules/imce/imce.info +++ b/sites/all/modules/imce/imce.info @@ -1,17 +1,12 @@ -; $Id: imce.info,v 1.7 2010/03/17 21:36:38 ufku Exp $ +; $Id: imce.info,v 1.7.2.1 2010/12/27 20:10:34 ufku Exp $ name = "IMCE" description = "An image/file uploader and browser supporting personal directories and user quota." core = "7.x" package = "Media" -files[] = "imce.install" -files[] = "imce.module" -files[] = "inc/imce.admin.inc" -files[] = "inc/imce.page.inc" - -; Information added by drupal.org packaging script on 2010-10-09 -version = "7.x-1.0-beta1" +; Information added by drupal.org packaging script on 2010-12-27 +version = "7.x-1.1" core = "7.x" project = "imce" -datestamp = "1286606462" +datestamp = "1293481279" diff --git a/sites/all/modules/imce/inc/imce.admin.inc b/sites/all/modules/imce/inc/imce.admin.inc index 420ee396..3dd43782 100644 --- a/sites/all/modules/imce/inc/imce.admin.inc +++ b/sites/all/modules/imce/inc/imce.admin.inc @@ -1,5 +1,5 @@ <?php -// $Id: imce.admin.inc,v 1.7 2010/10/09 05:49:37 ufku Exp $ +// $Id: imce.admin.inc,v 1.7.2.1 2010/12/12 07:14:44 ufku Exp $ /** * @file @@ -114,9 +114,9 @@ function imce_admin_theme($variables) { $rows = array(array(t('Site maintenance account'))); $keys = array('name'); //add each stream wrapper as a column - $swrappers = file_get_stream_wrappers(); + $swrappers = file_get_stream_wrappers(STREAM_WRAPPERS_VISIBLE); foreach ($swrappers as $scheme => $info) { - $header[] = $info['name']; + $header[] = l($info['name'], 'imce/' . $scheme); $rows[0][] = $profile1['name']; $keys[] = $scheme . '_pid'; } @@ -140,7 +140,7 @@ function imce_admin_theme($variables) { $output = '<h2 class="title">' . t('Role-profile assignments') . '</h2>'; $output .= theme('table', array('header' => $header, 'rows' => $rows)); - $output .= '<div class="form-item"><div class="description">' . t('Assign profiles to user roles for available file systems. Your default file system is %name', array('%name' => $swrappers[variable_get('file_default_scheme', 'public')]['name'])) . ' ' . $weight_info . '</div></div>'; + $output .= '<div class="form-item"><div class="description">' . t('Assign profiles to user roles for available file systems. Your default file system is %name.', array('%name' => $swrappers[variable_get('file_default_scheme', 'public')]['name'])) . ' ' . $weight_info . '</div></div>'; $output .= drupal_render($form['common']); $output .= drupal_render_children($form); return $output; @@ -475,7 +475,7 @@ function imce_role_form($role, $weight = TRUE, $core = TRUE) { '#default_value' => $role['weight'], ); } - foreach (array_keys(file_get_stream_wrappers()) as $scheme) { + foreach (array_keys(file_get_stream_wrappers(STREAM_WRAPPERS_VISIBLE)) as $scheme) { $form[$scheme . '_pid'] = array( '#type' => 'select', '#options' => imce_profile_options(), @@ -645,7 +645,7 @@ function imce_sorted_roles() { $roles_profiles = variable_get('imce_roles_profiles', array()); $roles_profiles[DRUPAL_ANONYMOUS_RID]['weight'] = 12; $roles_profiles[DRUPAL_AUTHENTICATED_RID]['weight'] = 11; - $schemes = array_keys(file_get_stream_wrappers()); + $schemes = array_keys(file_get_stream_wrappers(STREAM_WRAPPERS_VISIBLE)); foreach ($roles as $rid => $name) { $sorted[$rid] = array( 'name' => $name, diff --git a/sites/all/modules/imce/inc/imce.page.inc b/sites/all/modules/imce/inc/imce.page.inc index d517ab99..072c0f0e 100644 --- a/sites/all/modules/imce/inc/imce.page.inc +++ b/sites/all/modules/imce/inc/imce.page.inc @@ -1,5 +1,5 @@ <?php -// $Id: imce.page.inc,v 1.10 2010/08/30 04:06:25 ufku Exp $ +// $Id: imce.page.inc,v 1.10.2.3 2010/12/27 20:09:02 ufku Exp $ /** * @file @@ -599,14 +599,14 @@ function imce_remove_file($filename, &$imce) { /** * Validate uploaded file. */ -function imce_validate_all(&$file, $imce) { +function imce_validate_all($file, $imce) { //validate image resolution only if filesize validation passes. //because user might have uploaded a very big image //and scaling it may exploit system memory. $errors = imce_validate_filesize($file, $imce['filesize']); //image resolution validation - if (empty($errors)) { + if (empty($errors) && preg_match('/\.(png|gif|jpe?g)$/i', $file->filename)) { $errors = array_merge($errors, file_validate_image_resolution($file, $imce['dimensions'])); } //directory quota validation diff --git a/sites/all/modules/imce/js/imce.js b/sites/all/modules/imce/js/imce.js index 9331291e..91552233 100644 --- a/sites/all/modules/imce/js/imce.js +++ b/sites/all/modules/imce/js/imce.js @@ -1,4 +1,4 @@ -// $Id: imce.js,v 1.26 2010/10/06 04:42:57 ufku Exp $ +// $Id: imce.js,v 1.26.2.2 2010/12/12 07:15:56 ufku Exp $ (function($) { //Global container. @@ -23,8 +23,6 @@ initiate: function() { imce.invoke('load', window);//run functions set by external applications. }, -/**************** DIRECTORIES ********************/ - //process navigation tree initiateTree: function() { $('#navigation-tree li').each(function(i) { @@ -108,8 +106,6 @@ dirSubdirs: function(dir, subdirs) { } }, -/**************** FILES ********************/ - //process file list initiateList: function(cached) { var L = imce.hooks.list, dir = imce.conf.dir, token = {'%dir': dir == '.' ? $(imce.tree['.'].a).text() : imce.decode(dir)} @@ -225,8 +221,6 @@ fileToggleSelect: function (fid) { imce['file'+ (imce.selected[fid] ? 'De' : '') +'Select'](fid); }, -/**************** OPERATIONS ********************/ - //process file operation form and create operation tabs. initiateOps: function() { imce.setHtmlOps(); @@ -268,7 +262,7 @@ setFileOps: function () { var Op = {name: $sbmt.attr('id').substr(5)}; var func = function() {imce.fopSubmit(Op.name); return false;}; $sbmt.click(func); - Op.title = $(this).children('legend').remove().text(); + Op.title = $(this).children('legend').remove().text() || $sbmt.val(); Op.name == 'delete' ? (Op.func = func) : (Op.content = this.childNodes); imce.opAdd(Op); }).remove(); @@ -374,8 +368,6 @@ opShrink: function(name, effect) { imce.vars.op = null; }, -/**************** AJAX OPERATIONS ********************/ - //navigate to dir navigate: function(dir) { if (imce.vars.navbusy || (dir == imce.conf.dir && !confirm(Drupal.t('Do you want to refresh the current directory?')))) return; @@ -431,7 +423,6 @@ navCache: function (dir, newdir) { imce.invoke('cache', C, newdir); }, -/**************** UPLOAD ********************/ //validate upload form uploadValidate: function (data, form, options) { var path = data[0].value; @@ -453,7 +444,6 @@ uploadSettings: function () { return {beforeSubmit: imce.uploadValidate, success: function (response) {imce.processResponse($.parseJSON(response));}, complete: function () {imce.fopLoading('upload', false);}, resetForm: true}; }, -/**************** FILE OPS ********************/ //validate default ops(delete, thumb, resize) fopValidate: function(fop) { if (!imce.validateSelCount(1, imce.conf.filenum)) return false; @@ -513,15 +503,13 @@ fopLoading: function(fop, state) { } }, -/**************** PREVIEW & SEND TO ********************/ - //preview a file. setPreview: function (fid) { var row, html = ''; imce.vars.prvfid = fid; if (fid && (row = imce.fids[fid])) { var width = row.cells[2].innerHTML * 1; - html = imce.vars.previewImages && width ? imce.imgHtml(fid, width, row.cells[3].innerHTML) : imce.decode(fid); + html = imce.vars.previewImages && width ? imce.imgHtml(fid, width, row.cells[3].innerHTML) : imce.decodePlain(fid); html = '<a href="#" onclick="imce.send(\''+ fid +'\'); return false;" title="'+ (imce.vars.prvtitle||'') +'">'+ html +'</a>'; } imce.el('file-preview').innerHTML = html; @@ -543,8 +531,6 @@ setSendTo: function (title, func) { return imce.opAdd({name: 'sendto', title: title, func: opFunc}); }, -/**************** LOG MESSAGES ********************/ - //move initial page messages into log prepareMsgs: function () { var msgs; @@ -575,7 +561,6 @@ setMessage: function (msg, type) { return false; }, -/**************** OTHER HELPER FUNCTIONS ********************/ //invoke hooks invoke: function (hook) { var i, args, func, funcs; @@ -590,6 +575,7 @@ processResponse: function (response) { if (response.data) imce.resData(response.data); if (response.messages) imce.resMsgs(response.messages); }, + //process response data resData: function (data) { var i, added, removed; @@ -611,6 +597,7 @@ resData: function (data) { imce.conf.dirsize = data.dirsize; imce.updateStat(); }, + //set response messages resMsgs: function (msgs) { for (var type in msgs) for (var i in msgs[type]) { @@ -620,12 +607,14 @@ resMsgs: function (msgs) { //return img markup imgHtml: function (fid, width, height) { - return '<img src="'+ imce.getURL(fid) +'" width="'+ width +'" height="'+ height +'" alt="'+ imce.decode(fid) +'">'; + return '<img src="'+ imce.getURL(fid) +'" width="'+ width +'" height="'+ height +'" alt="'+ imce.decodePlain(fid) +'">'; }, + //check if the file is an image isImage: function (fid) { return imce.fids[fid].cells[2].innerHTML * 1; }, + //find the first non-image in the selection getNonImage: function (selected) { for (var fid in selected) { @@ -633,11 +622,13 @@ getNonImage: function (selected) { } return false; }, + //validate current selection for images validateImage: function () { var nonImg = imce.getNonImage(imce.selected); return nonImg ? imce.setMessage(Drupal.t('%filename is not an image.', {'%filename': imce.decode(nonImg)}), 'error') : true; }, + //validate number of selected files validateSelCount: function (Min, Max) { if (Min && imce.selcount < Min) { @@ -654,6 +645,7 @@ updateStat: function () { imce.el('file-count').innerHTML = imce.findex.length; imce.el('dir-size').innerHTML = imce.conf.dirsize; }, + //serialize selected files. return fids with a colon between them serialNames: function () { var str = ''; @@ -662,37 +654,44 @@ serialNames: function () { } return str.substr(1); }, + //get file url. re-encode & and # for mod rewrite getURL: function (fid) { var path = (imce.conf.dir == '.' ? '' : imce.conf.dir +'/') + fid; return imce.conf.furl + (imce.conf.modfix ? path.replace(/%(23|26)/g, '%25$1') : path); }, + //el. by id el: function (id) { return document.getElementById(id); }, + //find the latest selected fid lastFid: function () { if (imce.vars.lastfid) return imce.vars.lastfid; for (var fid in imce.selected); return fid; }, + //create ajax url ajaxURL: function (op, dir) { return imce.conf.url + (imce.conf.clean ? '?' :'&') +'jsop='+ op +'&dir='+ (dir||imce.conf.dir); }, + //fast class check hasC: function (el, name) { return el.className && (' '+ el.className +' ').indexOf(' '+ name +' ') != -1; }, + //highlight a single file highlight: function (fid) { if (imce.vars.prvfid) imce.fileClick(imce.vars.prvfid); imce.fileClick(fid); }, + //process a row processRow: function (row) { - row.cells[0].innerHTML = '<span>' + imce.decode(row.id) + '</span>'; + row.cells[0].innerHTML = '<span>' + imce.decodePlain(row.id) + '</span>'; row.onmousedown = function(e) { var e = e||window.event; imce.fileClick(this, e.ctrlKey, e.shiftKey); @@ -703,24 +702,34 @@ processRow: function (row) { return false; }; }, + //decode urls. uses unescape. can be overridden to use decodeURIComponent decode: function (str) { return unescape(str); }, + +//decode and convert to plain text +decodePlain: function (str) { + return Drupal.checkPlain(imce.decode(str)); +}, + //global ajax error function ajaxError: function (e, response, settings, thrown) { imce.setMessage(Drupal.ajaxError(response, settings.url).replace(/\n/g, '<br />'), 'error'); }, + //convert button elements to standard input buttons convertButtons: function(form) { $('button:submit', form).each(function(){ $(this).replaceWith('<input type="submit" value="'+ $(this).text() +'" name="'+ this.name +'" class="form-submit" id="'+ this.id +'" />'); }); }, + //create element newEl: function(name) { return document.createElement(name); }, + //scroll syncronization for section headers syncScroll: function(scrlEl, fixEl, bottom) { var $fixEl = $(fixEl); @@ -737,6 +746,7 @@ syncScroll: function(scrlEl, fixEl, bottom) { }); }); }, + //get UI ready. provide backward compatibility. updateUI: function() { //file urls. @@ -789,6 +799,7 @@ updateUI: function() { //scrolling directory tree imce.syncScroll(imce.NW, '#navigation-header'); } + }; //initiate diff --git a/sites/all/modules/imce/js/imce_set_app.js b/sites/all/modules/imce/js/imce_set_app.js index 7dfea4c3..667294c1 100644 --- a/sites/all/modules/imce/js/imce_set_app.js +++ b/sites/all/modules/imce/js/imce_set_app.js @@ -1,4 +1,4 @@ -// $Id: imce_set_app.js,v 1.8 2010/08/29 03:46:54 ufku Exp $ +// $Id: imce_set_app.js,v 1.8.2.1 2010/12/12 07:14:44 ufku Exp $ /* * IMCE Integration by URL * Ex-1: http://example.com/imce?app=XEditor|url@urlFieldId|width@widthFieldId|height@heightFieldId @@ -6,7 +6,7 @@ * of the selected file in the parent window * Ex-2: http://example.com/imce?app=XEditor|sendto@functionName * "Insert file" operation calls parent window's functionName(file, imceWindow) - * Ex-3: http://example.com/imce?app=nomatter|imceload@functionName + * Ex-3: http://example.com/imce?app=XEditor|imceload@functionName * Parent window's functionName(imceWindow) is called as soon as IMCE UI is ready. Send to operation * needs to be set manually. See imce.setSendTo() method in imce.js */ @@ -15,61 +15,70 @@ var appFields = {}, appWindow = (top.appiFrm||window).opener || parent; -//execute when imce loads. +// Execute when imce loads. imce.hooks.load.push(function(win) { - var data = decodeURIComponent(location.href.substr(location.href.lastIndexOf('app=')+4)).split('|'); - var func, appName = data.shift(); - //extract fields - for (var i in data) { - var arr = data[i].split('@'); - arr.length > 1 && (appFields[arr[0]] = arr[1]); + var index = location.href.lastIndexOf('app='); + if (index == -1) return; + var data = decodeURIComponent(location.href.substr(index + 4)).split('|'); + var arr, prop, str, func, appName = data.shift(); + // Extract fields + for (var i = 0, len = data.length; i < len; i++) { + str = data[i]; + if (!str.length) continue; + if (str.indexOf('&') != -1) str = str.split('&')[0]; + arr = str.split('@'); + if (arr.length > 1) { + prop = arr.shift(); + appFields[prop] = arr.join('@'); + } } - //run custom onload function if available - if (appFields['imceload'] && (func = isFunc(appFields['imceload']))) { + // Run custom onload function if available + if (appFields.imceload && (func = isFunc(appFields.imceload))) { func(win); - delete appFields['imceload']; + delete appFields.imceload; } - //set custom sendto function. appFinish is the default. - var sendtoFunc = appFields['url'] ? appFinish : false; + // Set custom sendto function. appFinish is the default. + var sendtoFunc = appFields.url ? appFinish : false; //check sendto@funcName syntax in URL - if (appFields['sendto'] && (func = isFunc(appFields['sendto']))) { + if (appFields.sendto && (func = isFunc(appFields.sendto))) { sendtoFunc = func; - delete appFields['sendto']; + delete appFields.sendto; } - //check windowname+ImceFinish. old method + // Check old method windowname+ImceFinish. else if (win.name && (func = isFunc(win.name +'ImceFinish'))) { sendtoFunc = func; } - //highlight file - if (appFields['url']) { - if (appFields['url'].indexOf(',') > -1) {//support multiple url fields url@field1,field2.. - var arr = appFields['url'].split(','); + // Highlight file + if (appFields.url) { + // Support multiple url fields url@field1,field2.. + if (appFields.url.indexOf(',') > -1) { + var arr = appFields.url.split(','); for (var i in arr) { if ($('#'+ arr[i], appWindow.document).size()) { - appFields['url'] = arr[i]; + appFields.url = arr[i]; break; } } } - var filename = $('#'+ appFields['url'], appWindow.document).val(); + var filename = $('#'+ appFields.url, appWindow.document).val() || ''; imce.highlight(filename.substr(filename.lastIndexOf('/')+1)); } - //set send to + // Set send to sendtoFunc && imce.setSendTo(Drupal.t('Insert file'), sendtoFunc); }); -//sendTo function +// Default sendTo function var appFinish = function(file, win) { var $doc = $(appWindow.document); for (var i in appFields) { $doc.find('#'+ appFields[i]).val(file[i]); } - if (appFields['url']) { + if (appFields.url) { try{ - $doc.find('#'+ appFields['url']).blur().change().focus(); + $doc.find('#'+ appFields.url).blur().change().focus(); }catch(e){ try{ - $doc.find('#'+ appFields['url']).trigger('onblur').trigger('onchange').trigger('onfocus');//inline events for IE + $doc.find('#'+ appFields.url).trigger('onblur').trigger('onchange').trigger('onfocus');//inline events for IE }catch(e){} } } @@ -77,7 +86,8 @@ var appFinish = function(file, win) { win.close(); }; -//checks if a string is a function name in the given scope. returns function reference. supports x.y.z notation. +// Checks if a string is a function name in the given scope. +// Returns function reference. Supports x.y.z notation. var isFunc = function(str, scope) { var obj = scope || appWindow; var parts = str.split('.'), len = parts.length; -- GitLab