From a6a2df97ef8b79db06a335c9e9ed30032849a4a3 Mon Sep 17 00:00:00 2001 From: aFolletete Date: Mon, 12 Sep 2011 15:25:21 +0000 Subject: [PATCH] // revert --- modules/authorizeaim/authorizeaim.tpl | 2 +- modules/bankwire/bankwire.jpg | Bin 2697 -> 9087 bytes modules/bankwire/payment.tpl | 4 +-- modules/blockbestsellers/blockbestsellers.php | 2 +- modules/blockbestsellers/blockbestsellers.tpl | 25 +++++++----------- modules/blockcart/ajax-cart.js | 21 --------------- modules/blockcart/blockcart.php | 9 ++----- modules/blockmyaccount/blockmyaccount.php | 11 -------- modules/cheque/cheque.jpg | Bin 2636 -> 1837 bytes modules/cheque/payment.tpl | 4 +-- 10 files changed, 18 insertions(+), 60 deletions(-) diff --git a/modules/authorizeaim/authorizeaim.tpl b/modules/authorizeaim/authorizeaim.tpl index 3a58d2eb4..41009157c 100755 --- a/modules/authorizeaim/authorizeaim.tpl +++ b/modules/authorizeaim/authorizeaim.tpl @@ -31,7 +31,7 @@ {/if}
- + {if $cards.visa == 1} {l s='visa logo' mod='authorizeaim'} diff --git a/modules/bankwire/bankwire.jpg b/modules/bankwire/bankwire.jpg index 03ee6508380b9d1235704362bb162c5ca5d9addf..8d11f391a411dcbd4ef3a7603c6ceeb361f6cf54 100644 GIT binary patch literal 9087 zcmeI1cTg0|_Q!i>HZQO&EIBPXgCIHQtVBUfgk^yhc7Y{h02J{GJdq%xpddyJm_bod zK!S>*n8g5cQBm}+0VMC6)nBRgs^0s(-~IPTZ`ICcPM@CX@9CbZQ>Xcl`2#@I%gxgb zKrjTt(I4Qyl4pB5JBRrN__}%exB>_QKz^kUi<1D00>I{^a0A?(=u1PF(ebwd42S>+ zi~xvWBquHkbPED#^K^BlC!Jx}^ViY?{!0jmi zk(SCt8SzFrKaIsqNBJ(wYVoOT7RqBN)7Z?2WB@Qkfjx!Eh(%c+Wg%`*fHTUL01$*? zzO#_4fFr*%&0oMN%nWp%05~TkW^!3Eu_<&dhBn>E($a$N!Ay^5rljcmMKIzbxKVWH z1a@KsClmaTEEojD1fiv)F*Y-@G&9pTHbA5Qv;D`;pI-kN1WWtFd*E-= z`fVP10nBJ7m&rk26^w2&7AFQ>ZB7&`g_XdevpD~5h5zQT-{t_ok4=r5#P`nuT9^S4 z?WF}m7Dg%j1gS0fCMOj24sLDPz72*9~c93U=19AEARroAP9tlRe%9v0UK~ZI#>&G zK|Ux1+rW0P3)F!9pdK`U)1V1l0)KAQea*(ttE0UC2FT02xIlF*uAkhK|w4SYtdeOE3&f5@tQ7 z2(t@w7}JQkhPj6s#PBe4SYfO@Ru^l9^~5g4#$eO2`Pd5VLF_qf2lfGW7(0%`;UsaI zICGo_E)=&Kw+2^)+l@PcyNbJu8^Vp@@pu`$F5VXJi;uvk;Pdf2@yGC2@O}7U`~-na zP$C!;+z87E9Kr@d1>p#xh0sTMLzpIt64i-TL|cDzsJTkkD13 zCqiF@g@rYQ9fX$&rwDHqt`}|>ejz*|A}(Se;wcg(k}Xmt(kRj=@{vNMs8bv%t0-BN z3d$KuFJ)AeD5@dqEE*xYUbIT|g6JdBF{(J#i0VsaQ;VoasMo1)#qeSpVytLR zS)#H*<%G&}Rg$WOYP4#(YMUxgO-XH$+FG@vYERXP>K5v;>O0iC)W2zHYJ_NP)@agr zt0}GNshOpDRP&jZu$H}6l2)D8eQlh!g?60wZtXidu#TxttWK3quP&@>rpwaZt$SAw zt7oal(W}#Yq%WlJsGp{PRDaMw(!j@HgF%zQM?*EkWrih&U50ZDOc%s2*uS9PNX*E~ zXoFF+(Pv{FV}@~+@%@Fu3*8oGFFe2SlZmbg(`1jyV^eX{MW&lg+e~N8%+0uF4Q3 zHo|tV?SLKKF5IrxZoppIKEl4v{*{BOLzKfohc}Mej;kGyIev6n;KX%0=k(3l%6Xmh zRTsp?-KD_gwyT)y64za>FWgkzV%(0p@!U<_*SKHxz|0@62 z0Y(991G)mm1H%H31daze1r-PNFVR|(x}+_b61*a~KKNUROGs(Rz*57d>z3XOl?`Qu zo?nJv7QF1>va#i^%eOBdUSYZ-f5pR@Rllwv8^0ej8&OQx-E4Yad$?JIZoq?P7ge z?XkLM^|v_RxI=OL_>lM$Yyvx+eSss!iQ`;LP)x{3xSOb(n4dV1WRnPpVexrqsbSyR@pbiS*#~Ga1wjPDW3rPUe=(H(7332i9QLFxIrKRbHFB zc5t2Jy1nb6^^xn_vQ@M5vWIira}MW{a^rGuZCJ3Obi>z;Asd_X6!LQNhBmoxI+`z% z&&_|d*?M!$ADBN_f85@(aLdjua|KZaHwqUNRus+@F^X>d!{{HC|KM+p-g>*(ta#5h z+&0d(hb8tUhfArYS*1f|i^>|y>E#9GU$=*Czg}TdQL}@zBX!3>rBCJgooYL`?VQ;a zyX!%fQ`L!T`RXmz-*!js?%U(Ar=donrm$wJmR0+BulwG{I*q!DeYkyT`(E!4-rse= z;z0dD*@J}#XAf}>4IBaE9(bS_O$5tG>bKK?l`3C)ly(c736rKbp zQ%}A-6@KdBY46i*XDrS%oK-(teNOybK_k?d*~n{(Z5lWqdj9SOuM2I>*3IWG8eBYd zN%>OMWr@qhEu@yb7XFp2D`Qs^ua36Hv<|g}we`0zZNGob|Jv;i?~d+Hx6bx1$F3{g zw%wPmTV20!!{SEMO|zSgJ*GY9ZkgUXciZfCW3PGd`8$?(n(x}&ZRxY`YrW@kuk*g= z{hJRKKe+pF$-~EwRy-Pb9QF9^llUi}o~AvW?$3FKeOB;X^m)Y#`4@FBwO^hXFdMi$ z=rY*zD)3eR5M${5pUHpD4ClQTeqHfK=}rAx{RLInu>GT== zOy#WhZ1bG=+%rC#&!5i)=5vAhTwp#In9l{~bAkC>U_KX^uM5oA1?KAl^L2swy1;y0 zV7@N!|F&fv5ncLI@S&_k%ou!(ee(3=W6I;qf>EiAp9Bi6jY%s1Q{~ zQdU-4Qd&w*NlRHyL0wTwTE$RRU0X*_Ur$ci$Yg=8iI%ROE`*l9NkkHjOs46|OUuja z{$Csa8iXEeL0I%i0c}6h74#lP(23y*L=ssPzz~AK7zB&OpywOVIdRhwG1= zK6Cb5W7GKy&28=1Iy$?$uixmqcmKh|M~|O89eg$P=kV({Z%5vJ`uyeV*!Z`J$tegR zKji#W^qU?u{1A-6AQ-$r4+N(R#8NR>Wh0!Jqdz_(NnFJ^mq2qW*?X#$sJbwKClSfL zOOjMG8C3rykn~;AeeJ!GU+iDE9n2YF#_RXJ+KqtolbZQth~HckfRC}C!-u#UXmyxd5j^kjUdtSFl@ z?LAq%3>0NJ57sY<7<@^PU_RTww11!oDfv7lnk@@1^8sn7Rq3n7L;@dR6SF^=K(rSS zPe|{mdESh^oVml(cu+HwmZNG%m`LxP2~-pxIx*w@VS*33Vxg|9HI!WX#PYVB+%i58 zd%qq(`^AB*lryK){qEF6U|YkjI|jQso&sN_BRlR2aU$7qf_?CLY!3p z!JY&%&z!Sm@3rSa4&-rfc1KIE$k6>!857{nV$*Vmnl{O2i`C+CY~;ot@f$x%v(i{bPzY?}N&S16TeuH8wwO$<-EGqANBGRj|h>QJ|TMyq9at717+rn!0F@^j4vx@nbm18S~1wpNCm zmyQmy{=)7(igC*`*Nwk1fvojz<#;g?HEW!|)>3e@=dS!&!3rCfE#w22UI)d(0dfh8 zSKMlB;^sJ87QKKVJ=^x>7GSs9l_aQ@x+fXDwqUnDP8}u81%X9&CDtx~B`q)#4T()r zI8_bp*>@bU-OLWv>=X2w}FJDTRCRr)Q$BSomqaE($Fpyt5fk-A1tm~jMI}I9j?VK zAK|sic=T-Y=1lfy_TK;V4uso{5%<)QN%v^2O0JN>+aULN9Uvp-U)O0YEN^B;kH^V= zD;&cIbpbh6$0&{tIDBm_oFij=vD1Z{$(|jJ&Qbo%NgMjGc4{&*M^688ze%)pU%}CQ zML+9eo9XPa!?5Pr7ERrH<1f{j%T2rO6)L7_!q z|4;;*!4N1~SWN=9<9UuW;Sh5~vO>xw$|x}Rg{B+aH!^AK&cgq44iD_~U>WSa2>Hj0P-$HJjEcf-Awv)zwMK#`+V}L%o1% zD{D8*Ns2H5Wh7FaCCB5si;_+(!~P!$sBt{vxfR$M*RbP8oHejdlxthf2V(ia!%yd# z7PI{umP1nn|HjoSS_5NFNTeG67qk;(3FQCK)LM6aHX6#=Zh-%J-vn*SRa$@Vxm0vA z{Va<`^S)oxN2ok6)1som`0Br@0sa&cxlB^Yvz$3-`On1g1zMr{P%QCf!EBY(PhN6s zg(upc$k$*wT_&lVg~&-l=Ev48=A|q{CAv5sDhJ2%uD0&bOi>HD;+tn48-Y(KYRcDr_l+)4MD)rUgBMeLu6LaL`VxH1`x0g=YsE zhUTXPNhC1EKKR@vG26=vdje=Rby2?E*AZk(7xNESzHzfT?~7v`L{ zyw#a|rr8ZN3460dfF_b}kegPY5tkzG57;rqF+*wp$_>0^tI}euVq24pdEMDmr_DO%Z#xJRg~quac}oT)-=_uCPZ%fv zl=$Y0qa&T(j8{gSs1}TPIZb@^dF1Bgi8rgA@!-XB&c?mL_Qiy6TT-0{8|TJP7G7MC zbp%yqHCzb$JXdHBPBk5XMIpLr(7TK*C|Cf z&$``dIulq%i?Qv9R{>xGdrD)(_Le9pkHqVd;2q&(>-d2vmOR;boHsjAPSNOyD<;if z3kcdMI-n}s(8Zfl;a`C+k2Swciq#wQx@Ck><5Y%&?zE%Du}` zP1MmoHKD3)&d!Enxx*H2yXl2{j9z)ckzuNriM(FbvVivdBeN4%*NWP$!eZ2P>6m1U zoXF#H6EjSJMLnjmm6p;INN*!+>#wD+xsiO5=@kiE_fAJyUFd?RF>Ypk?bRf=myVs_ zPRKh(%$tht#O7UcU)^fq$O*A+1hW&PeEUW(kQSOfPy4i3g|NESDwBg0>nR!Ui(~cn zWK#=RcOss4zG(JI)iR^lES>!9UQn}Kf0S|mHHj@3qNA$_$%qWnhoed}*2 z-HI#uM7Bu!H9y?K+S6=iC?49QIcZSWU0C^*{mhwM8$g$87#S1I>)2^{@5%v)lpHQ) zV=VAaY!O$Ytn_V^%vsBmL1qfd$5q!)vpkpb#&6lMOIU96PX>%omXQN7l{b{_uy&^V z#Bp3pqsbl{cbuDDZ8|56a;dz$<_xtSe;_sO0sIZDSuglA>bU>wUBw80r{*)a3Tzpf zp=(F!Cc&c%Hdd@O9+fs?rt&oZc1q6H{+Hv`I<*zoJu2o;Q80%FX)L4b3ifPvq-jOW z3qt%}0falotPk?LzBTuMdj_5m)+qV5#8|19}z!I0{`fQf|YmQj~R(>K~n(#}~`c@Ct={cNIe-W8xX z`(J)a$%Cjr2&ubUFvALL{SvIBi)}e!<{j%77BD zmV40R)osgtbI8xGlxmewHx&j27N>K6OuSiFeE2@CUD|6Nxp?W&i{a27y%BeU2F~kX zp9b}`>23ul>*NrlE_7L0&X4a=nD`f{`TvV4?{LhVhnVT8n&AUqrrhs5H&wwR(>8rV zGKx_#UtUjsxSqrzQ(EI-^pc^!@sy2Y%x;#Q`EO - {l s='Pay by bank wire' mod='bankwire'} - {l s='Pay by bank wire (order process will be longer)' mod='bankwire'} + {l s='Pay by bank wire' mod='bankwire'} + {l s='Pay by bank wire (order process will be longer)' mod='bankwire'}

\ No newline at end of file diff --git a/modules/blockbestsellers/blockbestsellers.php b/modules/blockbestsellers/blockbestsellers.php index 52eaa4211..979ac15bd 100644 --- a/modules/blockbestsellers/blockbestsellers.php +++ b/modules/blockbestsellers/blockbestsellers.php @@ -114,7 +114,7 @@ class BlockBestSellers extends Module $this->context->smarty->assign(array( 'best_sellers' => $best_sellers, - 'smallSize' => Image::getSize('small'), + 'mediumSize' => Image::getSize('medium'), )); return $this->display(__FILE__, 'blockbestsellers.tpl'); } diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl index b10369218..eb89140b5 100644 --- a/modules/blockbestsellers/blockbestsellers.tpl +++ b/modules/blockbestsellers/blockbestsellers.tpl @@ -19,31 +19,26 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 6594 $ +* @version Release: $Revision: 7077 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *}
-

