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

Merge pull request #461 from cinscaen/development

Browse Source 
[-] MO: Fix "sendtoafriend" and "blocknewsletter" module
This commit is contained in:
Vincent Augagneur
2013-05-30 00:57:56 -07:00
parent 980b45f372 bce42c7f8d
commit 32863ed476
3 changed files with 55 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocknewsletter/mails/en/newsletter_conf.html
+25 -5
View File
@@ -5,10 +5,30 @@
<title>Message from {shop_name}</title>
</head>
<body>
<div style="width: 500px;"><a href="{shop_url}"><img title="{shop_name}" src="{shop_logo}" alt="{shop_name}" border="0" /></a><br /><br />Hi
<h1 style="font-size: 13px; height: 25px; line-height: 25px; background: #CCC; padding-left: 8px;">Thank you for subscribing to our newsletter</h1>
<!-- TEXT -->
<div style="margin-top: 10px; padding-top: 5px; border-top: 1px solid #666; text-align: center; font-size: 11px;"><a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com">PrestaShop</a>&trade;</div>
</div>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: {color}; width: 550px;">
<tbody>
<tr>
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Hi,</td>
</tr>
<tr>
<td>&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>&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 <a href="http://www.prestashop.com">PrestaShop</a>&trade;</td>
</tr>
</tbody>
</table>
</body>
</html>
modules/blocknewsletter/mails/en/newsletter_verif.html
+29 -4
View File
@@ -2,11 +2,36 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Message de {shop_name}</title>
<title>Message from {shop_name}</title>
</head>
<body>
<div style="width: 650px;"><a href="{shop_url}"><img title="{shop_name}" src="{shop_logo}" alt="{shop_name}" border="0" /></a><br /><br /> Hi,<br /><br /> Thank you for subscribing to our newsletter, please confirm your request by clicking the link below:<br /> <a href="{verif_url}">{verif_url}</a>
<div style="margin-top: 10px; padding-top: 5px; border-top: 1px solid #666; text-align: center; font-size: 11px;"><a href="{shop_url}">{shop_name}</a> Powered by&nbsp;<a href="http://www.prestashop.com">PrestaShop</a>&trade;</div>
</div>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: {color}; width: 550px;">
<tbody>
<tr>
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Hi,</td>
</tr>
<tr>
<td>&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><a href="{verif_url}">{verif_url}</a></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 by&nbsp;<a href="http://www.prestashop.com">PrestaShop</a>&trade;</td>
</tr>
</tbody>
</table>
</body>
</html>
modules/sendtoafriend/sendtoafriend-extra.tpl
+1 -1
View File
@@ -45,7 +45,7 @@ $('document').ready(function(){
{/literal}url: "{$module_dir}sendtoafriend_ajax.php",{literal}
type: "POST",
headers: {"cache-control": "no-cache"},
data: {action: 'sendToMyFriend', secure_key: '{/literal}{$stf_secure_key}{literal}', friend: unescape(JSON.stringify(datas).replace(/u/g, '%u'))},{/literal}{literal}
data: {action: 'sendToMyFriend', secure_key: '{/literal}{$stf_secure_key}{literal}', friend: unescape(JSON.stringify(datas).replace(/\\u/g, '%u'))},{/literal}{literal}
dataType: "json",
success: function(result){
$.fancybox.close();