dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
vAugagneur
2012-12-06 11:32:24 +01:00
parent d71970d5ff 2166937cf5
commit 12f47a1b9b
149 changed files with 359 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
classes/Mail.php
View File

@@ -204,11 +204,16 @@ class MailCore
$template_path = $theme_path.'mails/';
$override_mail = true;
}
else if (!file_exists($template_path.$template.'.txt') || !file_exists($template_path.$template.'.html'))
else if (!file_exists($template_path.$template.'.txt') && ($configuration['PS_MAIL_TYPE'] == Mail::TYPE_BOTH || $configuration['PS_MAIL_TYPE'] == Mail::TYPE_TEXT))
{
Tools::dieOrLog(Tools::displayError('Error - The following e-mail template is missing:').' '.$template_path.$template.'.txt', $die);
return false;
}
else if (!file_exists($template_path.$template.'.html') && ($configuration['PS_MAIL_TYPE'] == Mail::TYPE_BOTH || $configuration['PS_MAIL_TYPE'] == Mail::TYPE_HTML))
{
Tools::dieOrLog(Tools::displayError('Error - The following e-mail template is missing:').' '.$template_path.$template.'.html', $die);
return false;
}
$template_html = file_get_contents($template_path.$template.'.html');
$template_txt = strip_tags(html_entity_decode(file_get_contents($template_path.$template.'.txt'), null, 'utf-8'));

6
modules/bankwire/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>bankwire</name>
<displayName><![CDATA[Bank Wire]]></displayName>
<displayName><![CDATA[Virement bancaire]]></displayName>
<version><![CDATA[0.5]]></version>
<description><![CDATA[Accept payments by bank wire.]]></description>
<description><![CDATA[Accepter les paiements par virement.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[payments_gateways]]></tab>
<confirmUninstall>Are you sure you want to delete your details?</confirmUninstall>
<confirmUninstall>Êtes-vous certain de vouloir effacer vos données ?</confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>

4
modules/blockadvertising/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockadvertising</name>
<displayName><![CDATA[Block advertising]]></displayName>
<displayName><![CDATA[Bloc publicit&eacute;]]></displayName>
<version><![CDATA[0.5]]></version>
<description><![CDATA[Adds a block to display an advertisement.]]></description>
<description><![CDATA[Ajoute un bloc affichant une publicit&eacute;]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[advertising_marketing]]></tab>
<is_configurable>1</is_configurable>

4
modules/blockbestsellers/blockbestsellers-home.tpl
View File

@@ -25,7 +25,7 @@
<!-- MODULE Home Block best sellers -->
<div id="best-sellers_block_center" class="block products_block">
<h4>{l s='Top sellers' mod='blockbestsellers'}</h4>
<p class="title_block">{l s='Top sellers' mod='blockbestsellers'}</p>
{if isset($best_sellers) AND $best_sellers}
<div class="block_content">
{assign var='liHeight' value=320}
@@ -36,7 +36,7 @@
<ul style="height:{$ulHeight}px;">
{foreach from=$best_sellers item=product name=myLoop}
<li style="border-bottom:0" class="ajax_block_product {if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.iteration%$nbItemsPerLine == 0}last_item_of_line{elseif $smarty.foreach.myLoop.iteration%$nbItemsPerLine == 1}clear{/if} {if $smarty.foreach.myLoop.iteration > ($smarty.foreach.myLoop.total - ($smarty.foreach.myLoop.total % $nbItemsPerLine))}last_line{/if}">
<h5><a href="{$product.link}" title="{$product.name|truncate:32:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}</a></h5>
<p class="s_title_block"><a href="{$product.link}" title="{$product.name|truncate:32:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}</a></p>
<div class="product_desc"><a href="{$product.link}" title="{l s='More' mod='blockbestsellers'}">{$product.description_short|strip_tags|truncate:130:'...'}</a></div>
<a href="{$product.link}" title="{$product.name|escape:html:'UTF-8'}" class="product_image"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product.name|escape:html:'UTF-8'}" /></a>
<div>

2
modules/blockbestsellers/blockbestsellers.tpl
View File

@@ -25,7 +25,7 @@
*}
<!-- MODULE Block best sellers -->
<div id="best-sellers_block_right" class="block products_block">
<div id="best-sellers_block_right" class="block products_block">
<p class="title_block"><a href="{$link->getPageLink('best-sales')}">{l s='Top sellers' mod='blockbestsellers'}</a></p>
<div class="block_content">
{if $best_sellers|@count > 0}

4
modules/blockbestsellers/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockbestsellers</name>
<displayName><![CDATA[Top seller block]]></displayName>
<displayName><![CDATA[Bloc meilleures ventes]]></displayName>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Add a block displaying the shop&#039;s top sellers.]]></description>
<description><![CDATA[Ajoute un bloc qui affiche les meilleures ventes de la boutique]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/blockcart/blockcart.css
View File

@@ -1,7 +1,7 @@
/* Special style for block cart*/
#left_column #cart_block, #right_column #cart_block {
}
#header #cart_block h4 {
#header #cart_block .title_block {
display: none;
}
#header #cart_block {
@@ -22,7 +22,7 @@
background:#eee
}
#cart_block.cart_block_hover {display:block}
#cart_block h4 span {
#cart_block .title_block span {
float: right;
padding-left: 10px;
text-transform: none;

4
modules/blockcart/blockcart.tpl
View File

@@ -43,13 +43,13 @@ var delete_txt = '{l s='Delete' mod='blockcart'}';
<!-- MODULE Block cart -->
<div id="cart_block" class="block exclusive">
<h4>
<p class="title_block">
<a href="{$link->getPageLink("$order_process", true)}" title="{l s='View my shopping cart' mod='blockcart'}" rel="nofollow">{l s='Cart' mod='blockcart'}</a>
{if $ajax_allowed}
<span id="block_cart_expand" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !isset($colapseExpandStatus)}class="hidden"{/if}>&nbsp;</span>
<span id="block_cart_collapse" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'collapsed'}class="hidden"{/if}>&nbsp;</span>
{/if}
</h4>
</p>
<div class="block_content">
<!-- block summary -->
<div id="cart_block_summary" class="{if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !$ajax_allowed || !isset($colapseExpandStatus)}collapsed{else}expanded{/if}">

