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

admin-dev/themes/default/template/controllers/stats/menu.tpl

@@ -28,7 +28,7 @@
 		{if count($modules)}
 			{foreach $modules as $module}
 				{if $module_instance[$module.name]}
-					<a class="list-group-item{if ($current_module_name && $current_module_name == $module.name) || (!$current_module_name && $module@first)} active{/if}" href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
+					<a class="list-group-item{if ($current_module_name && $current_module_name == $module.name)} active{/if}" href="{$current}&token={$token}&module={$module.name}">{$module_instance[$module.name]->displayName}</a>
 				{/if}
 			{/foreach}
 		{else}

admin-dev/themes/default/template/header.tpl

@@ -283,6 +283,11 @@
 						$('#bo_query').attr("placeholder",$(this).data('placeholder'));
 						$('#bo_query').focus();
 					});
+					{if isset($search_type) && $search_type}
+						$(document).ready(function() {
+							$('.search-option a[data-value='+{$search_type|intval}+']').click();
+						});
+					{/if}
 				</script>
 
 			<!-- js 
@@ -294,7 +299,6 @@
 					OK - set active on right list item
 					OK - focus input field
 					OK - change place holder
-					- use change for first init
 					- clear search
 					(?) - keep focus state when keyword exists
 

controllers/admin/AdminAttachmentsController.php

@@ -37,6 +37,7 @@ class AdminAttachmentsControllerCore extends AdminController
 	 	$this->lang = true;
 
 		$this->addRowAction('edit');
+		$this->addRowAction('view');
 		$this->addRowAction('delete');
 
 		$this->_select = 'IFNULL(virtual.products, 0) as products';
@@ -76,6 +77,16 @@ class AdminAttachmentsControllerCore extends AdminController
 		parent::initPageHeaderToolbar();
 	}
 