{l s='Top sellers' mod='blockbestsellers'}

+

{l s='Top sellers' mod='blockbestsellers'}

{if $best_sellers|@count > 0} -

»{l s='All best sellers' mod='blockbestsellers'}

+
+ {foreach from=$best_sellers item=product name=myLoop} +
{$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}
+ {/foreach} +
+

{l s='All best sellers' mod='blockbestsellers'}

{else}

{l s='No best sellers at this time' mod='blockbestsellers'}

{/if} diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index d86d5d248..09fc09a00 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -626,26 +626,5 @@ $(document).ready(function(){ }); ajaxCart.overrideButtonsInThePage(); ajaxCart.refresh(); - - /* roll over cart */ - $("#shopping_cart").mouseover(function(){ - $("#cart_block").slideDown(450).addClass("cart_block_hover"); - }); - - $("#cart_block").mouseleave(function(){ - $("#cart_block").removeClass("cart_block_hover"); - if(!$("#cart_block").hasClass("cart_block_hover")) - $("#cart_block").slideUp(450); - }); - $("#header_logo").mouseover(function(){ - $("#cart_block").removeClass("cart_block_hover"); - if(!$("#cart_block").hasClass("cart_block_hover")) - $("#cart_block").slideUp(450); - }); - $("#messWelcome").mouseover(function(){ - $("#cart_block").removeClass("cart_block_hover"); - if(!$("#cart_block").hasClass("cart_block_hover")) - $("#cart_block").slideUp(450); - }); }); diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php index ba5db04cc..324bc0658 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -83,8 +83,8 @@ class BlockCart extends Module $smarty->assign(array( 'products' => $products, 'customizedDatas' => Product::getAllCustomizedDatas((int)($params['cart']->id)), - 'CUSTOMIZE_FILE' => Product::CUSTOMIZE_FILE, - 'CUSTOMIZE_TEXTFIELD' => Product::CUSTOMIZE_TEXTFIELD, + 'CUSTOMIZE_FILE' => _CUSTOMIZE_FILE_, + 'CUSTOMIZE_TEXTFIELD' => _CUSTOMIZE_TEXTFIELD_, 'discounts' => $params['cart']->getDiscounts(false, Tools::isSubmit('id_product')), 'nb_total_products' => (int)($nbTotalProducts), 'shipping_cost' => Tools::displayPrice($params['cart']->getOrderTotal($useTax, Cart::ONLY_SHIPPING), $currency), @@ -187,10 +187,5 @@ class BlockCart extends Module if ((int)(Configuration::get('PS_BLOCK_CART_AJAX'))) $this->context->controller->addJS(($this->_path).'ajax-cart.js'); } - - public function hookTop($params) - { - return $this->hookRightColumn($params); - } } diff --git a/modules/blockmyaccount/blockmyaccount.php b/modules/blockmyaccount/blockmyaccount.php index b19c5acb5..56a43a0c8 100644 --- a/modules/blockmyaccount/blockmyaccount.php +++ b/modules/blockmyaccount/blockmyaccount.php @@ -86,17 +86,6 @@ class BlockMyAccount extends Module { $this->context->controller->addCSS(($this->_path).'blockmyaccount.css', 'all'); } - public function hookFooter($params) - { - global $smarty; - - $smarty->assign(array( - 'voucherAllowed' => (int)(Configuration::get('PS_VOUCHERS')), - 'returnAllowed' => (int)(Configuration::get('PS_ORDER_RETURN')), - 'HOOK_BLOCK_MY_ACCOUNT' => Module::hookExec('myAccountBlock') - )); - return $this->display(__FILE__, $this->name.'.tpl'); - } } diff --git a/modules/cheque/cheque.jpg b/modules/cheque/cheque.jpg index 71195385f4cd662c8f04376d3c474aebaad9a691..555f1f31ce42e6230e1630099abd9693ea8fb680 100644 GIT binary patch literal 1837 zcmaiuc{J2}8^C|FF^0hmGs=<}vQ%WblVy6F8QJP)r<)LY=b~nY$u1=kjqJu$vSbTc zx@HE~l0BqIC}T<1>~6}X%dNTNp7-4Mynnr)@A*FGInVMrkAN?j0;Eq{SX%%f5D2gm zK0q)Im;q489>NHPL4{uw1{DUlh={0&2pj?b8w4DI5Jw>3NTj4B5{ceJ_8;~nAQ%h= z7llh95K?F<2`MxdBLs{6XXgJVf>r9sz+NPymJ!L96JA%8(e*s`_Mm2d}I7)v~y>HaJG@2mCFL zfth1qI;(*DNobG<0TAGS{6Yf&g^37z>cTs~ASf6tto#QM7zKd}-7+Lqds#0sBU&&9 zNC?-3WfX7{(EH};p%|DFN(uWiekZTR1;0QzETKj#Qzbh!1*~l+_;#lo@B1zhdpG&b zT53VK&&f=O<+i$6DqqRq5M+lg(S5-0aYNy}5wD0wP6+J$Jna#0wSDRCw*wcQyR7%u zm+~4E7;gfTXK9HQoHI?$$kEE2ig%N7gF2k-b}HNNxP$X$7CAb{L$70(3Gs4?bi0p?(cECQ)j%<9XKI+e zZ(nQ8V1LeRJPlMQU#)9*K4?PyRZAaT!r!dQ1(Cu@>+`_OvlJUnP@>m2Hwp$FhL0;d zxI`xEKU?`^1nGQBK#SY*XU2zunp8ev@A{NmTyxW$Ab!fFEr@qaPJ3@g0)G)MPH)=bsL?IXe#Xy{_??aOQy`T)JiO)%kt1NvF14ed!_CmqQfvQk}1A zXj||=#AKJ9FG!91GusTC=yMR#S_5}WL{?cUM#n&v1f_llS zd2Bbz`%D(QHjR6Wbbvm<84HW(^EhT~tU-UNYvafDU&)Z{iZff6n{ddbfx6j7Wuy~c zv*XVE2gp~|GdMe5Cw@j%oTQVX1(aDYH)TUJez_Gk7rk6wgrl;tD~%i$m!TE^%>0O& zbVx3dwR+Oz-zvIbW&S{ZONGPNOm9(0>Wq^u^D!5edor|UQ8DK&&L>ze$Aw47Od8px5IyIo zHk3B0zS#|f<#)&qnf`Wj3NXtJ2&SiyGwRPzcjg^e>e!$W|H%HcY$hpOe{d*GUCT{@ zW<(e+DEtgraZy+8ze9b|9;AhW;{`bmZwSteqm`R9C7t@OU^SG3CzQu+yKw6sDm*2@(Yd2 zZM}X*4e-i^ex=`Ia1VBTcJTsWyV#8tJm3cQFTzQ&ny4?9jF!~pTLK{i| literal 2636 zcmcgtdoZvc;;1+QD$|IGKQ`k<2{X{hCvc_G9h#rpV@BLk$?`QA*{qD8C>nrJ# z3A_4>vf{Bo%86-=?M!*mRNdx^2C^U?efiQ^Qb01s^03Z=C4voVj(H{;# z2qY{+M7jOYna;YdqKd|B(7C3V-+f$vCo@f{tI9Q8Y-;rtN7tzGp>kL()x`RkkMRZP zP(H=QmPGvBlOL{^^aDIB4TlI50S&D1y}mg5V~n5EO`DKWb7Q*%MI)SUGE>pPOwKlp z=pwW6$fFgBO7YlD!n*oDO! zy~D>};nK|`Q&%$A27{OB5}uhDv7LTHMk74^NUN2+k|SxqEDZ0?DO^11dhTHFR4a-W$elD_OL-;U z`-=~BaH@Tz-qF1_Y=*qqBxYw=O$EQ;YOG$K6@_ZRA`+vH{z;o!Se@u`MnA#afajw<`Qj^SpFWV+DScJBxUQtzcYoc1PDo`=oeiUi{*0dAvx}C$EEe)nU-2!5^A5K=P9hlDG_-V-Q>cmX*w3Iju z>tSOGN!dcfpXKZkb*@X+)1MYbO`7wL9zdURwU{m{FVEK(sV+19MavcC&#&U6d!g<#E835XGGDhK z_}zGe?vwi*M_gN5gDpJ2EzG1RGK_Vanl80ECont?(1#e@#U0bk08*BI0}}qfTF7*- zf-IYEc8^xS?y+aigNHJIU|NyB#=bZf&*!DFGzu*cn-!B;E7e7hN&*+y@TPw%;y>GY zbvF-2Dk28>ho|3Wm|mJ6Ro=BDM=Kgyn({I|402-Ff)4iKMBNcTuIO_-6%N%q$%*bHJ^q;V9Kl$8uX(A_TK2H$v<#PL6Kp z`YhBC@;mxwzGO9;>`>YGOpsFUAULB^(i!w5Jw2<&!zy%CS!K>iOLxmysco3Hwn%k7 zr~8H7_NSgh+!LjaRnF~#h9%VhmcqUD7V}Hm!(C~9hPNsr=C%&3dj5sL`#!#GZy(M~ zF+=?}(%u(w{F9`xvL>QC;@4BJuH8c8uc35^qNw<*30tjJFC!}d! - {l s='Pay by cheque' mod='cheque'} - {l s='Pay by cheque (order process will be longer)' mod='cheque'} + {l s='Pay by cheque' mod='cheque'} + {l s='Pay by cheque (order process will be longer)' mod='cheque'}