4
modules/blockcart/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockcart</name>
<displayName><![CDATA[Cart block]]></displayName>
<displayName><![CDATA[Bloc panier]]></displayName>
<version><![CDATA[1.2]]></version>
<description><![CDATA[Adds a block containing the customer&#039;s shopping cart.]]></description>
<description><![CDATA[Ajoute un bloc avec le contenu du panier du client]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blockcategories/blockcategories.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block categories module -->
<div id="categories_block_left" class="block">
<h4>{l s='Categories' mod='blockcategories'}</h4>
<p class="title_block">{l s='Categories' mod='blockcategories'}</p>
<div class="block_content">
<ul class="tree {if $isDhtml}dhtml{/if}">
{foreach from=$blockCategTree.children item=child name=blockCategTree}

2
modules/blockcategories/blockcategories_footer.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block categories module -->
<div class="blockcategories_footer">
<h4>{l s='Categories' mod='blockcategories'}</h4>
<p class="title_block">{l s='Categories' mod='blockcategories'}</p>
<div class="category_footer" style="float:left;clear:none;width:{$widthColumn}%">
<div style="float:left" class="list">
<ul class="tree {if $isDhtml}dhtml{/if}">

4
modules/blockcategories/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockcategories</name>
<displayName><![CDATA[Categories block]]></displayName>
<displayName><![CDATA[Bloc cat&eacute;gories]]></displayName>
<version><![CDATA[2.0]]></version>
<description><![CDATA[Adds a block featuring product categories.]]></description>
<description><![CDATA[Ajoute un bloc proposant une navigation au sein de vos cat&eacute;gories de produits]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/blockcms/blockcms.tpl
View File

@@ -27,7 +27,7 @@
<!-- Block CMS module -->
{foreach from=$cms_titles key=cms_key item=cms_title}
<div id="informations_block_left_{$cms_key}" class="block informations_block_left">
<h4><a href="{$cms_title.category_link}">{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}</a></h4>
<p class="title_block"><a href="{$cms_title.category_link}">{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}</a></p>
<ul class="block_content">
{foreach from=$cms_title.categories item=cms_page}
{if isset($cms_page.link)}<li class="bullet"><b style="margin-left:2em;">
@@ -45,7 +45,7 @@
{else}
<!-- MODULE Block footer -->
<div class="block_various_links" id="block_various_links_footer">
<h4>{l s='Information' mod='blockcms'}</h4>
<p class="title_block">{l s='Information' mod='blockcms'}</p>
<ul>
{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
<li class="{if $PS_CATALOG_MODE}first_{/if}item"><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>

6
modules/blockcontact/blockcontact.css
View File

@@ -9,6 +9,12 @@
font-size: 13px;
line-height: 18px
}
#contact_block p.title_block {
padding:6px 11px;
font-size: 12px;
line-height: auto
}
#contact_block p.tel {
margin:0 0 0 60px;
padding-left: 26px;

2
modules/blockcontact/blockcontact.tpl
View File

@@ -24,7 +24,7 @@
*}
<div id="contact_block" class="block">
<h4>{l s='Contact us' mod='blockcontact'}</h4>
<p class="title_block">{l s='Contact us' mod='blockcontact'}</p>
<div class="block_content clearfix">
<p>{l s='Our hotline is available 24/7' mod='blockcontact'}</p>
{if $telnumber != ''}<p class="tel"><span class="label">{l s='Phone:' mod='blockcontact'}</span>{$telnumber|escape:'htmlall':'UTF-8'}</p>{/if}

4
modules/blockcontact/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockcontact</name>
<displayName><![CDATA[Block contact]]></displayName>
<displayName><![CDATA[Bloc contact]]></displayName>
<version><![CDATA[1.0]]></version>
<description><![CDATA[Allows you to add extra information about customer service]]></description>
<description><![CDATA[Permet d&#039;ajouter des informations suppl&eacute;mentaires concernant le service client]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blockcontactinfos/blockcontactinfos.tpl
View File

@@ -25,7 +25,7 @@
*}
<!-- MODULE Block contact infos -->
<div id="block_contact_infos">
<div id="block_contact_infos">
<p class="title_block">{l s='Contact us' mod='blockcontactinfos'}</p>
<ul>
{if $blockcontactinfos_company != ''}<li><strong>{$blockcontactinfos_company|escape:'htmlall':'UTF-8'}</strong></li>{/if}

4
modules/blockcontactinfos/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockcontactinfos</name>
<displayName><![CDATA[Block contact infos]]></displayName>
<displayName><![CDATA[Bloc infos contact]]></displayName>
<version><![CDATA[1.0]]></version>
<description><![CDATA[Add a block to add some information about contacting the shop]]></description>
<description><![CDATA[Ajoute un bloc permettant d&#039;afficher des informations sur les moyens de contacter la boutique]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/blockcurrencies/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockcurrencies</name>
<displayName><![CDATA[Currency block]]></displayName>
<displayName><![CDATA[Bloc devises]]></displayName>
<version><![CDATA[0.1]]></version>
<description><![CDATA[Adds a block for selecting a currency.]]></description>
<description><![CDATA[Ajoute un bloc permettant au client de choisir sa devise]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

4
modules/blockcustomerprivacy/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockcustomerprivacy</name>
<displayName><![CDATA[Block customer data privacy]]></displayName>
<displayName><![CDATA[Bloc confidentialit&eacute; des donn&eacute;es clients]]></displayName>
<version><![CDATA[1.0]]></version>
<description><![CDATA[Adds a block to display a message about customer data privacy.]]></description>
<description><![CDATA[Ajoute un bloc qui affiche un message concernant la confidentialit&eacute; des donn&eacute;es clients.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/blocklanguages/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocklanguages</name>
<displayName><![CDATA[Language block]]></displayName>
<displayName><![CDATA[Bloc langues]]></displayName>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Adds a block for selecting a language.]]></description>
<description><![CDATA[Ajoute un bloc permettant au client de choisir sa langue]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

2
modules/blocklayered/blocklayered.tpl
View File

@@ -34,7 +34,7 @@ param_product_url = '';
{/if}
</script>
<div id="layered_block_left" class="block">
<h4>{l s='Catalog' mod='blocklayered'}</h4>
<p class="title_block">{l s='Catalog' mod='blocklayered'}</p>
<div class="block_content">
<form action="#" id="layered_form">
<div>

4
modules/blocklayered/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocklayered</name>
<displayName><![CDATA[Layered navigation block]]></displayName>
<displayName><![CDATA[Bloc navigation &agrave; facettes]]></displayName>
<version><![CDATA[1.8.9]]></version>
<description><![CDATA[Displays a block with layered navigation filters.]]></description>
<description><![CDATA[Affiche un bloc avec les filtres de la navigation &agrave; facettes]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/blocklink/blocklink.tpl
View File

@@ -25,13 +25,13 @@
<!-- Block links module -->
<div id="links_block_left" class="block">
<h4>
<p class="title_block">
{if $url}
<a href="{$url|escape}">{$title|escape}</a>
{else}
{$title|escape}
{/if}
</h4>
</p>
<ul class="block_content bullet">
{foreach from=$blocklink_links item=blocklink_link}
{if isset($blocklink_link.$lang)}

6
modules/blocklink/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocklink</name>
<displayName><![CDATA[Link block]]></displayName>
<displayName><![CDATA[Bloc liens]]></displayName>
<version><![CDATA[1.5]]></version>
<description><![CDATA[Adds a block with additional links.]]></description>
<description><![CDATA[Ajoute un bloc avec des liens additionels.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<confirmUninstall>Are you sure you want to delete all your links ?</confirmUninstall>
<confirmUninstall>Êtes-vous sûr de vouloir supprimer tous vos liens ?</confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>

2
modules/blockmanufacturer/blockmanufacturer.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block manufacturers module -->
<div id="manufacturers_block_left" class="block blockmanufacturer">
<h4>{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer')}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</h4>
<p class="title_block">{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer')}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</p>
<div class="block_content">
{if $manufacturers}
{if $text_list}

4
modules/blockmanufacturer/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockmanufacturer</name>
<displayName><![CDATA[Manufacturers block]]></displayName>
<displayName><![CDATA[Bloc fabricant]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Displays a block of manufacturers/brands]]></description>
<description><![CDATA[Ajoute un bloc avec les fabricants/marques]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blockmyaccount/blockmyaccount.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block myaccount module -->
<div class="block myaccount">
<h4><a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockmyaccount'}</a></h4>
<p class="title_block"><a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockmyaccount'}</a></p>
<div class="block_content">
<ul class="bullet">
<li><a href="{$link->getPageLink('history', true)}" title="">{l s='My orders' mod='blockmyaccount'}</a></li>

4
modules/blockmyaccount/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockmyaccount</name>
<displayName><![CDATA[My Account block]]></displayName>
<displayName><![CDATA[Bloc Mon compte]]></displayName>
<version><![CDATA[1.2]]></version>
<description><![CDATA[Displays a block with links relative to user account.]]></description>
<description><![CDATA[Affiche un bloc avec des liens relatifs au compte du client.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

5
modules/blockmyaccountfooter/blockmyaccount.css
View File

@@ -5,6 +5,7 @@
display: block;
padding: 7px 11px 5px 22px;
color: #333;
background: url("../blockcms/img/arrow_right_2.png") no-repeat 10px 10px transparent;
}
.myaccount p.logout {
padding-bottom:0;
@@ -14,9 +15,9 @@
/* block myaccount in footer */
#footer .myaccount h4 {background: none;}
#footer .myaccount .title_block {background: none;}
#footer .myaccount .logout {display:none;}
#footer .myaccount h4 {
#footer .myaccount .title_block {
padding:0 0 10px 0;
background:none
}

2
modules/blockmyaccountfooter/blockmyaccountfooter.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block myaccount module -->
<div class="block myaccount">
<h4><a href="{$link->getPageLink('my-account', true)}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></h4>
<p class="title_block"><a href="{$link->getPageLink('my-account', true)}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></p>
<div class="block_content">
<ul class="bullet">
<li><a href="{$link->getPageLink('history', true)}" title="{l s='List of my orders' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My orders' mod='blockmyaccountfooter'}</a></li>

4
modules/blockmyaccountfooter/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockmyaccountfooter</name>
<displayName><![CDATA[My Account block on footer]]></displayName>
<displayName><![CDATA[Bloc Mon compte dans le pied de page]]></displayName>
<version><![CDATA[1.2]]></version>
<description><![CDATA[Displays a block with links relative to user account.]]></description>
<description><![CDATA[Affiche un bloc avec des liens relatifs au compte du client.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

5
modules/blocknewproducts/blocknewproducts.css
View File

@@ -37,6 +37,11 @@
padding:0;
text-align:right;
}
#new-products_block_right p.title_block {
padding:6px 11px;
text-align:left;
}
#new-products_block_right .button_large {
padding:0;
border:none;

2
modules/blocknewproducts/blocknewproducts.tpl
View File

@@ -25,7 +25,7 @@
<!-- MODULE Block new products -->
<div id="new-products_block_right" class="block products_block">
<h4><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a></h4>
<p class="title_block"><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a></p>
<div class="block_content">
{if $new_products !== false}
<ul class="product_images clearfix">

4
modules/blocknewproducts/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocknewproducts</name>
<displayName><![CDATA[New products block]]></displayName>
<displayName><![CDATA[Bloc nouveaux produits]]></displayName>
<version><![CDATA[0.9]]></version>
<description><![CDATA[Displays a block featuring newly added products.]]></description>
<description><![CDATA[Ajoute un bloc proposant les derniers produits ajout&eacute;s.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blocknewsletter/blocknewsletter.css
View File

@@ -4,7 +4,7 @@
border:1px solid #ccc;
background:#eee;
}
#newsletter_block_left h4 {
#newsletter_block_left .title_block {
padding:0 0 12px 28px;
color:#666;
text-shadow:0 1px 0 #fff;

6
modules/blocknewsletter/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocknewsletter</name>
<displayName><![CDATA[Newsletter block]]></displayName>
<displayName><![CDATA[Bloc newsletter]]></displayName>
<version><![CDATA[1.4]]></version>
<description><![CDATA[Adds a block for newsletter subscription.]]></description>
<description><![CDATA[Ajoute un bloc newsletter pour vos clients]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<confirmUninstall>Are you sure you want to delete all your contacts ?</confirmUninstall>
<confirmUninstall>Êtes-vous sûr de vouloir supprimer tous vos contacts ?</confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>

2
modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
View File

@@ -26,7 +26,7 @@
<!-- Block Newsletter module-->
<div id="newsletter_block_left" class="block">
<h4>{l s='Newsletter' mod='blocknewsletter'}</h4>
<p class="title_block">{l s='Newsletter' mod='blocknewsletter'}</p>
<div class="block_content">
{if isset($msg) && $msg}
<p class="{if $nw_error}warning_inline{else}success_inline{/if}">{$msg}</p>

4
modules/blockpaymentlogo/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockpaymentlogo</name>
<displayName><![CDATA[Block payment logo]]></displayName>
<displayName><![CDATA[Bloc logo de paiement]]></displayName>
<version><![CDATA[0.2]]></version>
<description><![CDATA[Adds a block to display all payment logos.]]></description>
<description><![CDATA[Ajoute un bloc affichant tous les logos des modes de paiement.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/blockpermanentlinks/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockpermanentlinks</name>
<displayName><![CDATA[Permanent links block]]></displayName>
<displayName><![CDATA[Bloc liens permanents]]></displayName>
<version><![CDATA[0.1]]></version>
<description><![CDATA[Adds a block that displays permanent links such as sitemap, contact, etc.]]></description>
<description><![CDATA[Ajoute un bloc qui affiche des liens permanents (contact, plan du site, ...).]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

4
modules/blockreinsurance/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockreinsurance</name>
<displayName><![CDATA[Bloc reinsurance]]></displayName>
<displayName><![CDATA[Bloc r&eacute;assurance]]></displayName>
<version><![CDATA[2.0]]></version>
<description><![CDATA[Add a block to display more infos to reassure your customers]]></description>
<description><![CDATA[Ajoute un bloc pour afficher des informations pour rassurer vos clients]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blockrss/blockrss.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block RSS module-->
<div id="rss_block_left" class="block">
<h4>{$title}</h4>
<p class="title_block">{$title}</p>
<div class="block_content">
{if $rss_links}
<ul>

4
modules/blockrss/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockrss</name>
<displayName><![CDATA[RSS feed block]]></displayName>
<displayName><![CDATA[Bloc flux RSS]]></displayName>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Adds a block displaying an RSS feed.]]></description>
<description><![CDATA[Ajoute un bloc avec les messages d&#039;un flux RSS.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blocksearch/blocksearch.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block search module -->
<div id="search_block_left" class="block exclusive">
<h4>{l s='Search' mod='blocksearch'}</h4>
<p class="title_block">{l s='Search' mod='blocksearch'}</p>
<form method="get" action="{$link->getPageLink('search', true)}" id="searchbox">
<p class="block_content">
<label for="search_query_block">{l s='Enter a product name' mod='blocksearch'}</label>

4
modules/blocksearch/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocksearch</name>
<displayName><![CDATA[Quick Search block]]></displayName>
<displayName><![CDATA[Bloc recherche rapide]]></displayName>
<version><![CDATA[1.2]]></version>
<description><![CDATA[Adds a block with a quick search field.]]></description>
<description><![CDATA[Ajoute un bloc avec un champ de recherche rapide]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[search_filter]]></tab>
<is_configurable>0</is_configurable>

4
modules/blocksharefb/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocksharefb</name>
<displayName><![CDATA[Block Share on Facebook]]></displayName>
<displayName><![CDATA[Bloc Partager sur Facebook]]></displayName>
<version><![CDATA[1.0]]></version>
<description><![CDATA[Adds a block to display a link &amp;quot;Share on Facebook&amp;quot; on product pages.]]></description>
<description><![CDATA[Ajoute un bloc permettant d&#039;avoir un lien &amp;quot;Partager sur Facebook&amp;quot; sur les pages produits.]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

2
modules/blocksocial/blocksocial.tpl
View File

@@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div id="social_block">
<div id="social_block">
<p class="title_block">{l s='Follow us' mod='blocksocial'}</p>
<ul>
{if $facebook_url != ''}<li class="facebook"><a href="{$facebook_url|escape:html:'UTF-8'}">{l s='Facebook' mod='blocksocial'}</a></li>{/if}

4
modules/blocksocial/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocksocial</name>
<displayName><![CDATA[Block social]]></displayName>
<displayName><![CDATA[Bloc social]]></displayName>
<version><![CDATA[1.0]]></version>
<description><![CDATA[Allows you to add extra information about social networks]]></description>
<description><![CDATA[Permet d&#039;ajouter des informations suppl&eacute;mentaires concernant les r&eacute;seaux sociaux]]></description>
<author><![CDATA[]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

10
modules/blockspecials/blockspecials.css
View File

@@ -4,14 +4,20 @@
font-weight:bold;
text-align:right
}
#special_block_right p.title_block {
padding:6px 11px;
text-align:left
}
#special_block_right .products li {
padding:15px 0;
width: 130px;
border:none;
}
#special_block_right li h5 {
#special_block_right li .s_title_block {
padding:0 0 3px 0;
font-size:12px
font-size:12px;
text-align:left;
}
#special_block_right .products li a {
padding:0;

4
modules/blockspecials/blockspecials.tpl
View File

@@ -25,7 +25,7 @@
<!-- MODULE Block specials -->
<div id="special_block_right" class="block products_block exclusive blockspecials">
<h4><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></h4>
<p class="title_block"><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></p>
<div class="block_content">
{if $special}
@@ -43,7 +43,7 @@
{/if}
{/if}
<h5><a href="{$special.link}" title="{$special.name|escape:html:'UTF-8'}">{$special.name|escape:html:'UTF-8'}</a></h5>
<p class="s_title_block"><a href="{$special.link}" title="{$special.name|escape:html:'UTF-8'}">{$special.name|escape:html:'UTF-8'}</a></p>
{if !$PS_CATALOG_MODE}
<span class="price-discount">{if !$priceDisplay}{displayWtPrice p=$special.price_without_reduction}{else}{displayWtPrice p=$priceWithoutReduction_tax_excl}{/if}</span>
<span class="price">{if !$priceDisplay}{displayWtPrice p=$special.price}{else}{displayWtPrice p=$special.price_tax_exc}{/if}</span>

4
modules/blockspecials/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockspecials</name>
<displayName><![CDATA[Specials block]]></displayName>
<displayName><![CDATA[Bloc promotions]]></displayName>
<version><![CDATA[0.8]]></version>
<description><![CDATA[Adds a block with current product specials.]]></description>
<description><![CDATA[Ajoute un bloc proposant les produits en promotion actuellement]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[pricing_promotion]]></tab>
<is_configurable>1</is_configurable>

2
modules/blockstore/blockstore.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block stores module -->
<div id="stores_block_left" class="block">
<h4><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></h4>
<p class="title_block"><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></p>
<div class="block_content blockstore">
<p class="store_image"><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}"><img src="{$module_dir}{$store_img}" alt="{l s='Our stores' mod='blockstore'}" width="174" height="115" /></a></p>
<p>

4
modules/blockstore/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockstore</name>
<displayName><![CDATA[Stores block]]></displayName>
<displayName><![CDATA[Bloc magasins]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Displays a block with a link to the store locator.]]></description>
<description><![CDATA[Affiche un bloc avec un lien vers la liste des magasins]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blocksupplier/blocksupplier.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block suppliers module -->
<div id="suppliers_block_left" class="block blocksupplier">
<h4>{if $display_link_supplier}<a href="{$link->getPageLink('supplier')}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</h4>
<p class="title_block">{if $display_link_supplier}<a href="{$link->getPageLink('supplier')}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</p>
<div class="block_content">
{if $suppliers}
{if $text_list}

4
modules/blocksupplier/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocksupplier</name>
<displayName><![CDATA[Suppliers block]]></displayName>
<displayName><![CDATA[Bloc fournisseurs]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Adds a block displaying suppliers.]]></description>
<description><![CDATA[Ajoute un bloc affichant les fournisseurs.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blocktags/blocktags.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block tags module -->
<div id="tags_block_left" class="block tags_block">
<h4>{l s='Tags' mod='blocktags'}</h4>
<p class="title_block">{l s='Tags' mod='blocktags'}</p>
<p class="block_content">
{if $tags}
{foreach from=$tags item=tag name=myLoop}

4
modules/blocktags/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocktags</name>
<displayName><![CDATA[Tags block]]></displayName>
<displayName><![CDATA[Bloc tags]]></displayName>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Adds a block containing a tag cloud.]]></description>
<description><![CDATA[Ajoute un bloc contenant les tags et un lien vers la recherche correspondante]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/blocktopmenu/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocktopmenu</name>
<displayName><![CDATA[Top horizontal menu]]></displayName>
<displayName><![CDATA[Menu Haut horizontal]]></displayName>
<version><![CDATA[1.5]]></version>
<description><![CDATA[Add a new menu on top of your shop.]]></description>
<description><![CDATA[Ajouter un nouveau menu en haut de votre boutique.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/blockuserinfo/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockuserinfo</name>
<displayName><![CDATA[User info block]]></displayName>
<displayName><![CDATA[Bloc informations clients]]></displayName>
<version><![CDATA[0.1]]></version>
<description><![CDATA[Adds a block that displays information about the customer.]]></description>
<description><![CDATA[Ajoute un bloc avec des liens utiles pour le client (login, d&eacute;connexion...)]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

7
modules/blockviewed/blockviewed.css
View File

@@ -16,10 +16,15 @@
margin-left: 10px;
width: 130px;
}
#viewed-products_block_left li .text_desc h5 {
#viewed-products_block_left li .text_desc .s_title_block {
padding:0 0 5px 0;
font-size:12px;
color:#333;
font-weight: bold;
}
#viewed-products_block_left li .text_desc .s_title_block a{
color:#333;
}
#viewed-products_block_left li .text_desc p,
#viewed-products_block_left li .text_desc p a {

4
modules/blockviewed/blockviewed.tpl
View File

@@ -25,7 +25,7 @@
<!-- Block Viewed products -->
<div id="viewed-products_block_left" class="block products_block">
<h4>{l s='Viewed products' mod='blockviewed'}</h4>
<p class="title_block">{l s='Viewed products' mod='blockviewed'}</p>
<div class="block_content">
<ul class="products clearfix">
{foreach from=$productsViewedObj item=viewedProduct name=myLoop}
@@ -34,7 +34,7 @@
<img src="{if isset($viewedProduct->id_image) && $viewedProduct->id_image}{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'medium_default')}{else}{$img_prod_dir}{$lang_iso}-default-medium_default.jpg{/if}" height="{$mediumSize.height}" width="{$mediumSize.width}" alt="{$viewedProduct->legend|escape:html:'UTF-8'}" />
</a>
<div class="text_desc">
<h5><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}</a></h5>
<p class="s_title_block"><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}</a></p>
<p><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->description_short|strip_tags:'UTF-8'|truncate:44}</a></p>
</div>
</li>

4
modules/blockviewed/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockviewed</name>
<displayName><![CDATA[Viewed products block]]></displayName>
<displayName><![CDATA[Bloc produits d&eacute;j&agrave; vus]]></displayName>
<version><![CDATA[0.9]]></version>
<description><![CDATA[Adds a block displaying last-viewed products.]]></description>
<description><![CDATA[Ajoute un bloc proposant les derniers produits vus par le client.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blockwishlist/blockwishlist.css
View File

@@ -222,7 +222,7 @@ ul.wlp_bought_list li .product_infos {
margin-left:10px;
width:126px
}
ul.wlp_bought_list li .product_infos h5.product_name {
ul.wlp_bought_list li .product_infos .s_title_block.product_name {
padding:5px 0;
font-size:12px;
color:#222

4
modules/blockwishlist/blockwishlist.tpl
View File

@@ -24,9 +24,9 @@
*}
<div id="wishlist_block" class="block account">
<h4>
<p class="title_block">
<a href="{$wishlist_link}">{l s='Wishlist' mod='blockwishlist'}</a>
</h4>
</p>
<div class="block_content">
<div id="wishlist_block_list" class="expanded">
{if $wishlist_products}

4
modules/blockwishlist/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockwishlist</name>
<displayName><![CDATA[Wishlist block]]></displayName>
<displayName><![CDATA[Bloc liste de cadeaux]]></displayName>
<version><![CDATA[0.2]]></version>
<description><![CDATA[Adds a block containing the customer&#039;s wishlists.]]></description>
<description><![CDATA[Ajoute un bloc g&eacute;rant les listes de cadeaux]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/blockwishlist/managewishlist.tpl
View File

@@ -56,7 +56,7 @@
</a>
</div>
<div class="product_infos">
<h5 class="product_name">{$product.name|truncate:30:'...'|escape:'htmlall':'UTF-8'}</h5>
<p id="s_title" class="product_name">{$product.name|truncate:30:'...'|escape:'htmlall':'UTF-8'}</p>
<span class="wishlist_product_detail">
{if isset($product.attributes_small)}
<a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)}" title="{l s='Product detail' mod='blockwishlist'}">{$product.attributes_small|escape:'htmlall':'UTF-8'}</a>

4
modules/carriercompare/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>carriercompare</name>
<displayName><![CDATA[Shipping Estimation]]></displayName>
<displayName><![CDATA[Estimation des livraisons]]></displayName>
<version><![CDATA[1.2]]></version>
<description><![CDATA[Module to compare carrier possibilities before using the checkout process]]></description>
<description><![CDATA[Module permettant de faire une estimation des co&ucirc;ts de livraison avant d&#039;entrer dans le processus de commande]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[shipping_logistics]]></tab>
<is_configurable>1</is_configurable>

4
modules/cashondelivery/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>cashondelivery</name>
<displayName><![CDATA[Cash on delivery (COD)]]></displayName>
<displayName><![CDATA[Comptant &agrave; la livraison]]></displayName>
<version><![CDATA[0.4]]></version>
<description><![CDATA[Accept cash on delivery payments]]></description>
<description><![CDATA[Accepte le paiement lors de la livraison]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[payments_gateways]]></tab>
<is_configurable>0</is_configurable>

6
modules/cheque/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>cheque</name>
<displayName><![CDATA[Check]]></displayName>
<displayName><![CDATA[Ch&egrave;que]]></displayName>
<version><![CDATA[2.3]]></version>
<description><![CDATA[Module for accepting payments by check.]]></description>
<description><![CDATA[Accepter les paiements par ch&egrave;que]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[payments_gateways]]></tab>
<confirmUninstall>Are you sure you want to delete your details ?</confirmUninstall>
<confirmUninstall>Êtes-vous sûr de vouloir supprimer vos paramètres ?</confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>

4
modules/crossselling/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>crossselling</name>
<displayName><![CDATA[Cross Selling]]></displayName>
<displayName><![CDATA[Ventes crois&eacute;es]]></displayName>
<version><![CDATA[0.1]]></version>
<description><![CDATA[Customers who bought this product also bought:]]></description>
<description><![CDATA[Les clients qui ont achet&eacute; ce produit ont &eacute;galement achet&eacute;...]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/dateofdelivery/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>dateofdelivery</name>
<displayName><![CDATA[Date of delivery]]></displayName>
<displayName><![CDATA[Date de livraison]]></displayName>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Displays an approximate date of delivery]]></description>
<description><![CDATA[Afficher une date approximative de livraison]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[shipping_logistics]]></tab>
<is_configurable>1</is_configurable>

4
modules/editorial/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>editorial</name>
<displayName><![CDATA[Home text editor]]></displayName>
<displayName><![CDATA[&Eacute;diteur de page d&#039;accueil]]></displayName>
<version><![CDATA[2.0]]></version>
<description><![CDATA[A text editor module for your homepage.]]></description>
<description><![CDATA[Un &eacute;diteur de texte pour votre page d&#039;accueil.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/favoriteproducts/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>favoriteproducts</name>
<displayName><![CDATA[Favorite Products]]></displayName>
<displayName><![CDATA[Produits favoris]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Display a page with the favorite products of the customer]]></description>
<description><![CDATA[Affiche une page avec les produits favoris de l&#039;utilisateur]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

4
modules/feeder/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>feeder</name>
<displayName><![CDATA[RSS products feed]]></displayName>
<displayName><![CDATA[Flux RSS des produits]]></displayName>
<version><![CDATA[0.2]]></version>
<description><![CDATA[Generate a RSS products feed]]></description>
<description><![CDATA[G&eacute;n&eacute;rer un flux RSS des produits]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

6
modules/followup/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>followup</name>
<displayName><![CDATA[Customer follow-up]]></displayName>
<displayName><![CDATA[Relance des clients]]></displayName>
<version><![CDATA[1.0]]></version>
<description><![CDATA[Follow-up with your customers with daily customized e-mails.]]></description>
<description><![CDATA[Relancez vos clients gr&acirc;ce &agrave; des envoi d&#039;e-mails quotidiens personnalis&eacute;s.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[advertising_marketing]]></tab>
<confirmUninstall>Are you sure you want to delete all settings and your logs?</confirmUninstall>
<confirmUninstall>Êtes-vous sûr de vouloir supprimer vos paramètres ainsi que vos statistiques liées aux relances ?</confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>

2
modules/graphartichow/config.xml
View File

@@ -3,7 +3,7 @@
<name>graphartichow</name>
<displayName><![CDATA[Artichow]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Artichow is a library which enables the display of simple picture-based graphs using PHP and GD.]]></description>
<description><![CDATA[Artichow est une biblioth&egrave;que qui permet d&#039;afficher des graphiques simples utilisant PHP et GD.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab>
<is_configurable>0</is_configurable>

2
modules/graphgooglechart/config.xml
View File

@@ -3,7 +3,7 @@
<name>graphgooglechart</name>
<displayName><![CDATA[Google Chart]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[The Google Chart API lets you dynamically generate charts.]]></description>
<description><![CDATA[L&#039;API Google Chart permet de g&eacute;n&eacute;rer dynamiquement des graphiques.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab>
<is_configurable>0</is_configurable>

2
modules/graphvisifire/config.xml
View File

@@ -3,7 +3,7 @@
<name>graphvisifire</name>
<displayName><![CDATA[Visifire]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Visifire is a set of open source data visualization components - powered by Microsoft Silverlight 2 beta 2.]]></description>
<description><![CDATA[Visifire est un pack de composants open-source permettant de visualiser graphiquement des donn&eacute;es. Il utilise la technologie Microsoft Silverlight 2 beta 2.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab>
<is_configurable>0</is_configurable>

2
modules/graphxmlswfcharts/config.xml
View File

@@ -3,7 +3,7 @@
<name>graphxmlswfcharts</name>
<displayName><![CDATA[XML/SWF Charts]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[XML/SWF Charts is a simple, yet powerful tool using Adobe Flash to create attractive web charts and graphs from dynamic data.]]></description>
<description><![CDATA[XML/SWF Charts est un outil simple mais puissant utilisant Adobe Flash pour cr&eacute;er des graphiques &agrave; partir de donn&eacute;es dynamiques.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab>
<is_configurable>0</is_configurable>

2
modules/gridhtml/config.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>gridhtml</name>
<displayName><![CDATA[Simple HTML table display]]></displayName>
<displayName><![CDATA[Affichage HTML simple]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[]]></description>
<author><![CDATA[PrestaShop]]></author>

2
modules/gsitemap/config.xml
View File

@@ -3,7 +3,7 @@
<name>gsitemap</name>
<displayName><![CDATA[Google sitemap]]></displayName>
<version><![CDATA[1.9]]></version>
<description><![CDATA[Generate your Google sitemap file]]></description>
<description><![CDATA[G&eacute;n&egrave;re votre fichier sitemap pour Google]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[seo]]></tab>
<is_configurable>1</is_configurable>

4
modules/homefeatured/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>homefeatured</name>
<displayName><![CDATA[Featured Products on the homepage]]></displayName>
<displayName><![CDATA[Produits phares sur la page d&#039;accueil]]></displayName>
<version><![CDATA[0.9]]></version>
<description><![CDATA[Displays Featured Products in the middle of your homepage.]]></description>
<description><![CDATA[Affiche les produits phares au centre de votre page d&#039;accueil]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

10
modules/homefeatured/homefeatured.css
View File

@@ -5,11 +5,13 @@
height:240px
}
#featured-products_block_center li.last_item_of_line {margin-right:0;}
#featured-products_block_center h5 {
#featured-products_block_center .s_title_block {
padding-top:5px;
height:30px;
font-size:12px;
color:#222
color:#222;
padding-bottom: 0;
font-weight:bold;
}
#featured-products_block_center .product_image {
@@ -39,9 +41,7 @@
}
.ie9 #featured-products_block_center .product_image span.new{top:-18px;right:-38px}
.ie8 #featured-products_block_center .product_image span.new{top:-18px;right:-38px}
.ie8 #featured-products_block_center .product_image span.new {top:-17px;}
.ie7 #featured-products_block_center .product_image span.new {top:-30px;right:-25px}
.ie8 #featured-products_block_center .product_image span.new{top:-21px;right:-38px}
.lt-ie6 #featured-products_block_center .product_image span.new {top:-30px;right:-25px}
#featured-products_block_center .product_desc {height:45px;}

4
modules/homefeatured/homefeatured.tpl
View File

@@ -25,7 +25,7 @@
<!-- MODULE Home Featured Products -->
<div id="featured-products_block_center" class="block products_block clearfix">
<h4>{l s='Featured products' mod='homefeatured'}</h4>
<p class="title_block">{l s='Featured products' mod='homefeatured'}</p>
{if isset($products) AND $products}
<div class="block_content">
{assign var='liHeight' value=250}
@@ -39,7 +39,7 @@
{if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
<li class="ajax_block_product {if $smarty.foreach.homeFeaturedProducts.first}first_item{elseif $smarty.foreach.homeFeaturedProducts.last}last_item{else}item{/if} {if $smarty.foreach.homeFeaturedProducts.iteration%$nbItemsPerLine == 0}last_item_of_line{elseif $smarty.foreach.homeFeaturedProducts.iteration%$nbItemsPerLine == 1} {/if} {if $smarty.foreach.homeFeaturedProducts.iteration > ($smarty.foreach.homeFeaturedProducts.total - $totModulo)}last_line{/if}">
<a href="{$product.link}" title="{$product.name|escape:html:'UTF-8'}" class="product_image"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product.name|escape:html:'UTF-8'}" />{if isset($product.new) && $product.new == 1}<span class="new">{l s='New' mod='homefeatured'}</span>{/if}</a>
<h5><a href="{$product.link}" title="{$product.name|truncate:50:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></h5>
<p class="s_title_block"><a href="{$product.link}" title="{$product.name|truncate:50:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></p>
<div class="product_desc"><a href="{$product.link}" title="{l s='More' mod='homefeatured'}">{$product.description_short|strip_tags|truncate:65:'...'}</a></div>
<div>
<a class="lnk_more" href="{$product.link}" title="{l s='View' mod='homefeatured'}">{l s='View' mod='homefeatured'}</a>

4
modules/homeslider/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>homeslider</name>
<displayName><![CDATA[Image slider for your homepage]]></displayName>
<displayName><![CDATA[Carrousel d&#039;image (slider) pour votre page d&#039;accueil]]></displayName>
<version><![CDATA[1.2]]></version>
<description><![CDATA[Adds an image slider to your homepage.]]></description>
<description><![CDATA[Ajouter un carrousel d&#039;images &agrave; votre page d&#039;accueil]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

6
modules/loyalty/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>loyalty</name>
<displayName><![CDATA[Customer loyalty and rewards]]></displayName>
<displayName><![CDATA[Programme de fid&eacute;lit&eacute;]]></displayName>
<version><![CDATA[1.8]]></version>
<description><![CDATA[Provide a loyalty program to your customers.]]></description>
<description><![CDATA[Propose un programme de fid&eacute;lit&eacute; &agrave; vos clients.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[pricing_promotion]]></tab>
<confirmUninstall>Are you sure you want to delete all loyalty points and customer history?</confirmUninstall>
<confirmUninstall>Êtes-vous sûr de vouloir effacer tous les points de fidélité et l'historique des points de tous vos clients ?</confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>

6
modules/mailalerts/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>mailalerts</name>
<displayName><![CDATA[Mail alerts]]></displayName>
<displayName><![CDATA[Alertes e-mail]]></displayName>
<version><![CDATA[2.4]]></version>
<description><![CDATA[Sends e-mail notifications to customers and merchants.]]></description>
<description><![CDATA[Envoie des notifications par e-mail aux clients et aux marchands.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab>
<confirmUninstall>Are you sure you want to delete all customer notifications?</confirmUninstall>
<confirmUninstall>Êtes-vous sûr de vouloir supprimer toutes les notifications clients ?</confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>

4
modules/newsletter/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>newsletter</name>
<displayName><![CDATA[Newsletter]]></displayName>
<displayName><![CDATA[Lettre d&#039;informations]]></displayName>
<version><![CDATA[2]]></version>
<description><![CDATA[Generates a .CSV file for mass mailings]]></description>
<description><![CDATA[G&eacute;n&egrave;re un fichier .CSV pour votre envoi d&#039;e-mails]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab>
<is_configurable>1</is_configurable>

4
modules/pagesnotfound/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>pagesnotfound</name>
<displayName><![CDATA[Pages not found]]></displayName>
<displayName><![CDATA[Pages introuvables]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Display the pages requested by your visitors but not found.]]></description>
<description><![CDATA[Affiche les pages demand&eacute;es mais qui n&#039;existent pas]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[analytics_stats]]></tab>
<is_configurable>0</is_configurable>

4
modules/productcomments/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>productcomments</name>
<displayName><![CDATA[Product Comments]]></displayName>
<displayName><![CDATA[Commentaires produits]]></displayName>
<version><![CDATA[2.3]]></version>
<description><![CDATA[Allows users to post reviews.]]></description>
<description><![CDATA[Permet aux client de commenter les produits.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

2
modules/productcomments/productcomments.css
View File

@@ -185,7 +185,7 @@
overflow:hidden;
width: 360px
}
#product_comments_block_tab div.comment_details h4 {padding-bottom:10px}
#product_comments_block_tab div.comment_details .title_block {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;

2
modules/productcomments/productcomments.tpl
View File

@@ -52,7 +52,7 @@ var productcomments_url_rewrite = '{$productcomments_url_rewriting_activated}';
</div>
</div>
<div class="comment_details">
<h4>{$comment.title}</h4>
<p class="title_block">{$comment.title}</p>
<p>{$comment.content|escape:'html':'UTF-8'|nl2br}</p>
<ul>
{if $comment.total_advice > 0}

4
modules/productscategory/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>productscategory</name>
<displayName><![CDATA[Products Category]]></displayName>
<displayName><![CDATA[Dans la m&ecirc;me cat&eacute;gorie]]></displayName>
<version><![CDATA[1.3]]></version>
<description><![CDATA[Display products of the same category on the product page.]]></description>
<description><![CDATA[Affiche la liste des produits dans la m&ecirc;me cat&eacute;gorie que celui affich&eacute;.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

4
modules/producttooltip/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>producttooltip</name>
<displayName><![CDATA[Product tooltips]]></displayName>
<displayName><![CDATA[Infobulles produit]]></displayName>
<version><![CDATA[1.0]]></version>
<description><![CDATA[Show how many people are watching a product page, last sale and last cart added.]]></description>
<description><![CDATA[Affiche combien de personnes consultent un produit, ainsi que les dates de derni&egrave;re commande ou d&#039;ajout au panier]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>

8
modules/referralprogram/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>referralprogram</name>
<displayName><![CDATA[Customer referral program]]></displayName>
<version><![CDATA[1.5]]></version>
<description><![CDATA[Integrate a referral program system into your shop.]]></description>
<displayName><![CDATA[Programme de parrainage client]]></displayName>
<version><![CDATA[1.5.1]]></version>
<description><![CDATA[Int&egrave;gre un programme de parrainage &agrave; votre boutique]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[advertising_marketing]]></tab>
<confirmUninstall>All sponsors and friends will be deleted. Are you sure you want to uninstall this module?</confirmUninstall>
<confirmUninstall>Toutes les informations relatives aux parrains et leurs amis seront effacées. Êtes-vous sûr de vouloir désinstaller ce module ?</confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>

4
modules/sekeywords/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>sekeywords</name>
<displayName><![CDATA[Search engine keywords]]></displayName>
<displayName><![CDATA[Mots-cl&eacute;s]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Display which keywords have led visitors to your website.]]></description>
<description><![CDATA[Affiche les mots-cl&eacute;s qui ont men&eacute; les visiteurs jusqu&#039;&agrave; votre boutique.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[analytics_stats]]></tab>
<is_configurable>0</is_configurable>

4
modules/sendtoafriend/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>sendtoafriend</name>
<displayName><![CDATA[Send to a Friend module]]></displayName>
<displayName><![CDATA[Module envoyer &agrave; un ami]]></displayName>
<version><![CDATA[1.2]]></version>
<description><![CDATA[Allows customers to send a product link to a friend.]]></description>
<description><![CDATA[Permet &agrave; vos clients d&#039;envoyer des liens &agrave; leurs amis.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>

4
modules/statsbestcategories/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>statsbestcategories</name>
<displayName><![CDATA[Best categories]]></displayName>
<displayName><![CDATA[Meilleures cat&eacute;gories]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[A list of the best categories]]></description>
<description><![CDATA[Liste des meilleures cat&eacute;gories]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[analytics_stats]]></tab>
<is_configurable>0</is_configurable>

4
modules/statsbestcustomers/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>statsbestcustomers</name>
<displayName><![CDATA[Best customers]]></displayName>
<displayName><![CDATA[Meilleurs clients]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[A list of the best customers]]></description>
<description><![CDATA[Classement des meilleurs clients]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[analytics_stats]]></tab>
<is_configurable>0</is_configurable>

4
modules/statsbestmanufacturers/config.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>statsbestmanufacturers</name>
<displayName><![CDATA[Best manufacturers]]></displayName>
<displayName><![CDATA[Meilleur fabricants ]]></displayName>
<version><![CDATA[1.0]]></version>
<description><![CDATA[A list of the best manufacturers]]></description>
<description><![CDATA[Une liste des meilleurs fabricants ]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[analytics_stats]]></tab>
<is_configurable>0</is_configurable>

Some files were not shown because too many files have changed in this diff Show More