diff --git a/classes/Mail.php b/classes/Mail.php index 783983964..f8de31491 100644 --- a/classes/Mail.php +++ b/classes/Mail.php @@ -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')); diff --git a/modules/bankwire/config.xml b/modules/bankwire/config.xml index 08550b4b3..919e6ac6b 100755 --- a/modules/bankwire/config.xml +++ b/modules/bankwire/config.xml @@ -1,12 +1,12 @@ bankwire - + - + - Are you sure you want to delete your details? + Êtes-vous certain de vouloir effacer vos données ? 1 1 diff --git a/modules/blockadvertising/config.xml b/modules/blockadvertising/config.xml index 9830b4ea6..62b227aae 100755 --- a/modules/blockadvertising/config.xml +++ b/modules/blockadvertising/config.xml @@ -1,9 +1,9 @@ blockadvertising - + - + 1 diff --git a/modules/blockbestsellers/blockbestsellers-home.tpl b/modules/blockbestsellers/blockbestsellers-home.tpl index d1b6ada44..993016294 100644 --- a/modules/blockbestsellers/blockbestsellers-home.tpl +++ b/modules/blockbestsellers/blockbestsellers-home.tpl @@ -25,7 +25,7 @@
-

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

+

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

{if isset($best_sellers) AND $best_sellers}
{assign var='liHeight' value=320} @@ -36,7 +36,7 @@
    {foreach from=$best_sellers item=product name=myLoop}
  • -
    {$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}
    +

    {$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}

    {$product.name|escape:html:'UTF-8'}
    diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl index 59a4df44a..4446cc7a3 100644 --- a/modules/blockbestsellers/blockbestsellers.tpl +++ b/modules/blockbestsellers/blockbestsellers.tpl @@ -25,7 +25,7 @@
    -

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

    +

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

    {if $best_sellers|@count > 0}
      diff --git a/modules/blockbestsellers/config.xml b/modules/blockbestsellers/config.xml index 9bf0a39be..756a5282a 100755 --- a/modules/blockbestsellers/config.xml +++ b/modules/blockbestsellers/config.xml @@ -1,9 +1,9 @@ blockbestsellers - + - + 1 diff --git a/modules/blockcart/blockcart.css b/modules/blockcart/blockcart.css index 1e0fac942..7938aabe9 100644 --- a/modules/blockcart/blockcart.css +++ b/modules/blockcart/blockcart.css @@ -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; diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index 32574a6f1..cfe1f7ee5 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -43,13 +43,13 @@ var delete_txt = '{l s='Delete' mod='blockcart'}';
      -

      +

      {l s='Cart' mod='blockcart'} {if $ajax_allowed}     {/if} -

      +

      diff --git a/modules/blockcart/config.xml b/modules/blockcart/config.xml index cb1badd0e..3647d19d7 100755 --- a/modules/blockcart/config.xml +++ b/modules/blockcart/config.xml @@ -1,9 +1,9 @@ blockcart - + - + 1 diff --git a/modules/blockcategories/blockcategories.tpl b/modules/blockcategories/blockcategories.tpl index 11f574448..2ea4775ee 100644 --- a/modules/blockcategories/blockcategories.tpl +++ b/modules/blockcategories/blockcategories.tpl @@ -25,7 +25,7 @@
      -

      {l s='Categories' mod='blockcategories'}

      +

      {l s='Categories' mod='blockcategories'}

        {foreach from=$blockCategTree.children item=child name=blockCategTree} diff --git a/modules/blockcategories/blockcategories_footer.tpl b/modules/blockcategories/blockcategories_footer.tpl index 439b1e49e..681f87130 100644 --- a/modules/blockcategories/blockcategories_footer.tpl +++ b/modules/blockcategories/blockcategories_footer.tpl @@ -25,7 +25,7 @@