+	public function renderView()
+	{
+		if (($obj = $this->loadObject(true)) && Validate::isLoadedObject($obj))
+		{
+			$link = $this->context->link->getPageLink('attachment', true, NULL, 'id_attachment='.$obj->id);
+			Tools::redirectLink($link);
+		}
+		return $this->displayWarning($this->l('File not found'));
+	}
+
 	public function renderForm()
 	{
 		if (($obj = $this->loadObject(true)) && Validate::isLoadedObject($obj))

controllers/admin/AdminStatsTabController.php

@@ -166,7 +166,7 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
 
 		$tpl->assign(array(
 			'current' => self::$currentIndex,
-			'current_module_name' => Tools::getValue('module'),
+			'current_module_name' => Tools::getValue('module', 'statsforecast'),
 			'token' => $this->token,
 			'modules' => $modules,
 			'module_instance' => $module_instance

controllers/admin/AdminTranslationsController.php

@@ -154,6 +154,28 @@ class AdminTranslationsControllerCore extends AdminController
 		return $this->{$method_name}();
 	}
 
+	public function initPageHeaderToolbar()
+	{
+		parent::initPageHeaderToolbar();
+
+		if (Tools::getValue('lang'))
+		{
+			$this->page_header_toolbar_btn['save-and-stay'] = array(
+				'short' => 'SaveAndStay',
+				'href' => '#',
+				'desc' => $this->l('Save and stay'),
+			);
+			$this->page_header_toolbar_btn['save'] = array(
+				'href' => '#',
+				'desc' => $this->l('Update translations')
+			);
+			$this->page_header_toolbar_btn['cancel'] = array(
+				'href' => self::$currentIndex.'&token='.$this->token,
+				'desc' => $this->l('Cancel')
+			);
+		}
+	}
+
 	/**
 	 * AdminController::initToolbar() override
 	 * @see AdminController::initToolbar()

index.php

@@ -26,4 +26,3 @@
 
 require(dirname(__FILE__).'/config/config.inc.php');
 Dispatcher::getInstance()->dispatch();
-

install-dev/data/xml/configuration.xml

@@ -567,7 +567,7 @@
       <value>1</value>
     </configuration>
     <configuration id="PS_STATS_RENDER" name="PS_STATS_RENDER">
-      <value>graphxmlswfcharts</value>
+      <value>graphnvd3</value>
     </configuration>
     <configuration id="PS_STATS_OLD_CONNECT_AUTO_CLEAN" name="PS_STATS_OLD_CONNECT_AUTO_CLEAN">
       <value>never</value>

install-dev/models/install.php

@@ -538,10 +538,7 @@ class InstallModelInstall extends InstallAbstractModel
 				'dashtrends',
 				'dashgoals',
 				'dashproducts',
-				'graphartichow',
+				'graphnvd3',
-				'graphgooglechart',
-				'graphvisifire',
-				'graphxmlswfcharts',
 				'gridhtml',
 				'homefeatured',
 				'homeslider',

mails/en/account.html

@@ -59,7 +59,7 @@
 </tr>
 <tr>
 	<td style="border:none;padding:7px 0">
-		<span>You can now place orders on our shop: <a href="{shop_url}" style="color:#337ff1">{shop_name}</a>.</span>
+		<span>You can now place orders on our shop: <a href="{shop_url}" style="color:#337ff1">{shop_name}</a></span>
 	</td>
 </tr>
 

mails/en/account.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname},
 
@@ -23,8 +23,8 @@ Important Security Tips:
 notify us immediately.
 
 You can now place orders on our shop: {shop_name}
-[http://safe.shell.la/{shop_url}]. 
+[{shop_url}] 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/backoffice_order.html

@@ -31,9 +31,9 @@
 <tr>
 	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
 		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
-			A new command has been generated to you.		</p>
+			A new order has been generated on your behalf.		</p>
 		<span style="color:#777">
-			Go on <a href="{order_link}" style="color:#337ff1">{order_link}</a> to finalize the payment.		</span>
+			Please go on <a href="{order_link}" style="color:#337ff1">{order_link}</a> to finalize the payment.		</span>
 	</td>
 </tr>
 

mails/en/backoffice_order.txt

@@ -1,11 +1,12 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
-A new command has been generated to you. Go on {order_link}
+A new order has been generated on your behalf. Please go on
-[http://safe.shell.la/{order_link}] to finalize the payment. 
+{order_link} [{order_link}] to finalize the
+payment. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/bankwire.html

@@ -23,7 +23,7 @@
 <tr>
 	<td align="center" style="border:none;padding:7px 0">
 		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
-		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for shopping at {shop_name}!</span>
+		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for shopping with {shop_name}!</span>
 	</td>
 </tr>
 <tr>
@@ -46,7 +46,7 @@
 		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
 			You have selected to pay by wire transfer.		</p>
 		<span style="color:#777">
-			Here are the bank details for your wire or transfer:<br /> 
+			Here are the bank details for your transfer:<br /> 
 			<span style="color:#777"><strong>Amount:</strong></span> {total_paid}<br />
 			<span style="color:#777"><strong>Account owner:</strong></span> {bankwire_owner}<br />
 			<span style="color:#777"><strong>Account details:</strong></span> {bankwire_details}<br />

mails/en/bankwire.txt

@@ -1,16 +1,16 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname},
 
-Thank you for shopping at {shop_name}! 
+Thank you for shopping with {shop_name}! 
 
 Order {order_name} - Awaiting wire payment Your order with the
 reference {ORDER_NAME} has been placed successfully and will be
 SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT. 
 
 You have selected to pay by wire transfer. Here are the bank details
-for your wire or transfer:
+for your transfer:
 
 AMOUNT: {total_paid}
 
@@ -21,14 +21,14 @@ ACCOUNT DETAILS: {bankwire_details}
 BANK ADDRESS: {bankwire_address} 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/cheque.html

@@ -23,7 +23,7 @@
 <tr>
 	<td align="center" style="border:none;padding:7px 0">
 		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
-		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for shopping at {shop_name}!</span>
+		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for shopping with {shop_name}!</span>
 	</td>
 </tr>
 <tr>
@@ -43,9 +43,9 @@
 <tr>
 	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
 		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
-			You have selected to pay by check. Please include on your check.		</p>
+			You have selected to pay by check.		</p>
 		<span style="color:#777">
-			Here are the bank details for your wire or transfer:<br /> 
+			Here are the bank details for your check:<br /> 
 			<span style="color:#777"><strong>Amount:</strong></span> {total_paid}<br />
 			<span style="color:#777"><strong>Payable to the order of:</strong></span> {cheque_name}<br />
 			<span style="color:#777"><strong>Please mail your check to:</strong></span> {cheque_address_html}

mails/en/cheque.txt

@@ -1,16 +1,16 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname},
 
-Thank you for shopping at {shop_name}! 
+Thank you for shopping with {shop_name}! 
 
 Order {order_name} - Awaiting check payment Your order with the
 reference {ORDER_NAME} has been placed successfully and will be
 SHIPPED AS SOON AS WE RECEIVE YOUR PAYMENT. 
 
-You have selected to pay by check. Please include on your check. Here
+You have selected to pay by check. Here are the bank details for your
-are the bank details for your wire or transfer:
+check:
 
 AMOUNT: {total_paid}
 
@@ -19,14 +19,14 @@ PAYABLE TO THE ORDER OF: {cheque_name}
 PLEASE MAIL YOUR CHECK TO: {cheque_address_html} 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/contact.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -11,6 +11,6 @@ ORDER ID: {order_name}
 
 ATTACHED FILE: {attached_file} 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/contact_form.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -16,6 +16,6 @@ ATTACHED FILE: {attached_file}
 
 We will answer as soon as possible. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/credit_slip.html

@@ -31,7 +31,7 @@
 <tr>
 	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
 		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
-			Your order with the reference {order_name} - Credit slip created		</p>
+			Order {order_name}&nbsp;-&nbsp;Credit slip created		</p>
 		<span style="color:#777">
 			We have generated a credit slip in your name for order with the reference <span style="color:#777"><strong>{order_name}</strong></span>.		</span>
 	</td>

mails/en/credit_slip.txt

@@ -1,17 +1,16 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
-Your order with the reference {order_name} - Credit slip created We
+Order {order_name} - Credit slip created We have generated a credit
-have generated a credit slip in your name for order with the reference
+slip in your name for order with the reference {ORDER_NAME}. 
-{ORDER_NAME}. 
 
 You can review this credit slip and download your invoice from the
-"My credit slips" [http://safe.shell.la/{history_url}] section of your
+"My credit slips" [{history_url}] section of your
 account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/download_product.html

@@ -23,7 +23,7 @@
 <tr>
 	<td align="center" style="border:none;padding:7px 0">
 		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
-		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for your order from <strong>{shop_name}</strong></span>
+		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for your order with the reference {order_name} from <strong>{shop_name}</strong></span>
 	</td>
 </tr>
 <tr>

mails/en/download_product.txt

@@ -1,9 +1,10 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname},
 
-Thank you for your order from {SHOP_NAME} 
+Thank you for your order with the reference {order_name} from
+{SHOP_NAME} 
 
 Product(s) now available for download You have {NBPRODUCTS}
 product(s) now available for download using the following link(s):
@@ -11,15 +12,15 @@ product(s) now available for download using the following link(s):
 {virtualProducts} 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
 "Guest Tracking"
-[http://safe.shell.la/{guest_tracking_url}?id_order={order_name}]
+[{guest_tracking_url}?id_order={order_name}]
 section on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/employee_password.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -14,6 +14,6 @@ PASSWORD: {passwd}
 
 E-MAIL ADDRESS: {email} 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/footer.txt

@@ -1,4 +1,4 @@
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/forward_msg.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -10,6 +10,6 @@ DISCUSSION HISTORY: {messages}
 
 {EMPLOYEE} added "{COMMENT}" 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/guest_to_customer.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -14,6 +14,6 @@ Please be careful when sharing these login details with others.
 
 You can access your customer account on our shop: {SHOP_URL} 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/header.txt

@@ -1,3 +1,3 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 

mails/en/in_transit.html

@@ -34,7 +34,8 @@
 			Order {order_name}&nbsp;-&nbsp;In transit		</p>
 		<span style="color:#777">
 			Your order with the reference <span style="color:#777"><strong>{order_name}</strong></span> is currently in transit. <br /><br />
-			You can track your package using the following link: <a href="{followup}" style="color:#337ff1">{followup}</a>		</span>
+			You can track your package using the following link: <a href="{followup}" style="color:#337ff1">{followup}</a>
+		</span>
 	</td>
 </tr>
 <tr>

mails/en/in_transit.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -7,17 +7,17 @@ Order {order_name} - In transit Your order with the reference
 {ORDER_NAME} is currently in transit. 
 
 You can track your package using the following link: {followup}
-[http://safe.shell.la/{followup}] 
+[{followup}] 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/log_alert.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -9,6 +9,6 @@ log alert in your Back Office.
 You can check for it in the "TOOLS" > "LOGS" section of your Back
 Office. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/newsletter.txt

@@ -1,10 +1,10 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
 {message} 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/order_canceled.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -10,14 +10,14 @@ You can check for it in the "TOOLS" > "LOGS" section of your Back
 Office. 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/order_changed.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -10,14 +10,14 @@ You can check for it in the "TOOLS" > "LOGS" section of your Back
 Office. 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/order_conf.html

@@ -23,7 +23,7 @@
 <tr>
 	<td align="center" style="border:none;padding:7px 0">
 		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
-		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for shopping at {shop_name}!</span>
+		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for shopping with {shop_name}!</span>
 	</td>
 </tr>
 <tr>

mails/en/order_conf.txt

@@ -1,9 +1,9 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname},
 
-Thank you for shopping at {shop_name}! 
+Thank you for shopping with {shop_name}! 
 
 Order details ORDER: {order_name} Placed on {date}
 
@@ -56,14 +56,14 @@ Delivery address {delivery_block_html}
 Billing address {invoice_block_html} 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/order_customer_comment.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -10,6 +10,6 @@ CUSTOMER: {firstname} {lastname} ({email})
 
 {message} 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/order_merchant_comment.html

@@ -31,7 +31,7 @@
 <tr>
 	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
 		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
-			New message from {shop_name}		</p>
+			Message from {shop_name}		</p>
 		<span style="color:#777">
 			You have received a new message from <span style="color:#777"><strong>{shop_name}</strong></span> regarding order with the reference <span style="color:#777"><strong>{order_name}</strong></span>.<br /><br />
 			<span style="color:#777"><strong>Message:</strong></span> {message}

mails/en/order_merchant_comment.txt

@@ -1,13 +1,13 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
-New message from {shop_name} You have received a new message from
+Message from {shop_name} You have received a new message from
 {SHOP_NAME} regarding order with the reference {ORDER_NAME}.
 
 MESSAGE: {message} 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/order_return_state.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -10,10 +10,10 @@ your return #{id_order_return}, the new status is:
 MESSAGE: {message} 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/outofstock.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname},
 
@@ -12,14 +12,14 @@ your delivery. Please accept our apologies and rest assured that we
 are working hard to rectify this. 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/password.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -8,14 +8,14 @@ Your new {shop_name} login details E-MAIL ADDRESS: {email}
 PASSWORD: {passwd} 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/password_query.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -10,8 +10,8 @@ Please note that this will change your current password.
 
 To confirm this action, please use the following link: 
 
-{url} [http://safe.shell.la/{url}] 
+{url} [{url}] 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/payment.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname},
 
@@ -9,14 +9,14 @@ Order {order_name} - Payment processed Your payment for order with
 the reference {ORDER_NAME} was successfully processed. 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/payment_error.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -10,14 +10,14 @@ Please contact us at your earliest convenience.
 WE CANNOT SHIP YOUR ORDER UNTIL WE RECEIVE YOUR PAYMENT. 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/preparation.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -7,14 +7,14 @@ Order {order_name} - Processing We are currently processing your
 {SHOP_NAME} order with the reference {ORDER_NAME}. 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/refund.html

@@ -30,10 +30,10 @@
 </tr>
 <tr>
 	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
-		<p style="margin:3px 0 7px">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
 			Order {order_name}&nbsp;-&nbsp;Refund processed		</p>
-		<span>
+		<span style="color:#777">
-			We have processed your <strong><span>{shop_name}</strong></span> refund for order with the reference <strong><span>{order_name}</strong></span>.		</span>
+			We have processed your <strong><span style="color:#777">{shop_name}</span></strong> refund for order with the reference <strong><span style="color:#777">{order_name}</span></strong>.		</span>
 	</td>
 </tr>
 <tr>
@@ -62,7 +62,7 @@
 						</tr>
 					</table>
 				</td>
-				<td class="space" style="width:20px">&nbsp;</td>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
 			</tr>
 		</table>
 	</body>

mails/en/refund.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -7,14 +7,14 @@ Order {order_name} - Refund processed We have processed your
 {SHOP_NAME} refund for order with the reference {ORDER_NAME}. 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/reply_msg.txt

@@ -1,19 +1,19 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
 {reply} 
 
 You can review your order and download your invoice from the
-"Order history" [http://safe.shell.la/{history_url}] section of your
+"Order history" [{history_url}] section of your
 customer account by clicking "My account"
-[http://safe.shell.la/{my_account_url}] on our shop. 
+[{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
-"Guest Tracking" [http://safe.shell.la/{guest_tracking_url}] section
+"Guest Tracking" [{guest_tracking_url}] section
 on our shop. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/shipped.html

@@ -41,7 +41,7 @@
 <tr>
 	<td style="border:none;padding:7px 0">
 		<span>
-			You can now place orders on our shop: <a href="{shop_url}" style="color:#337ff1">{shop_name}</a>.
+			You can now place orders on our shop: <a href="{shop_url}" style="color:#337ff1">{shop_name}</a>
 		</span>
 	</td>
 </tr>

mails/en/shipped.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname},
 
@@ -12,8 +12,8 @@ You will soon receive a URL to track the delivery progress of your
 package. 
 
 You can now place orders on our shop: {shop_name}
-[http://safe.shell.la/{shop_url}]. 
+[{shop_url}] 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/src/refund.php

@@ -14,7 +14,7 @@
 			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Refund processed'); ?>
 		</p>
 		<span>
-			<?php echo t('We have processed your <strong><span>{shop_name}</span><strong/> refund for order with the reference <strong><span>{order_name}</span></strong>.'); ?>
+			<?php echo t('We have processed your <strong><span>{shop_name}</span></strong> refund for order with the reference <strong><span>{order_name}</span></strong>.'); ?>
 		</span>
 	</td>
 </tr>

mails/en/test.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hello 
 
@@ -7,6 +7,6 @@ This is a TEST E-MAIL from your shop.
 
 If you can read this, the test was successful!. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/voucher.html

@@ -34,7 +34,7 @@
 			Order {order_name}&nbsp;-&nbsp;Voucher created		</p>
 		<span style="color:#777">
 			A voucher has been created in your name as a result of your order with the reference <span style="color:#777"><strong>{order_name}</strong></span>.<br/><br/>
-			<span style="color:#777"><strong>Voucher code: {voucher_num}</strong></span> in the amount of <span style="color:#777"><strong>{voucher_amount}</strong></span></strong><br /><br />
+			<span style="color:#777"><strong>Voucher code: {voucher_num}</strong></span> in the amount of <span style="color:#777"><strong>{voucher_amount}</strong></span><br /><br />
 			Simply copy/paste this code during the payment process for your next order.		</span>
 	</td>
 </tr>

mails/en/voucher.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -11,6 +11,6 @@ VOUCHER CODE: {VOUCHER_NUM} in the amount of {VOUCHER_AMOUNT}
 Simply copy/paste this code during the payment process for your next
 order. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

mails/en/voucher_new.txt

@@ -1,5 +1,5 @@
 
-[http://safe.shell.la/{shop_url}] 
+[{shop_url}] 
 
 Hi {firstname} {lastname}, 
 
@@ -9,6 +9,6 @@ code of your voucher: {VOUCHER_NUM}
 Simply copy/paste this code during the payment process for your next
 order. 
 
-{shop_name} [http://safe.shell.la/{shop_url}] powered by
+{shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/] 
 

modules/blocknewsletter/mails/en/footer.html

@@ -0,0 +1,15 @@
+						<tr>
+							<td class="space_footer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="footer">
+								<span><a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a></span>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td class="space">&nbsp;</td>
+			</tr>
+		</table>
+	</body>
+</html>

modules/blocknewsletter/mails/en/footer.txt

@@ -0,0 +1,4 @@
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
+

modules/blocknewsletter/mails/en/header.html

@@ -0,0 +1,21 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Message from {shop_name}</title>
+		
+	</head>
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>

modules/blocknewsletter/mails/en/header.txt

@@ -0,0 +1,3 @@
+
+[{shop_url}] 
+

modules/blocknewsletter/mails/en/newsletter_conf.html

@@ -1,34 +1,52 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: {color}; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi,</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<span style="color:#777"><strong>
+			Thank you for subscribing to our newsletter.		</strong></span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Thank you for subscribing to our newsletter</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com">PrestaShop</a>&trade;</td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-</tbody>
+			</tr>
-</table>
+		</table>
-</body>
+	</body>
 </html>

modules/blocknewsletter/mails/en/newsletter_conf.txt

@@ -1,7 +1,10 @@
-Hi
 
-Thank you for subscribing to our newsletter.
+[{shop_url}] 
 
+Hi, 
 
+THANK YOU FOR SUBSCRIBING TO OUR NEWSLETTER. 
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
 
-{shop_url} powered by PrestaShop™

modules/blocknewsletter/mails/en/newsletter_verif.html

@@ -1,37 +1,54 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: {color}; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi,</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<span style="color:#777">
+			Thank you for subscribing to our newsletter, please confirm your request by clicking the link below :<br/>
+			<span style="color:#777"><strong><a href="{verif_url}" style="color:#337ff1">{verif_url}</a></strong></span>
+		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td>Thank you for subscribing to our newsletter, please confirm your request by clicking the link below :</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td><a href="{verif_url}">{verif_url}</a></td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td>&nbsp;</td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-<tr>
+			</tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> Powered by&nbsp;<a href="http://www.prestashop.com">PrestaShop</a>&trade;</td>
+		</table>
-</tr>
+	</body>
-</tbody>
-</table>
-</body>
 </html>

modules/blocknewsletter/mails/en/newsletter_verif.txt

@@ -1,6 +1,13 @@
+
+[{shop_url}] 
+
 Hi, 
 
-Thank you for subscribing to our newsletter, please confirm your request by clicking the link below:
+Thank you for subscribing to our newsletter, please confirm your
-{verif_url}
+request by clicking the link below :
+
+{VERIF_URL} [HTTP://SAFE.SHELL.LA/{VERIF_URL}] 
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
 
-{shop_url} powered by PrestaShop™

modules/blocknewsletter/mails/en/newsletter_voucher.html

@@ -1,40 +1,55 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi,</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			Newsletter subscription		</p>
+		<span style="color:#777">
+			Regarding your newsletter subscription, we are pleased to offer you the following voucher: <span style="color:#777"><strong>{discount}</strong></span>
+		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Newsletter subscription</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td align="left">Regarding your newsletter subscription, we are pleased to offer you the following voucher: {discount}</td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-<tr>
+			</tr>
-<td>&nbsp;</td>
+		</table>
-</tr>
+	</body>
-<tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
-</tr>
-</tbody>
-</table>
-</body>
 </html>

modules/blocknewsletter/mails/en/newsletter_voucher.txt

@@ -1,9 +1,11 @@
-Hi
 
-Regarding your newsletter subscription, we are pleased to offer you the following voucher: {discount}
+[{shop_url}] 
 
-{shop_name} - {shop_url}
+Hi, 
 
+Newsletter subscription Regarding your newsletter subscription, we
+are pleased to offer you the following voucher: {DISCOUNT} 
 
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
 
-{shop_url} Powered by PrestaShop™

modules/blockwishlist/mails/en/footer.html

@@ -0,0 +1,15 @@
+						<tr>
+							<td class="space_footer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="footer">
+								<span><a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a></span>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td class="space">&nbsp;</td>
+			</tr>
+		</table>
+	</body>
+</html>

modules/blockwishlist/mails/en/footer.txt

@@ -0,0 +1,4 @@
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
+

modules/blockwishlist/mails/en/header.html

@@ -0,0 +1,21 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Message from {shop_name}</title>
+		
+	</head>
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>

modules/blockwishlist/mails/en/header.txt

@@ -0,0 +1,3 @@
+
+[{shop_url}] 
+

modules/blockwishlist/mails/en/src/wishlink.php

@@ -14,7 +14,7 @@
 			<?php echo t('Message from {shop_name}'); ?>
 		</p>
 		<span>
-			<span><strong>{shop_name}</strong></span> <?php echo t('invites you to send this link to your friends, so they can see your wishlist:'); ?> <span><strong>{wishlist}</strong></span><br /><br />
+			<?php echo t('<span><strong>{shop_name}</strong></span> invites you to send this link to your friends, so they can see your wishlist:'); ?> <span><strong>{wishlist}</strong></span><br /><br />
 			<a title="WishList" href="{message}">{message}</a>
 		</span>
 	</td>

modules/blockwishlist/mails/en/src/wishlist.php

@@ -14,7 +14,7 @@
 			<?php echo t('Message from {shop_name}'); ?>
 		</p>
 		<span>
-			<span><strong>{firstname} {lastname}</strong></span> <?php echo t('indicated you may want to see his/her wishlist:'); ?> <span><strong>{wishlist}</strong></span><br /><br />
+			<?php echo t('<span><strong>{firstname} {lastname}</strong></span> indicated you may want to see his/her wishlist:'); ?> <span><strong>{wishlist}</strong></span><br /><br />
 			<a title="WishList" href="{message}">{wishlist}</a>
 		</span>
 	</td>

modules/blockwishlist/mails/en/wishlink.html

@@ -1,40 +1,56 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi,</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			Message from {shop_name}		</p>
+		<span style="color:#777">
+			<span style="color:#777"><strong>{shop_name}</strong></span> invites you to send this link to your friends, so they can see your wishlist: <span style="color:#777"><strong>{wishlist}</strong></span><br /><br />
+			<a title="WishList" href="{message}" style="color:#337ff1">{message}</a>
+		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Message from {shop_name}</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td align="left"><strong>{shop_name} invites you to send this link to your friends, so they can see your wishlist {wishlist} :</strong> <br /><br /> <a title="WishList" href="{message}">{message}</a></td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-<tr>
+			</tr>
-<td>&nbsp;</td>
+		</table>
-</tr>
+	</body>
-<tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> realised with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
-</tr>
-</tbody>
-</table>
-</body>
 </html>

modules/blockwishlist/mails/en/wishlink.txt

@@ -1,7 +1,13 @@
+
+[{shop_url}] 
+
 Hi, 
 
-{shop_name} invites you to send this link to your friends, so they can see your wishlist {wishlist} :
+Message from {shop_name} {SHOP_NAME} invites you to send this link to
+your friends, so they can see your wishlist: {WISHLIST}
 
-{message}
+{message} [{message}] 
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
 
-{shop_url} realised by PrestaShop™

modules/blockwishlist/mails/en/wishlist.html

@@ -1,40 +1,56 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from a customer of {shop_name}</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi,</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			Message from {shop_name}		</p>
+		<span style="color:#777">
+			<span style="color:#777"><strong>{firstname} {lastname}</strong></span> indicated you may want to see his/her wishlist: <span style="color:#777"><strong>{wishlist}</strong></span><br /><br />
+			<a title="WishList" href="{message}" style="color:#337ff1">{wishlist}</a>
+		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Message from {shop_name}</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td align="left"><strong>{firstname} {lastname} indicated you may want to see his/her wishlist {wishlist} :</strong> <br /><br /> <a title="WishList" href="{message}">{wishlist}</a></td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-<tr>
+			</tr>
-<td>&nbsp;</td>
+		</table>
-</tr>
+	</body>
-<tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> Powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
-</tr>
-</tbody>
-</table>
-</body>
 </html>

modules/blockwishlist/mails/en/wishlist.txt

@@ -1,8 +1,13 @@
+
+[{shop_url}] 
+
 Hi, 
 
-{firstname} {lastname} indicated you may want to see his/her wishlist {wishlist} :
+Message from {shop_name} {FIRSTNAME} {LASTNAME} indicated you may
-{message}
+want to see his/her wishlist: {WISHLIST}
 
+{wishlist} [{message}] 
 
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
 
-{shop_url} Powered by PrestaShop™

modules/followup/mails/en/followup_1.html

@@ -1,46 +1,68 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: {color};">{firstname} {lastname}</strong>,</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			Your cart at {shop_name}		</p>
+		<span style="color:#777">
+			We noticed that during your last visit on {shop_name}, you did not complete the order you had started.<br /> <br /> 
+			Your cart has been saved, you can resume your order by visiting our shop: <span style="color:#777"><strong><a title="{shop_name}" href="{shop_url}" style="color:#337ff1">{shop_url}</a></strong></span><br /><br />
+			As an incentive, we can give you a discount of {amount}% off your next order! This offer is valid for <span style="color:#777"><strong>{days}</strong></span> days, so do not waste a moment!		</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your cart at {shop_name}</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			Your {shop_name} login details		</p>
+		<span style="color:#777">
+			<span style="color:#777"><strong>Here is your coupon:</strong></span> {voucher_num}<br />
+			Enter this code in your shopping cart to get your discount.		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td align="left">We noticed that during your last visit on {shop_name}, you did not complete the order you had started.<br /><br /> Your cart has been saved, you can resume your order by visiting our shop:<br /><br /> <a title="{shop_name}" href="{shop_url}">{shop_url}</a><br /><br /> As an incentive, we can give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td align="left">Here is your coupon: <strong>{voucher_num}</strong><br /><br /> Enter this code in your shopping cart to get your discount.</td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-<tr>
+			</tr>
-<td>&nbsp;</td>
+		</table>
-</tr>
+	</body>
-<tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
-</tr>
-</tbody>
-</table>
-</body>
 </html>

modules/followup/mails/en/followup_1.txt

@@ -1,13 +1,22 @@
-Hello {firstname} {lastname},
 
-We noticed that during your last visit on {shop_name}, you did not complete the order you had started.
+[{shop_url}] 
 
-Your cart has been saved, you can resume your order by visiting our shop:
+Hi {firstname} {lastname}, 
 
-{shop_url}
+Your cart at {shop_name} We noticed that during your last visit on
+{shop_name}, you did not complete the order you had started.
 
-As an incentive, we can give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!
+Your cart has been saved, you can resume your order by visiting our
+shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}]
 
-Here is your coupon: {voucher_num}
+As an incentive, we can give you a discount of {amount}% off your
+next order! This offer is valid for {DAYS} days, so do not waste a
+moment! 
+
+Your {shop_name} login details HERE IS YOUR COUPON: {voucher_num}
 
 Enter this code in your shopping cart to get your discount. 
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
+

modules/followup/mails/en/followup_2.html

@@ -1,46 +1,55 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
+		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thank you for your order at {shop_name}.</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: {color};">{firstname} {lastname}</strong>,</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<span style="color:#777">
+			As our way of saying thanks, we want to give you a discount of <span style="color:#777"><strong>{amount}</strong></span>% off your next order! This offer is valid for <span style="color:#777"><strong>{days}</strong></span> days, so do not waste a moment!<br /> <br /> 
+			<span style="color:#777"><strong>Here is your coupon:</strong></span> {voucher_num}<br /><br />
+			Enter this code in your shopping cart to get your discount.		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Thank you for your order at {shop_name}</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td align="left">As our way of saying thanks, we want to give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!<br /><br /></td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-<tr>
+			</tr>
-<td>&nbsp;</td>
+		</table>
-</tr>
+	</body>
-<tr>
-<td align="left">Here is your coupon: <strong>{voucher_num}</strong><br /><br /> Enter this code in your shopping cart to get your discount.</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
-</tr>
-</tbody>
-</table>
-</body>
 </html>

modules/followup/mails/en/followup_2.txt

@@ -1,9 +1,18 @@
-Hello {firstname} {lastname},
 
-Thank you for your order at {shop_name}
+[{shop_url}] 
 
-As our way of saying thanks, we want to give you a discount of {amount}% off your next order! This offer is valid for {days} days, so do not waste a moment!
+Hi {firstname} {lastname},
 
-Here is your coupon: {voucher_num}
+Thank you for your order at {shop_name}. 
+
+As our way of saying thanks, we want to give you a discount of
+{AMOUNT}% off your next order! This offer is valid for {DAYS} days, so
+do not waste a moment!
+
+HERE IS YOUR COUPON: {voucher_num}
 
 Enter this code in your shopping cart to get your discount. 
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
+

modules/followup/mails/en/followup_3.html

@@ -1,46 +1,57 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span><br/>
+		<span class="subtitle" style="font-weight:500;font-size:16px;text-transform:uppercase;line-height:25px">Thanks for your trust.</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: {color};">{firstname} {lastname}</strong>,</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			You are one of our best customers and as such we want to thank you for your continued patronage.		</p>
+		<span style="color:#777">
+			As appreciation for your loyalty, we want to give you a discount of <span style="color:#777"><strong>{amount}</strong></span>% valid on your next order! This offer is valid for <span style="color:#777"><strong>{days}</strong></span> days, so do not waste a moment!<br /> <br /> 
+			<span style="color:#777"><strong>Here is your coupon:</strong></span> {voucher_num}<br /><br />
+			Enter this code in your shopping cart to get your discount.		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Thanks for your trust</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td align="left">You are one of our best customers and as such we want to thank you for your continued patronage.<br /><br /> As appreciation for your loyalty, we want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!</td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-<tr>
+			</tr>
-<td>&nbsp;</td>
+		</table>
-</tr>
+	</body>
-<tr>
-<td align="left">Here is your coupon: <strong>{voucher_num}</strong><br /><br /> Enter this code in your shopping cart to get your discount.</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
-</tr>
-</tbody>
-</table>
-</body>
 </html>

modules/followup/mails/en/followup_3.txt

@@ -1,9 +1,19 @@
-Hello {firstname} {lastname},
 
-You are one of our best customers and as such we want to thank you for your continued patronage.
+[{shop_url}] 
 
-As appreciation for your loyalty, we want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!
+Hi {firstname} {lastname},
 
-Here is your coupon: {voucher_num}
+Thanks for your trust. 
+
+You are one of our best customers and as such we want to thank you
+for your continued patronage. As appreciation for your loyalty, we
+want to give you a discount of {AMOUNT}% valid on your next order!
+This offer is valid for {DAYS} days, so do not waste a moment!
+
+HERE IS YOUR COUPON: {voucher_num}
 
 Enter this code in your shopping cart to get your discount. 
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
+

modules/followup/mails/en/followup_4.html

@@ -1,46 +1,66 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi {firstname} {lastname},</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td align="left">Hi <strong style="color: {color};">{firstname} {lastname}</strong>,</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			Your cart at {shop_name}		</p>
+		<span style="color:#777">
+			You are one of our best customers, however you have not placed an order in {days_threshold} days.<br /> <br /> 
+			Your cart has been saved, you can resume your order by visiting our shop: <span style="color:#777"><strong><a title="{shop_name}" href="{shop_url}" style="color:#337ff1">{shop_url}</a></strong></span><br /><br />
+			We wish to thank you for the trust you have placed in us and want to give you a discount of {amount}% valid on your next order! This offer is valid for <span style="color:#777"><strong>{days}</strong></span> days, so do not waste a moment!		</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Your cart at {shop_name}</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<span style="color:#777">
+			<span style="color:#777"><strong>Here is your coupon:</strong></span> {voucher_num}<br /><br />
+			Enter this code in your shopping cart to get your discount.		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td align="left">You are one of our best customers, however you have not placed an order in {days_threshold} days.<br /><br /> We wish to thank you for the trust you have placed in us and want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td align="left">Here is your coupon: <strong>{voucher_num}</strong><br /><br /> Enter this code in your shopping cart to get your discount.</td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-<tr>
+			</tr>
-<td>&nbsp;</td>
+		</table>
-</tr>
+	</body>
-<tr>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
-</tr>
-</tbody>
-</table>
-</body>
 </html>

modules/followup/mails/en/followup_4.txt

@@ -1,11 +1,22 @@
-We miss you at {shop_name}
 
-Hello {firstname} {lastname},
+[{shop_url}] 
 
-You are one of our best customers, however you have not placed an order in {days_threshold} days.
+Hi {firstname} {lastname}, 
 
-We wish to thank you for the trust you have placed in us and want to give you a discount of {amount}% valid on your next order! This offer is valid for {days} days, so do not waste a moment!
+Your cart at {shop_name} You are one of our best customers, however
+you have not placed an order in {days_threshold} days.
 
-Here is your coupon: {voucher_num}
+Your cart has been saved, you can resume your order by visiting our
+shop: {SHOP_URL} [HTTP://SAFE.SHELL.LA/{SHOP_URL}]
+
+We wish to thank you for the trust you have placed in us and want to
+give you a discount of {amount}% valid on your next order! This offer
+is valid for {DAYS} days, so do not waste a moment! 
+
+HERE IS YOUR COUPON: {voucher_num}
 
 Enter this code in your shopping cart to get your discount. 
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
+

modules/followup/mails/en/footer.html

@@ -0,0 +1,15 @@
+						<tr>
+							<td class="space_footer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="footer">
+								<span><a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a></span>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td class="space">&nbsp;</td>
+			</tr>
+		</table>
+	</body>
+</html>

modules/followup/mails/en/footer.txt

@@ -0,0 +1,4 @@
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
+

modules/followup/mails/en/header.html

@@ -0,0 +1,21 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Message from {shop_name}</title>
+		
+	</head>
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>

modules/followup/mails/en/header.txt

@@ -0,0 +1,3 @@
+
+[{shop_url}] 
+

modules/mailalerts/mails/en/customer_qty.html

@@ -1,34 +1,56 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>[{shop_name}] Product available</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{product} is now available.</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			{product} is now available.		</p>
+		<span style="color:#777">
+			This item is once again in-stock.<br /><br /> 
+			You can access the product page by clicking on the link: <span style="color:#777"><strong><a href="{product_link}" style="color:#337ff1">{product}</a></strong></span><br />
+			You can order it right now from our online shop.		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td align="left">This item is once again in-stock.<br /><br /> You can access the product page by clicking on the link: <a href="{product_link}">{product}</a><br /><br /> You can order it right now from our online shop.</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-</tbody>
+			</tr>
-</table>
+		</table>
-</body>
+	</body>
 </html>

modules/mailalerts/mails/en/customer_qty.txt

@@ -1,12 +1,15 @@
+
+[{shop_url}] 
+
 Hi, 
 
-Product {product} is now available.
+{product} is now available. This item is once again in-stock.
-This item is once again in-stock.
 
-You can access the product page on: {product_link}
+You can access the product page by clicking on the link: {PRODUCT}
+[HTTP://SAFE.SHELL.LA/{PRODUCT_LINK}]
 
 You can order it right now from our online shop. 
 
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
 
-
-{shop_url} powered by PrestaShop™

modules/mailalerts/mails/en/footer.html

@@ -0,0 +1,15 @@
+						<tr>
+							<td class="space_footer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="footer">
+								<span><a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com/">PrestaShop&trade;</a></span>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td class="space">&nbsp;</td>
+			</tr>
+		</table>
+	</body>
+</html>

modules/mailalerts/mails/en/footer.txt

@@ -0,0 +1,4 @@
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
+

modules/mailalerts/mails/en/header.html

@@ -0,0 +1,21 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>Message from {shop_name}</title>
+		
+	</head>
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>

modules/mailalerts/mails/en/header.txt

@@ -0,0 +1,3 @@
+
+[{shop_url}] 
+

modules/mailalerts/mails/en/new_order.html

@@ -1,74 +1,153 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<title>[{shop_name}] New order</title>
+		<title>Message from {shop_name}</title>
+		
 	</head>
-	<body style="font-family: Verdana, sans-serif; font-size: 11px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-		<p style="line-height: 17px;"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a><br /><br />
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
-		Congratulations! A new order was placed on <b>{shop_name}</b> from the following customer:<br /><strong style="color: #db3484;">{firstname} {lastname} ({email})</strong></p>
-		<table border="0">
 			<tr>
-				<td style="width: 550px; font-family: Verdana, sans-serif; font-size: 11px;">
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-					<p style="background-color: #db3484; width: 540px; color: #fff; font-size: 12px; font-weight: bold; padding: 5px;">Order Details</p>
+				<td align="center" style="border:none;padding:7px 0">
-
+					<table class="table" style="background-color:#fff;width:100%">
-					<p>Order: <b><span style="color: #db3484;">#{order_name}</span> placed on {date}</b></p>
-					<p>Payment method: <b>{payment}</b></p>
-
-					<table style="width: 100%; font-size: 11px; color: #374953;">
-						<tr style="background-color: {color}; text-align: center;">
-							<th style="width: 15%; padding: 0.6em;">Reference</th>
-							<th>Product</th>
-							<th style="width: 15%; padding: 0.6em;">Price</th>
-							<th style="width: 15%; padding: 0.6em;">Quantity</th>
-							<th style="width: 20%; padding: 0.6em;">Total Price</th>
-						</tr>
 						<tr>
-							<td>{items}</td>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
 						</tr>
-						<tr style="text-align: right;">
-							<td style="background-color: {color}; padding: 0.6em 0.4em;" colspan="4">Products</td>
-							<td style="background-color: {color}; padding: 0.6em 0.4em;">{total_products}</td>
-						</tr>
-						<tr style="text-align: right;">
-							<td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="4">Discounts</td>
-							<td style="background-color: #ebecee; padding: 0.6em 0.4em;">{total_discounts}</td>
-						</tr>
-						<tr style="text-align: right;">
-							<td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="4">Gift-wrapping</td>
-							<td style="background-color: #ebecee; padding: 0.6em 0.4em;">{total_wrapping}</td>
-						</tr>
-						<tr style="text-align: right;">
-							<td style="background-color: #dde2e6; padding: 0.6em 0.4em;" colspan="4">Shipping</td>
-							<td style="background-color: #dde2e6; padding: 0.6em 0.4em;">{total_shipping}</td>
-						</tr>
-						<tr style="text-align: right;">
-							<td style="background-color: #dde2e6; padding: 0.6em 0.4em;" colspan="4">Total Tax paid</td>
-							<td style="background-color: #dde2e6; padding: 0.6em 0.4em;">{total_tax_paid}</td>
-						</tr>
-						<tr style="text-align: right; font-weight: bold;">
-							<td style="background-color: #f1aecf; padding: 0.6em 0.4em;" colspan="4">Total paid</td>
-							<td style="background-color: #f1aecf; padding: 0.6em 0.4em;">{total_paid}</td>
-						</tr>
-					</table>
 
-					<p>Carrier: <b>{carrier}</b></p>
+<tr>
-
+	<td align="center" style="border:none;padding:7px 0">
-					<table style="width: 100%; font-size: 11px; color: #374953;">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Congratulations!</span>
-						<tr style="background-color: {color}; text-transform: uppercase;">
+	</td>
-							<th style="text-align: left; padding: 0.3em 1em;">Delivery address</th>
+</tr>
-							<th style="text-align: left; padding: 0.3em 1em;">Billing address</th>
+<tr>
-						</tr>
+	<td style="border:none;padding:7px 0">
-						<tr>
+		<span>A new order was placed on {shop_name} from the following customer: {firstname} {lastname} ({email})</span>
-							<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_block_html}</td>
+	</td>
-							<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_block_html}</td>
+</tr>
-						</tr>
+<tr>
-					</table>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
-
+</tr>
-					<p style="background-color: #db3484; width: 540px; color: #fff; font-size: 12px; font-weight: bold; padding: 5px;">Customer message: <b>{message}</b></p>
+<tr>
-
+	<td class="box" colspan="3" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
-					<p style="width: 100%; text-align: center;"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></p>
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			Order details		</p>
+		<span style="color:#777">
+			<span style="color:#777"><strong>Order:</strong></span> {order_name} Placed on {date}<br /><br />
+			<span style="color:#777"><strong>Payment:</strong></span> {payment}
+		</span>
+	</td>
+</tr>
+<tr>
+	<td style="border:none;padding:7px 0">
+		<table class="table table-recap" bgcolor="#ffffff" style="background-color:#fff;width:100%"><!-- Title -->
+			<thead>
+				<tr>
+					<th style="background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px;border:1px solid #DDD!important">Reference</th>
+					<th width="30%" style="background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px;border:1px solid #DDD!important">Product</th>
+					<th style="background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px;border:1px solid #DDD!important">Unit price</th>
+					<th style="background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px;border:1px solid #DDD!important">Quantity</th>
+					<th style="background-color:#fbfbfb;font-family:Arial;color:#333;font-size:13px;padding:10px;border:1px solid #DDD!important">Total price</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td colspan="5" style="border:none;padding:10px!important;color:#777">
+						{items}
+					</td>
+				</tr>
+				<tr class="conf_body">
+					<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#777;border:none;padding:10px!important"><strong>Products</strong></td>
+					<td bgcolor="#fbfbfb" align="right" style="color:#777;border:none;padding:10px!important">{total_products}</td>
+				</tr>
+				<tr class="conf_body">
+					<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#777;border:none;padding:10px!important"><strong>Discounts</strong></td>
+					<td bgcolor="#fbfbfb" align="right" style="color:#777;border:none;padding:10px!important">{total_discounts}</td>
+				</tr>
+				<tr class="conf_body">
+					<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#777;border:none;padding:10px!important"><strong>Gift-wrapping</strong></td>
+					<td bgcolor="#fbfbfb" align="right" style="color:#777;border:none;padding:10px!important">{total_wrapping}</td>
+				</tr>
+				<tr class="conf_body">
+					<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#777;border:none;padding:10px!important"><strong>Shipping</strong></td>
+					<td bgcolor="#fbfbfb" align="right" style="color:#777;border:none;padding:10px!important">{total_shipping}</td>
+				</tr>
+				<tr class="conf_body">
+					<td bgcolor="#fbfbfb" align="right" colspan="4" style="color:#777;border:none;padding:10px!important"><strong>Total Tax paid</strong></td>
+					<td bgcolor="#fbfbfb" align="right" style="color:#777;border:none;padding:10px!important">{total_tax_paid}</td>
+				</tr>
+				<tr class="conf_body">
+					<td bgcolor="#fbfbfb" align="right" colspan="4" class="total" style="color:#777;font-size:18px;font-weight:500;font-family:Open-sans, sans-serif;border:none;padding:10px!important"><strong>Total paid</strong></td>
+					<td bgcolor="#fbfbfb" align="right" class="total_amount" style="color:#777;font-size:21px;font-weight:500;font-family:Open-sans, sans-serif;border:none;padding:10px!important">{total_paid}</td>
+				</tr>
+			</tbody>
+		</table>
+	</td>
+</tr>
+<tr>
+	<td class="box" colspan="3" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			Carrier:		</p>
+		<span style="color:#777">
+			{carrier}
+		</span>
+	</td>
+</tr>
+<tr>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
+</tr>
+<tr>
+	<td style="border:none;padding:7px 0">
+		<table class="table" style="background-color:#fff;width:100%">
+			<tr>
+				<td class="box" width="310" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+					<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+						Delivery address					</p>
+					<span style="color:#777">
+						{delivery_block_html}
+					</span>
 				</td>
+				<td width="20" style="border:none;padding:7px 0">&nbsp;</td>
+				<td class="box" width="310" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+					<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+						Billing address					</p>
+					<span style="color:#777">
+						{invoice_block_html}
+					</span>
+				</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+<tr>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
+</tr>
+<tr>
+	<td class="box" colspan="3" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			Customer message:		</p>
+		<span style="color:#777">
+			{message}
+		</span>
+	</td>
+</tr>
+
+						<tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
 			</tr>
 		</table>
 	</body>

modules/mailalerts/mails/en/new_order.txt

@@ -1,30 +1,59 @@
-Hi,
 
-You've a new order from {firstname} {lastname} ({email}) on {shop_name}.
+[{shop_url}] 
 
-Order: {order_name}
+Congratulations! 
-Placed on : {date}
-Carrier : {carrier}
-Payment: {payment}
-Discounts: {total_discounts}
-Shipping: {total_shipping}
-Total Tax paid: {total_tax_paid}
-Products: {total_products}
-Gift-wrapping: {total_wrapping}
-Total paid: {total_paid}
 
-Delivery address:
+A new order was placed on {shop_name} from the following customer:
+{firstname} {lastname} ({email}) 
 
-{delivery_block_txt}
+Order details ORDER: {order_name} Placed on {date}
 
-Billing address:
+PAYMENT: {payment} 
 
-{invoice_block_txt}
+REFERENCE
 
-Customer message:
+PRODUCT
 
-{message}
+UNIT PRICE
 
+QUANTITY
 
+TOTAL PRICE
+
+{items} 
+
+PRODUCTS
+
+{total_products}
+
+DISCOUNTS
+
+{total_discounts}
+
+GIFT-WRAPPING
+
+{total_wrapping}
+
+SHIPPING
+
+{total_shipping}
+
+TOTAL TAX PAID
+
+{total_tax_paid}
+
+TOTAL PAID
+
+{total_paid}
+
+Carrier: {carrier} 
+
+Delivery address {delivery_block_html} 		 
+
+Billing address {invoice_block_html} 
+
+Customer message: {message} 
+
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
 
-{shop_url} powered by PrestaShop™

modules/mailalerts/mails/en/productcoverage.html

@@ -1,34 +1,56 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>[{shop_name}] Stock cover</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{product} is almost out of stock.</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			{product} is almost out of stock.		</p>
+		<span style="color:#777">
+			The stock cover is now less than the specified minimum of: <strong><span style="color:#777">{warning_coverage}.</span></strong><br /><br /> 
+			<strong><span style="color:#777">Current stock cover:</span></strong> {current_coverage}
+		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td align="left">The stock cover is now less than the specified minimum of <strong>{warning_coverage}</strong>.<br /><br /> <strong>Current stock cover: <span style="color: {color};">{current_coverage}</span></strong><br /><br /></td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-</tbody>
+			</tr>
-</table>
+		</table>
-</body>
+	</body>
 </html>

modules/mailalerts/mails/en/productcoverage.txt

@@ -1,10 +1,13 @@
+
+[{shop_url}] 
+
 Hi, 
 
-The product {product} is almost out of stock.
+{product} is almost out of stock. The stock cover is now less than
-The stock cover is now less than the specified minimum of {warning_coverage}.
+the specified minimum of: {WARNING_COVERAGE}.
-Current stock cover : {current_coverage}
 
+CURRENT STOCK COVER: {current_coverage} 
 
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
 
-
-{shop_url} powered by PrestaShop™

modules/mailalerts/mails/en/productoutofstock.html

@@ -1,34 +1,56 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
+	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>[{shop_name}] Out of stock</title>
+		<title>Message from {shop_name}</title>
-</head>
+		
-<body>
+	</head>
-	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
+	<body style="background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
-<tbody>
+		<table class="table table-mail" style="margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid;width:100%">
+			<tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
+				<td align="center" style="border:none;padding:7px 0">
+					<table class="table" style="background-color:#fff;width:100%">
+						<tr>
+							<td align="center" class="logo" style="border:none;padding:7px 0;border-bottom:4px solid #333!important">
+								<a title="{shop_name}" href="{shop_url}" style="color:#337ff1">
+									<img src="{shop_logo}" alt="{shop_name}" />
+								</a>
+							</td>
+						</tr>
+
 <tr>
-<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
+	<td align="center" style="border:none;padding:7px 0">
+		<span class="title" style="font-weight:500;font-size:28px;text-transform:uppercase;line-height:33px">Hi,</span>
+	</td>
 </tr>
 <tr>
-<td>&nbsp;</td>
+	<td style="border:none;padding:7px 0">&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">{product} is nearly out of stock.</td>
+	<td class="box" style="border:1px solid #d6d4d4!important;padding:10px!important;background-color:#fbfbfb">
+		<p style="text-transform:uppercase;font-weight:500;font-size:18px;border-bottom:1px solid #d6d4d4!important;padding-bottom:10px;margin:3px 0 7px">
+			{product} is nearly out of stock.		</p>
+		<span style="color:#777">
+			The remaining stock is now less than the specified minimum of <strong><span style="color:#777">{last_qty}.</span></strong><br /><br /> 
+			<strong><span style="color:#777">Remaining stock:</span></strong> {qty}<br/><br/>
+			You are advised to open the product&#039;s admin Product Page in order to replenish your inventory.		</span>
+	</td>
 </tr>
-<tr>
+
-<td>&nbsp;</td>
+						<tr>
-</tr>
+							<td class="space_footer" style="border:none;padding:0!important">&nbsp;</td>
-<tr>
+						</tr>
-<td align="left">The remaining stock is now less than the specified minimum of <strong>{last_qty}</strong>.<br /><br /> <strong>Remaining stock: <span style="color: {color};">{qty}</span></strong><br /><br /> You are advised to open the product&#039;s admin Product Page in order to replenish your inventory.</td>
+						<tr>
-</tr>
+							<td class="footer" style="border:none;padding:7px 0;border-top:4px solid #333!important">
-<tr>
+								<span><a href="{shop_url}" style="color:#337ff1">{shop_name}</a> powered by <a href="http://www.prestashop.com/" style="color:#337ff1">PrestaShop&trade;</a></span>
-<td>&nbsp;</td>
+							</td>
-</tr>
+						</tr>
-<tr>
+					</table>
-<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
+				</td>
-</tr>
+				<td class="space" style="border:none;padding:7px 0;width:20px">&nbsp;</td>
-</tbody>
+			</tr>
-</table>
+		</table>
-</body>
+	</body>
 </html>

modules/mailalerts/mails/en/productoutofstock.txt

@@ -1,11 +1,16 @@
+
+[{shop_url}] 
+
 Hi, 
 
-The product {product} is nearly out of stock.
+{product} is nearly out of stock. The remaining stock is now less
-The remaining stock is now less than the specified minimum of {last_qty}.
+than the specified minimum of {LAST_QTY}.
-Remaining stock : {qty}
 
-You are advised to open the product's admin Product Page in order to replenish your inventory.
+REMAINING STOCK: {qty}
 
+You are advised to open the product's admin Product Page in order to
+replenish your inventory. 
 
+{shop_name} [{shop_url}] powered by
+PrestaShop(tm) [http://www.prestashop.com/] 
 
-{shop_url} powered by PrestaShop™

modules/mailalerts/mails/en/src/customer_qty.php

@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			{product} <?php echo t('is now available.'); ?>
+			<?php echo t('{product} is now available.'); ?>
 		</p>
 		<span>
 			<?php echo t('This item is once again in-stock.'); ?><br /><br />