From 2a1e42606bf65f04d0bb3af4335f39aee89db05a Mon Sep 17 00:00:00 2001 From: lCherifi Date: Tue, 23 Aug 2011 14:25:09 +0000 Subject: [PATCH] integration new theme standard git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8168 b9a71923-0436-4b27-9f14-aed3839534dd --- modules/authorizeaim/authorizeaim.tpl | 2 +- modules/bankwire/bankwire.jpg | Bin 9087 -> 2697 bytes modules/bankwire/payment.tpl | 4 +- modules/blockbestsellers/blockbestsellers.php | 2 +- modules/blockbestsellers/blockbestsellers.tpl | 23 +- modules/blockcart/ajax-cart.js | 21 ++ modules/blockcart/blockcart.php | 5 + modules/blocklayered/fr.php | 7 +- modules/blockmyaccount/blockmyaccount.php | 11 + modules/cheque/cheque.jpg | Bin 1837 -> 2636 bytes modules/cheque/payment.tpl | 4 +- .../favoriteproducts-account.tpl | 18 +- .../favoriteproducts-extra.tpl | 6 +- modules/favoriteproducts/favoriteproducts.css | 47 +++- modules/loyalty/fr.php | 4 +- modules/moneybookers/fr.php | 1 - .../moneybookers/logos/international/visa.gif | Bin 1544 -> 2258 bytes .../moneybookers/logos/local/cartebleue.gif | Bin 2082 -> 2232 bytes modules/moneybookers/moneybookers.tpl | 6 +- modules/productcomments/fr.php | 3 +- modules/productcomments/img/star.gif | Bin 815 -> 543 bytes .../productcomments/productcomments-extra.tpl | 95 +++---- modules/productcomments/productcomments.css | 240 ++++++++++++------ modules/productcomments/productcomments.php | 5 +- modules/productcomments/productcomments.tpl | 7 +- modules/sendtoafriend/fr.php | 1 - modules/sendtoafriend/product_page.tpl | 2 +- modules/sendtoafriend/sendtoafriend.tpl | 14 +- modules/trustedshops/display_products.tpl | 2 +- 29 files changed, 332 insertions(+), 198 deletions(-) diff --git a/modules/authorizeaim/authorizeaim.tpl b/modules/authorizeaim/authorizeaim.tpl index 41009157c..3a58d2eb4 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 8d11f391a411dcbd4ef3a7603c6ceeb361f6cf54..03ee6508380b9d1235704362bb162c5ca5d9addf 100644 GIT binary patch literal 2697 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 - {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 979ac15bd..52eaa4211 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, - 'mediumSize' => Image::getSize('medium'), + 'smallSize' => Image::getSize('small'), )); return $this->display(__FILE__, 'blockbestsellers.tpl'); } diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl index eb89140b5..b10369218 100644 --- a/modules/blockbestsellers/blockbestsellers.tpl +++ b/modules/blockbestsellers/blockbestsellers.tpl @@ -19,26 +19,31 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 7077 $ +* @version Release: $Revision: 6594 $ * @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}
    -
  • {$best_sellers.0.legend|escape:'htmlall':'UTF-8'}
    • - {if $best_sellers|@count > 1}
  • {$best_sellers.1.legend|escape:'htmlall':'UTF-8'}
    • {/if} -
