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 8d11f391a..03ee65083 100644 Binary files a/modules/bankwire/bankwire.jpg and b/modules/bankwire/bankwire.jpg differ diff --git a/modules/bankwire/payment.tpl b/modules/bankwire/payment.tpl index 1f1be2df8..b05c9d828 100644 --- a/modules/bankwire/payment.tpl +++ b/modules/bankwire/payment.tpl @@ -26,7 +26,7 @@

- {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 555f1f31c..71195385f 100644 Binary files a/modules/cheque/cheque.jpg and b/modules/cheque/cheque.jpg differ 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 62b6ad35a..291e91234 100644 Binary files a/modules/moneybookers/logos/international/visa.gif and b/modules/moneybookers/logos/international/visa.gif differ diff --git a/modules/moneybookers/logos/local/cartebleue.gif b/modules/moneybookers/logos/local/cartebleue.gif index e3e5616ee..ba412e423 100644 Binary files a/modules/moneybookers/logos/local/cartebleue.gif and b/modules/moneybookers/logos/local/cartebleue.gif differ 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 d0948a708..31362426f 100644 Binary files a/modules/productcomments/img/star.gif and b/modules/productcomments/img/star.gif differ 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'}