-
{foreach from=$best_sellers item=product name=myLoop} -
{$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}
+
  • + + {$smarty.foreach.myLoop.iteration} + {$product.legend|escape:'htmlall':'UTF-8'} + +

    + {$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}
    + {$product.price} +

    +
    • {/foreach} -
    -

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

    + +

    »{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 09fc09a00..d86d5d248 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -626,5 +626,26 @@ $(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 324bc0658..c653f3f23 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -187,5 +187,10 @@ 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/blocklayered/fr.php b/modules/blocklayered/fr.php index 1cbe0d654..733004358 100644 --- a/modules/blocklayered/fr.php +++ b/modules/blocklayered/fr.php @@ -33,9 +33,10 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_ef7de3f485174ff47f061ad27d83d0e $_MODULE['<{blocklayered}prestashop>blocklayered_64646db703ca003a37bd1e73977a3a4d'] = 'Catégories utilisant ce modèle'; $_MODULE['<{blocklayered}prestashop>blocklayered_d758a9754eb9f36db05c22ad0c77e38e'] = 'Sélectionnez une ou plusieurs catégories utilisant ce modèle'; $_MODULE['<{blocklayered}prestashop>blocklayered_5965d2ce192837f00d743d8a674382c1'] = 'Cliquez sur \"Sauvegarder cette sélection\" ou fermez la fenêtre pour sauvegarder'; -$_MODULE['<{blocklayered}prestashop>blocklayered_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil'; $_MODULE['<{blocklayered}prestashop>blocklayered_72dd03f11489ff6f604a4eb57c957202'] = 'Sauvegarder cette sélection'; $_MODULE['<{blocklayered}prestashop>blocklayered_2e527847e8c785f3fd99651f64006798'] = 'Etape 2/3 - Sélectionnez vos filtres'; +$_MODULE['<{blocklayered}prestashop>blocklayered_3488a51eb7f723d65daeff912e69b177'] = 'Filres sélectionnés'; +$_MODULE['<{blocklayered}prestashop>blocklayered_cf3cd81b30d4c4fd996ae5374fe656da'] = 'Aucun filtre sélectionné pour le moment.'; $_MODULE['<{blocklayered}prestashop>blocklayered_8524de963f07201e5c086830d370797f'] = 'Chargement...'; $_MODULE['<{blocklayered}prestashop>blocklayered_74a6a547d86659933a210680efb6e6d1'] = 'Etape 3/3 - Donnez un nom à votre modèle'; $_MODULE['<{blocklayered}prestashop>blocklayered_f8263d99054a4cdb3428196f078fa212'] = 'Nom du modèle :'; @@ -45,11 +46,9 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_ef1094d9826e98f5417e0a37f174213 $_MODULE['<{blocklayered}prestashop>blocklayered_254f642527b45bc260048e30704edb39'] = 'Configuration'; $_MODULE['<{blocklayered}prestashop>blocklayered_054b4f3ea543c990f6b125f41af6ebf7'] = 'Option'; $_MODULE['<{blocklayered}prestashop>blocklayered_689202409e48743b914713f96d93947c'] = 'Valeur'; -$_MODULE['<{blocklayered}prestashop>blocklayered_deb2e405c1ee047002c6963e6c963d9e'] = 'Masquer les filtres pour lesquels aucun produit ne correspond'; $_MODULE['<{blocklayered}prestashop>blocklayered_93cba07454f06a4a960172bbd6e2a435'] = 'Oui'; $_MODULE['<{blocklayered}prestashop>blocklayered_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non'; $_MODULE['<{blocklayered}prestashop>blocklayered_8531c73de81b9ed94322dda7cf947daa'] = 'Afficher le nombre de produits qui correspondent'; -$_MODULE['<{blocklayered}prestashop>blocklayered_01f7d5dca78cb0a2c6ad8f3a3fe64883'] = 'Utiliser le système de modèle de filtres'; $_MODULE['<{blocklayered}prestashop>blocklayered_8b6c3aa61f1e15caefb66e68e7e64924'] = 'Autoriser les clients à partager des URLs'; $_MODULE['<{blocklayered}prestashop>blocklayered_abc07e5243a77d8bebcadd90fca23d74'] = 'Pour offrir à vos clients des url courtes, créer un compte sur bit.ly, puis copiez et collez login et clé API.'; $_MODULE['<{blocklayered}prestashop>blocklayered_d67850bd126f070221dcfd5fa6317043'] = 'Inscrivez-vous'; @@ -66,8 +65,6 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_fcebe56087b9373f15514831184fa57 $_MODULE['<{blocklayered}prestashop>blocklayered_2d25c72c1b18e562f6654fff8e11711e'] = 'Non disponible'; $_MODULE['<{blocklayered}prestashop>blocklayered_c0bd7654d5b278e65f21cf4e9153fdb4'] = 'Fabricant'; $_MODULE['<{blocklayered}prestashop>blocklayered_8c489d0946f66d17d73f26366a4bf620'] = 'Poids'; -$_MODULE['<{blocklayered}prestashop>blocklayered_3488a51eb7f723d65daeff912e69b177'] = 'Filres sélectionnés'; -$_MODULE['<{blocklayered}prestashop>blocklayered_cf3cd81b30d4c4fd996ae5374fe656da'] = 'Aucun filtre sélectionné pour le moment.'; $_MODULE['<{blocklayered}prestashop>blocklayered_308edffd52afae39cc6277e246ec5df8'] = 'Filtres disponibles'; $_MODULE['<{blocklayered}prestashop>blocklayered_cfbc982f8fb7a0cc3abb3c85c795ab41'] = 'Filtre sous-catégories'; $_MODULE['<{blocklayered}prestashop>blocklayered_cd50ff1c5332f9920acf8173c4aab425'] = 'Filtre stock du produit'; diff --git a/modules/blockmyaccount/blockmyaccount.php b/modules/blockmyaccount/blockmyaccount.php index 56a43a0c8..b19c5acb5 100644 --- a/modules/blockmyaccount/blockmyaccount.php +++ b/modules/blockmyaccount/blockmyaccount.php @@ -86,6 +86,17 @@ 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 555f1f31ce42e6230e1630099abd9693ea8fb680..71195385f4cd662c8f04376d3c474aebaad9a691 100644 GIT binary patch literal 2636 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 diff --git a/modules/cheque/payment.tpl b/modules/cheque/payment.tpl index ce487ff65..12487b4d3 100644 --- a/modules/cheque/payment.tpl +++ b/modules/cheque/payment.tpl @@ -26,7 +26,7 @@

    - {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'}

    diff --git a/modules/favoriteproducts/favoriteproducts-account.tpl b/modules/favoriteproducts/favoriteproducts-account.tpl index d83d54b57..d35b8a087 100644 --- a/modules/favoriteproducts/favoriteproducts-account.tpl +++ b/modules/favoriteproducts/favoriteproducts-account.tpl @@ -58,14 +58,13 @@ $('documnet').ready(function(){ {if $favoriteProducts}
    {foreach from=$favoriteProducts item=favoriteProduct} -
    - -
    -

    {$favoriteProduct.name}

    -

    {$favoriteProduct.description_short}

    -
    -
    - +
    + +

    {$favoriteProduct.name}

    +
    {$favoriteProduct.description_short}
    + +
    +
    {/foreach} @@ -75,7 +74,6 @@ $('documnet').ready(function(){ {/if}
    \ No newline at end of file diff --git a/modules/favoriteproducts/favoriteproducts-extra.tpl b/modules/favoriteproducts/favoriteproducts-extra.tpl index c68d61952..9b8ff982f 100644 --- a/modules/favoriteproducts/favoriteproducts-extra.tpl +++ b/modules/favoriteproducts/favoriteproducts-extra.tpl @@ -47,7 +47,7 @@ $('document').ready(function(){ {if !$isCustomerFavoriteProduct AND $isLogged} -
    - {l s='Add this product to my favorites' mod='favoriteproducts'} -
    +
  • + {l s='Add this product to my favorites' mod='favoriteproducts'} +
    • {/if} \ No newline at end of file diff --git a/modules/favoriteproducts/favoriteproducts.css b/modules/favoriteproducts/favoriteproducts.css index dbb89f353..ab3ad94d0 100644 --- a/modules/favoriteproducts/favoriteproducts.css +++ b/modules/favoriteproducts/favoriteproducts.css @@ -2,25 +2,46 @@ cursor: pointer } -#favoriteproducts_block_account div.favoriteproduct { - background: none repeat scroll 0 0 #F1F2F4; - border: 1px solid #D0D3D8; - padding: 10px; - margin: 10px 0 +#favoriteproducts_block_account .favoriteproduct { + position:relative; + margin-bottom: 14px; + padding: 12px 8px; + border: 1px solid #eee; + border-radius: 3px 3px 3px 3px; } -#favoriteproducts_block_account div.favoriteproduct .fl { - float: left +.favoriteproduct a.product_img_link { + border: 1px solid #CCCCCC; + display: block; + float: left; + margin-right: 14px; + overflow: hidden; + position: relative; } -#favoriteproducts_block_account div.favoriteproduct .fr { - float: right +.favoriteproduct h3 { + color: #000000; + font-size: 13px; + padding: 0 0 10px; } -#favoriteproducts_block_account div.favoriteproduct img { - margin: 5px +.favoriteproduct p.product_desc { + line-height: 16px; + overflow: hidden; + padding: 0; } -#favoriteproducts_block_account div.favoriteproduct_description { - width: 350px +.favoriteproduct .remove { + position:absolute; + top:10px; + right:10px +} +.favoriteproduct .remove .icon {cursor:pointer} + + +/* lnk fiche produit */ + +#usefull_link_block li#favoriteproducts_block_extra { + padding-left:20px; + background:url(img/add_favorite.gif) no-repeat 0 0; } \ No newline at end of file diff --git a/modules/loyalty/fr.php b/modules/loyalty/fr.php index 25eee8b80..99de87ccf 100644 --- a/modules/loyalty/fr.php +++ b/modules/loyalty/fr.php @@ -24,8 +24,7 @@ $_MODULE['<{loyalty}prestashop>loyalty_bafd7322c6e97d25b6299b5d6fe8920b'] = 'Non $_MODULE['<{loyalty}prestashop>loyalty_ade45d72ab6ba1ab576d8b9deb0c2438'] = 'Points attribués au statut suivant'; $_MODULE['<{loyalty}prestashop>loyalty_9611a682e61c503c32e2dc58fdbc8ddf'] = 'Points annulés au statut suivant'; $_MODULE['<{loyalty}prestashop>loyalty_2a46cccdea2f18fdfdfacf99a98b758d'] = 'Les bons de réductions crées par le système de fidélité peuvent être utilisés dans les catégories d\'articles suivantes :'; -$_MODULE['<{loyalty}prestashop>loyalty_b718adec73e04ce3ec720dd11a06a308'] = 'ID'; -$_MODULE['<{loyalty}prestashop>loyalty_49ee3087348e8d44e1feda1917443987'] = 'Nom'; +$_MODULE['<{loyalty}prestashop>loyalty_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil'; $_MODULE['<{loyalty}prestashop>loyalty_c2a7db7dec4de1bdb143ccd790f5a62c'] = 'Cocher pour quelle(s) catégorie(s) seront utilisables les bons de réductions fidélité'; $_MODULE['<{loyalty}prestashop>loyalty_30e793698766edbaaf84a74d4c377f72'] = 'Statuts des points de fidélité'; $_MODULE['<{loyalty}prestashop>loyalty_4f2a91e15af2631ff9424564b8a45fb2'] = 'Initial'; @@ -80,7 +79,6 @@ $_MODULE['<{loyalty}prestashop>loyalty_a16cf3ec5200cc519f4fe48e34b1df83'] = 'Le $_MODULE['<{loyalty}prestashop>loyalty_8e69341aca5dbf9f55c2e75a2ed5df3c'] = 'Aucun bon de réduction pour le moment.'; $_MODULE['<{loyalty}prestashop>loyalty_00d56a5e37c19c59d521530fc8e7f337'] = 'Aucun point de fidélité pour le moment.'; $_MODULE['<{loyalty}prestashop>loyalty_0b3db27bc15f682e92ff250ebb167d4b'] = 'Retour à votre compte'; -$_MODULE['<{loyalty}prestashop>loyalty_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil'; $_MODULE['<{loyalty}prestashop>my-account_c540093e64d84440025b2d8201f04336'] = 'Mes points de fidélité'; $_MODULE['<{loyalty}prestashop>product_ded9088edfbcc1041c3a642b031c8f72'] = 'Programme de fidélisation'; $_MODULE['<{loyalty}prestashop>product_08ef6b34ab8e7039ef0ee69378f0ac0b'] = 'En achetant ce produit vous pouvez gagner jusqu\'à '; diff --git a/modules/moneybookers/fr.php b/modules/moneybookers/fr.php index cc8726eac..47126465a 100644 --- a/modules/moneybookers/fr.php +++ b/modules/moneybookers/fr.php @@ -34,7 +34,6 @@ $_MODULE['<{moneybookers}prestashop>moneybookers_acf2b73b741f10cd1e0d075ed43fed3 $_MODULE['<{moneybookers}prestashop>moneybookers_76264fd7352f803c63396bc27b0ee893'] = 'Moneybookers change de nom et devient Skrill !'; $_MODULE['<{moneybookers}prestashop>moneybookers_f4f70727dc34561dfde1a3c529b6205c'] = 'Configuration'; $_MODULE['<{moneybookers}prestashop>moneybookers_e86e85752dd7a7b31bb935c862480cee'] = 'Choisir la position du logo'; -$_MODULE['<{moneybookers}prestashop>moneybookers_239d45036930947dbf41506d27fa1aa7'] = 'Change la position du logo dans le Front Office. Fonctionne avec '; $_MODULE['<{moneybookers}prestashop>moneybookers_81149af5698332fdf2d6869a66b6ad12'] = 'Live edit'; $_MODULE['<{moneybookers}prestashop>moneybookers_708c440d8915f957ee6717efc426a863'] = 'Envoyer '; $_MODULE['<{moneybookers}prestashop>moneybookers_5138738b54f0d4bdf7c72780db651abc'] = 'Ouverture de compte'; diff --git a/modules/moneybookers/logos/international/visa.gif b/modules/moneybookers/logos/international/visa.gif index 62b6ad35ad79fd4ef2e9b54663ff7e51843e31be..291e91234e534b5121b34f1899d8809acd4817f4 100644 GIT binary patch literal 2258 zcmV;@2rc(VNk%w1VS)f`0OkMy>Fx0M_xFRU%kJ^>{NazAy3~E9$!VFvRExR(%{bNI z>iX%l($dn(*yJ2$q!wbLy3O74^!22`*jbLd-@iw!#oOiO<=*G+Gj**yd$7gD#gDSl z?C;qO@_CUw9&WB-jTD=+S=L~Vw*~Zw$0k+aGt~|YnI*R?4Z5Xb)dyKd9SO) z+TPyYDQ~IU8tk^787#J?ZJ`@bUA{y=U0s>-X~F(A?+9+2_dD<@(W7|HTyN z?C_Yk)ARNA{NILhj(*|k@J4x$&fMtW!B73tPHc;UPKUR#$lJcq-}U$SugBZg*4F<1 z{_^tj@9*#M@bLWn{QCO(_V)Jf?(X~h`~Cg>@$vBxUZBj(%>V!YA^8LV00000EC2ui z0D=H)000O7fJR3&41R`(h>41ejE#g~zw?(x9z^7Xd#_W7##`u(N+{sNBsCa~ZrfCl{`OsH=mLwgP% z%8RHWiN%W;Giuz(v7^V2AVYT4fGT1ViPlb@GKo@}N>eObLVNj-;He~Xa_Zd4v!~CW zK!XY$N)#wfQYMQkUCOknQ#nTu+BAjpsnx4kiAEJ=a*x-qV8e(BTJtAxbUCDlrwAI z%(=5=%$-Av9cgW6PdRyLN2TcTwBk&AYen-+FMTN)5cY@#D3H zqau#Hx%1=7Z{C?sy}I@5*t2Wj&b_;L?a`@zA5Xr#`SW+eqejoZz5DO#NhLu-zrOwZ z`19-E&%eL_|NF%^%6$B7LBN3sCb)nR`USDUgAc~=1`=IB_#g`TUBJQtL}Y+L1``+{ z!WjBpu!Ds$0C=B(q7cYm31lPy#f&u0sD^$x^r54UY|wYWjyg(kUl(jh0pyVz`Yca3lr+R5>P)Em$c)n@wI2D5EFrxhI~V=qV|fMU*iDjVXXh z#F1iDdBKq;ScwLkK=wcd6&M)lK%E&ds=}ppQtFANv|1@>4pz*V0G0|I>A(P0if|+q zR{of(7FP}chXG&;!Dt^3M3C#1w*HYs0Ni%#?YG^Up<@jc%(#WOCme}Gw;LRJLbn(k z=>oX)1~37TBpiuCz5HgoEx-K6+D8q&F3{~5LjWm-0^NFWqy*h24CDk60L-ob0;u*O zD3BXi46eT()0?i2IgCI+w-p?TfVTqgctf`>@0dXd7U#Gl31gT5WDy~I>n|Qa2QBo_ zLWcn48earW1(`x0s-qMG1U&VFBMgy0 ztw8ZT9LdG_0C)}L0m4fQqzy9UF9QNVK7a-J#1kI?zh|@4Wefqu%U%EeH@+ogZ$};w zUizj5Brgn5c-eZw5;n-e4tnr|%bOMiJjjJ3^?-vq_#g+_a3ljPK?@n9ppIss!Wur| zcex>j25ZPe4gx@TO~SwjQ#LUU+8_flP(TO6u%;u0U=m7?RxT6ySKx+r`AnjO_9BNVjlc4mY=94qaEGL(GeBvSAg3O(Wymu6JoA32b*2UKB?9f0GJhG2j& z?9m5DBEbLvNlYM>@|Q=@rBpnbM{I`D1yKlRIClWZFo-jp1?VFkAP|KEut5bqK%W3) zFik$f;ha%u11QCCP8WDnn_S@~D4sBff*SOo2u-L$7s}9vI`p9sWhg+~BG69|G@=;I zs75!+(TUn66&K~GNJmQ2jC%Ah74^gu_`uSZy7Z+mjj2p$O4FL!^rkaCsbNz3hn3>= zr$7y=P=~71%kb2vLrtnumkQLPMg*x$jjB|o>eQpw;i_2w&8k+n%GIuV^{ZeFt605S zRc`ijtY}TETGz_fI+PWpZH=p3=Q`H6qT&g3$g5uW%GbX7^{;>ptY8OASisu#6nHJH zVi(KU#ya+}rbw(~CrjDNE*7$-ctRdF%h}F)_OqZ3t!PI}+R~a zLErsaL%;rA27m+nj{Xu@zy>~Wf$yte{xZ11&=@c;gnuF73FD#}y|8dMmcRsAXqX$j g&;%zwEDcw{LJ%~V0wq?=;ugF3#gDKACISHfJ4;BXTL1t6 literal 1544 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 J9#AN7{QqbeSgQa4 diff --git a/modules/moneybookers/moneybookers.tpl b/modules/moneybookers/moneybookers.tpl index c7b53640b..0ce936fe5 100644 --- a/modules/moneybookers/moneybookers.tpl +++ b/modules/moneybookers/moneybookers.tpl @@ -26,7 +26,7 @@ {if $display_mode == 0} -

    +

    @@ -73,7 +73,7 @@ {else} {foreach from=$inter item=i} -

    +

    @@ -115,7 +115,7 @@ {/foreach} {foreach from=$local item=i} -

    +

    diff --git a/modules/productcomments/fr.php b/modules/productcomments/fr.php index 5f3268d1f..3d93253e2 100644 --- a/modules/productcomments/fr.php +++ b/modules/productcomments/fr.php @@ -8,6 +8,7 @@ $_MODULE['<{productcomments}prestashop>productcomments-extra_4ce7fa08d440a1e0fb3 $_MODULE['<{productcomments}prestashop>productcomments-extra_b78a3223503896721cca1303f776159b'] = 'Titre'; $_MODULE['<{productcomments}prestashop>productcomments-extra_0be8406951cdfda82f00f79328cf4efc'] = 'Commentaire'; $_MODULE['<{productcomments}prestashop>productcomments-extra_a2ed44743411cf8b80e397448fce104c'] = 'Votre nom'; +$_MODULE['<{productcomments}prestashop>productcomments-extra_e699583427bd276f34244d23e6072a41'] = 'Tous les champs sont obligatoires'; $_MODULE['<{productcomments}prestashop>productcomments-extra_94966d90747b97d1f0f206c98a8b1ac3'] = 'Envoyer'; $_MODULE['<{productcomments}prestashop>productcomments-extra_e81c4e4f2b7b93b481e13a8553c2ae1b'] = 'ou'; $_MODULE['<{productcomments}prestashop>productcomments-extra_ea4788705e6873b424c65e91c2846b19'] = 'Annuler'; @@ -67,7 +68,7 @@ $_MODULE['<{productcomments}prestashop>productcomments_6bf852d9850445291f5e9d474 $_MODULE['<{productcomments}prestashop>productcomments_6d28f2900adb9e500868166f6d04da92'] = 'Vous devez attendre'; $_MODULE['<{productcomments}prestashop>productcomments_ba8d7ae5dcadfba739f28a777378f208'] = 'secondes avant de poster un nouveau commentaire.'; $_MODULE['<{productcomments}prestashop>productcomments_4494d00c901c9e22ff3b953177205cea'] = 'Etes vous sur de vouloir signaler ce commentaire?'; -$_MODULE['<{productcomments}prestashop>productcomments_7c3b0e9898b88deee7ea75aafd2e37e2'] = 'Note moyenne'; +$_MODULE['<{productcomments}prestashop>productcomments_4b3b9db8c9784468094acde0f8bf7071'] = 'Note'; $_MODULE['<{productcomments}prestashop>productcomments_663fc7093256cda156e571631ddb295e'] = 'personne(s) sur'; $_MODULE['<{productcomments}prestashop>productcomments_e759c67f646fedbee26e1e6732588a98'] = 'ont trouvé ce commentaire utile'; $_MODULE['<{productcomments}prestashop>productcomments_39630ad6ee79b8653ea89194cdb45bec'] = 'Ce commentaire vous a-t-il été utile?'; diff --git a/modules/productcomments/img/star.gif b/modules/productcomments/img/star.gif index d0948a70843bf01952d1f81dcfcdadc92976a04a..31362426fe1b1798a44ea6a66ae963ee6d8e74c2 100644 GIT binary patch delta 499 zcmV3fM@dFFIbje0FaXso0Ppej|HA+<*b`tb4g z|Jwll*9P*sG4i%C`MVbV+y?!<2Kv7c^2KrVwz|J4BCpzX3j`1t$( z%mDxY|C3PxIe#Jf1OWg5EC4J30000G05AXm2LC{oaL78Hh)5#9U;reOCxPJj94=L= zW>px)PLTkk(SXGo#HX;J%x+Hs14O%x7&s5{IktWn;`J&6eMBdKRDJ`1f=VD|9v)>N zPD5RFA0K&Nlmcgi2PX!aLSd6iXV9vBSYaU?e6XANGT!o_4LC+ zBNrn4{rnf|h-C;s5CQ~(0W$QG)j>l81`#4KXrQ43z7!86qzE`7g@gzAiY+AO3>CgD ztzN}qF;uHoEL^&HtxEAL*vVqXkSSwk>>0H@pC+uKz{ag;32)%UnKOqjAPaWy+{Gg@ p&tAQg`uzC=$ZBB0g9H^)ZTK+a#EKU)Zp`NqB&(80L<$K406R8d>(c-L delta 766 zcmV1g{2vM@dFFIbje0FaYKN0HHTG#l^+xvm4BS4d=pI)P#i4b93I_-sG>Z zz+hnGxI_2syv0&d*4EbIwlw6uX7={>>dQvjsj2Sn?%k*<@!Xo;y1MMod96l9_vz{E zydv$wFzLoY>&=Bmg(#VPOAO#Jxo=DkAl)mY4CX3WgY`}NrS_2%ZkIq0w@@!O)^szveK zf4xdd(~lymKR@KVO76o;<*hjF(yRaf|JaO-(|mmN)ghiH#GBBaMoSjFN&Q4F?CAi4&TOo0Om<5SyBxqN!@2 zqBX8Hi#0@otg)`K5QMF-4K=xhn7zE5h@q{EiN>iliIg>(ugr+9k%J>O0iBYEmLOA> zhz2y^gDo^P2;^#iGzJDF#!80RwW zXkfxc$ch+(Tv%Ch`GsZyWQ0%vJxIn3#HIxZ;6mXBq6!>lnARYmN|gtRE<}j10Sc5X wIjZbPM1YDV2r4qFaB*xVkpe1JD6l|MqJ)qri6Dz1)WOGqL}w%o859TrJNTA-s{jB1 diff --git a/modules/productcomments/productcomments-extra.tpl b/modules/productcomments/productcomments-extra.tpl index 0376c51cb..e97b47e82 100644 --- a/modules/productcomments/productcomments-extra.tpl +++ b/modules/productcomments/productcomments-extra.tpl @@ -57,8 +57,9 @@

    -
    - {l s='Average grade' mod='productcomments'}  +
    + {l s='Average grade' mod='productcomments'}  +
    {section name="i" start=0 loop=5 step=1} {if $averageTotal le $smarty.section.i.index}
    @@ -66,9 +67,9 @@
    {/if} {/section} -
    +
    -
    +
    {l s='Read user reviews' mod='productcomments'} ({$nbComments})
    {if ($too_early == false AND ($logged OR $allow_guests))} {l s='Give your advice' mod='productcomments'} @@ -76,53 +77,59 @@
    -
    - - {l s='Give your advice' mod='productcomments'} -
    - {$product->name|escape:html:'UTF-8'} -
    - {$product->name} - {$product->description_short} -
    + +

    {l s='Give your advice' mod='productcomments'}

    + +
    + {$product->name|escape:html:'UTF-8'} +
    +

    {$product->name}

    + {$product->description_short}
    -
    -
    - {if $criterions|@count > 0} - - {section loop=$criterions name=i start=0 step=1} - - - - - {/section} -
    - - {$criterions[i].name|escape:'html':'UTF-8'}:  - - - - - - -
    - {/if} - -
    - - +
    + +
    +

    {l s='Give your advice' mod='productcomments'}

    + {if $criterions|@count > 0} +
    + {section loop=$criterions name=i start=0 step=1} + + + {$criterions[i].name|escape:'html':'UTF-8'}:  + +
    + + + + + +
    + {/section} +
    + {/if} +
    +

    + + +

    +

    + + +

    {if $allow_guests == true && $logged == 0} - -
    +

    + + +

    {/if} -

    +

    + * {l s='All ths fields are mandatory' mod='productcomments'}   {l s='or' mod='productcomments'} {l s='Cancel' mod='productcomments'}

    -
    - -
    +
    +
    \ No newline at end of file diff --git a/modules/productcomments/productcomments.css b/modules/productcomments/productcomments.css index a9d7cd8d1..45c33d0ac 100644 --- a/modules/productcomments/productcomments.css +++ b/modules/productcomments/productcomments.css @@ -1,99 +1,179 @@ #product_comments_block_extra { - border: 1px solid #D0D3D8; - background: #F1F2F4; - padding: 10px + padding-top:10px; + border-top:1px solid #ccc; + font-weight: bold; + font-size:12px; + line-height:18px } -#product_comments_block_extra a { - text-decoration: none; - font-weight: bold +#product_comments_block_extra a {text-decoration: none;} + +#product_comments_block_extra a:hover {text-decoration: underline} + +#product_comments_block_extra .comments_note span, +#product_comments_block_extra .star_content {float:left} + +#product_comments_block_extra div.star {background: url(img/star.gif) no-repeat scroll 0 0 transparent} + +#product_comments_block_extra div.star_on {background: url(img/star.gif) no-repeat scroll 0 -16px transparent} + +#product_comments_block_extra .comments_advices {clear:both;} + +/* pop-in add grade/advice ********************************************************************* */ +#fancybox-wrap {width:585px !important} +#fancybox-content { + width:585px !important; + border-width:0 !important } -#product_comments_block_extra a:hover { - text-decoration: underline -} - -#product_comments_block_extra div.star { - background: url("img/star.gif") no-repeat scroll 0 0 transparent -} - -#product_comments_block_extra div.star_on { - background: url("img/star.gif") no-repeat scroll 0 0 transparent; - background-position: 0 -16px -} - #new_comment_form { + width:585px; color: #333; - background-color: #fff; - padding: 10px; - width: 565px; text-align: left; + background-color: #fff } - #new_comment_form .title { - padding: 15px; - background: #333; - color: #fff; + padding:10px; font-size: 13px; - font-weight: bold; - padding: 5px; - text-align: left; + color: #fff; text-transform: uppercase; - display: block; - margin: 5px 0 + background: #333 } -#new_comment_form label { - display: block; - margin: 5px 0; - text-align: left; - font-weight: bold +#new_comment_form .product {padding:15px} +#new_comment_form .product img { + float:left; + border: 1px solid #ccc; +} +#new_comment_form .product .product_desc { + float:left; + margin-left:15px; + width:300px; + line-height:18px; + color:#666 +} +#new_comment_form .product .product_desc .product_name { + padding-bottom:5px; + font-size:13px; + color:#000 } -#new_comment_form textarea { - width: 100%; - min-height: 100px; - margin: 5px 0 +#new_comment_form .grade_content {margin:0 0 20px 0} +#new_comment_form .grade_content span, +#new_comment_form .grade_content .star_content {float:left} +#new_comment_form .grade_content span { + display:inline-block; + padding:0 10px; + width:85px;/* 105 */ + font-weight:bold +} +#new_comment_form .grade_content .cancel {margin-right:5px} + +.new_comment_form_content { + padding:15px; + background:#f8f8f8 +} +.new_comment_form_content .intro_form { + padding-bottom: 10px; + font-weight: bold; + font-size: 12px } -#new_comment_form input[type=text] { - width: 100%; - height: 30px; - margin: 5px 0 + +#new_comment_form .form_contenair { + clear:both; + margin-top:20px +} +#new_comment_form p.text { + margin-bottom:0; + padding-bottom:0 +} +#new_comment_form p.text label, #new_comment_form p.textarea label { + display: block; + margin:12px 0 4px 0; + font-weight: bold; + font-size: 12px; +} +#new_comment_form p.text input { + padding: 0 5px; + height: 28px; + width: 540px; + border: 1px solid #ccc; + background: url(../img/bg_input.png) repeat-x scroll 0 0 #fff; +} +#new_comment_form p.textarea textarea { + padding: 0 5px; + height: 80px; + width: 540px; + border: 1px solid #ccc; + background: url(../img/bg_input.png) repeat-x scroll 0 0 #fff; } -#new_comment_form th { - font-size: 11px; - text-align: left; - font-weight: bold; - color: #333 +#new_comment_form .submit { + padding:0; + font-size:13px; + text-align:right } - #new_comment_form button { - background-color: #333; - border: solid 1px #BDC2C9; - padding: 3px 5px; cursor: pointer; - color: #fff + cursor: pointer; + display: inline-block; + padding: 4px 7px 3px 7px; + border: 1px solid #CC9900; + border-radius: 3px 3px 3px 3px; + font-weight: bold; + color: #000; + background: url(../img/bg_bt.gif) repeat-x scroll 0 0 #F4B61B } - +#new_comment_form .submit .txt_required { + float:left; + font-size:12px; + font-style:italic; + color:#666 +} + +/* TAB COMMENTS ******************************************************************************** */ +#product_comments_block_tab {margin:0 0 20px 0} + #product_comments_block_tab div.comment { - border-bottom: solid 1px #ccc; - padding: 5px + margin:0 0 10px 0; + padding: 5px; + border-bottom: 1px dotted #ccc } #product_comments_block_tab div.comment div.comment_author { float: left; - width: 200px + padding-right:25px; + width: 140px;/* 165 */ + line-height:18px } +#product_comments_block_tab div.comment div.comment_author span {font-weight:bold;} +#product_comments_block_tab div.comment div.comment_author span, +#product_comments_block_tab div.comment .star_content { + float:left; +} +#product_comments_block_tab div.comment .star_content {margin: 0 0 0 5px} +#product_comments_block_tab div.star, +#product_comments_block_tab div.star_on { + background: url(img/star.gif) no-repeat 0 0 transparent +} +#product_comments_block_tab div.star_on {background-position: 0 -16px} +#product_comments_block_tab .comment_author_infos {clear:both} +#product_comments_block_tab .comment_author_infos em {color:#999} #product_comments_block_tab div.comment div.comment_details { float: left; - width: 320px + width: 360px } - -#product_comments_block_tab div.comment_details p{ - padding: 0 +#product_comments_block_tab div.comment_details h4 {padding-bottom:10px} +#product_comments_block_tab div.comment_details p {padding-bottom:10px} +#product_comments_block_tab div.comment_details ul { + list-style-type:none; + margin:0 +} +#product_comments_block_tab div.comment_details li { + padding:2px 0 2px 12px; + background:url(img/bg_li.png) no-repeat 1px 45% #fff } #product_comments_block_tab a { @@ -101,29 +181,21 @@ font-weight: bold } -#product_comments_block_tab a:hover { - text-decoration: underline -} - -#product_comments_block_tab div.star { - background: url("img/star.gif") no-repeat scroll 0 0 transparent -} - -#product_comments_block_tab div.star_on { - background: url("img/star.gif") no-repeat scroll 0 0 transparent; - background-position: 0 -16px -} +#product_comments_block_tab a:hover {text-decoration: underline} #product_comments_block_tab button.usefulness_btn { - background-color: #bbb; - border: solid 1px #999; - padding: 1px; - cursor: pointer; - color: #fff; - margin: 3px + cursor: pointer; + margin:0 0 0 5px; + display: inline-block; + padding: 0 2px; + border: 1px solid #CC9900; + border-radius: 3px 3px 3px 3px; + color: #000; + font-weight: bold; + background: url("img/bg_bt.gif") repeat-x scroll 0 0 #F4B61B } +#product_comments_block_tab button.usefulness_btn:hover {background-position: left -50px} +#product_comments_block_tab button.usefulness_btn:active {background-position: left -100px} -#product_comments_block_tab span.report_btn { - cursor: pointer; - text-decoration: underline -} \ No newline at end of file +#product_comments_block_tab span.report_btn {cursor: pointer} +#product_comments_block_tab span.report_btn:hover {text-decoration:underline} \ No newline at end of file diff --git a/modules/productcomments/productcomments.php b/modules/productcomments/productcomments.php index 065e2eea3..4735dc587 100644 --- a/modules/productcomments/productcomments.php +++ b/modules/productcomments/productcomments.php @@ -66,7 +66,7 @@ class ProductComments extends Module return false; if (parent::install() == false OR $this->registerHook('productTab') == false OR $this->registerHook('extraProductComparison') == false OR $this->registerHook('productTabContent') == false - OR $this->registerHook('header') == false OR $this->registerHook('extraRight') == false OR !Configuration::updateValue('PRODUCT_COMMENTS_MINIMAL_TIME', 30) + OR $this->registerHook('header') == false OR $this->registerHook('productOutOfStock') == false OR !Configuration::updateValue('PRODUCT_COMMENTS_MINIMAL_TIME', 30) OR !Configuration::updateValue('PRODUCT_COMMENTS_ALLOW_GUESTS', 0) OR !Configuration::updateValue('PRODUCT_COMMENTS_MODERATE', 1)) return false; @@ -529,6 +529,7 @@ class ProductComments extends Module
    +">

    -

    +

    -

    +

    @@ -61,6 +59,6 @@ {/if} diff --git a/modules/trustedshops/display_products.tpl b/modules/trustedshops/display_products.tpl index 2a1022ff4..1999c7150 100644 --- a/modules/trustedshops/display_products.tpl +++ b/modules/trustedshops/display_products.tpl @@ -69,7 +69,7 @@ var TS = (function() })(); -
    +

    {l s='Trusted Shops Buyer Protection (recommended)' mod='trustedshops'}