antadis/toutpratique
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Michael RICOIS 2017-06-22 10:39:31 +02:00
commit c13b069227
7 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cache/smarty/cache/index.php vendored Normal file
View File

@ -0,0 +1,35 @@
<?php
/*
* 2007-2014 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2014 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

4
override/controllers/front/AuthController.php
View File

@ -336,8 +336,8 @@ class AuthController extends AuthControllerCore
{
if (!Validate::isEmail($email = Tools::getValue('email_create'))
|| empty($email)
|| !preg_match('/^(?!(?:(?:\x22?\x5C[\x00-\x7E]\x22?)|(?:\x22?[^\x5C\x22]\x22?)){255,})(?!(?:(?:\x22?\x5C[\x00-\x7E]\x22?)|(?:\x22?[^\x5C\x22]\x22?)){65,}@)(?:(?:[\x21\x23-\x27\x2A\x2B\x2D\x2F-\x39\x3D\x3F\x5E-\x7E]+)|(?:\x22(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|(?:\x5C[\x00-\x7F]))*\x22))(?:\.(?:(?:[\x21\x23-\x27\x2A\x2B\x2D\x2F-\x39\x3D\x3F\x5E-\x7E]+)|(?:\x22(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|(?:\x5C[\x00-\x7F]))*\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\]))$/iD', $email)) {
$this->errors[] = Tools::displayError('Invalid email address.');
|| !preg_match('/^(?=[A-Z0-9][A-Z0-9@._%+-]{5,253}+$)[A-Z0-9._%+-]{1,64}+@(?:(?=[A-Z0-9-]{1,63}+\.)[A-Z0-9]++(?:-[A-Z0-9]++)*+\.){1,8}+[A-Z]{2,63}+$/i', $email)) {
$this->errors[] = Tools::displayError('Invalid email address.');
}
elseif (Customer::customerExists($email))
{

22
themes/toutpratique/css/global.css
View File

@ -1084,7 +1084,7 @@ body .ac_results {
background-size: contain;
height: 256px;
}
.newsletter_footer div {
.newsletter_footer h5 {
font-family: 'nautilus';
font-size: 50px;
text-align: center;
@ -1095,7 +1095,7 @@ body .ac_results {
-o-text-shadow: 1px 1px 1px #696565;
text-shadow: 1px 1px 1px #696565;
}
.newsletter_footer div span {
.newsletter_footer h5 span {
color: #333333;
}
.newsletter_footer p {
@ -1198,7 +1198,7 @@ body .ac_results {
padding-left: 280px;
padding-right: 25px;
}
.newsletter_lightbox div {
.newsletter_lightbox h5 {
font-family: 'nautilus';
font-size: 50px;
margin-bottom: 20px;
@ -1209,7 +1209,7 @@ body .ac_results {
-o-text-shadow: 1px 1px 1px #696565;
text-shadow: 1px 1px 1px #696565;
}
.newsletter_lightbox div span {
.newsletter_lightbox h5 span {
color: #333333;
}
.newsletter_lightbox p{
@ -1316,7 +1316,7 @@ body .ac_results {
.post-product .product_post .price{ font-size: 18px;}
.post-product .product_post .old_price{ font-size: 14px;}
.newsletter_footer div { font-size: 30px; }
.newsletter_footer h5 { font-size: 30px; }
.newsletter_footer p { font-size: 14px; padding: 0 190px; }
#header #mainmenu .menu-content > li a { font-size: 13px; padding: 9px 6px }
@ -1375,7 +1375,7 @@ body .ac_results {
.video_home h4 { font-size: 30px;}
.newsletter_footer { height: 159px;}
.newsletter_footer div { margin-top: 0; padding-top: 30px; }
.newsletter_footer h5 { margin-top: 0; padding-top: 30px; }
.newsletter_footer p { display: none; }
@ -1504,7 +1504,7 @@ body .ac_results {
width: 100%;
}
.newsletter_footer .form-group { width: 100%; }
.newsletter_footer div { margin-top: 0; padding-top: 0; text-shadow:0px 0px;}
.newsletter_footer h5 { margin-top: 0; padding-top: 0; text-shadow:0px 0px;}
.newsletter_footer p { display: block; padding: 0; }
.newsletter_footer .btn{ width: 100%; }
@ -1522,7 +1522,7 @@ body .ac_results {
padding-left: 170px;
padding-right: 5px;
}
.newsletter_lightbox div{
.newsletter_lightbox h5{
font-size: 35px;
}
.newsletter_lightbox p{
@ -1615,7 +1615,7 @@ body .ac_results {
.newsletter_lightbox{width: 100%; background:#529bb6;}
.newsletter_lightbox .newsletter-box {padding-left: 5px;}
.newsletter_lightbox div{font-size: 30px}
.newsletter_lightbox h5{font-size: 30px}
.newsletter_lightbox .form-group{padding: 0 5px;}
.newsletter_lightbox input.newsletter-input, .newsletter_lightbox .btn.btn-black{display: block; width: 100%; text-align: center;}
.video_home { padding: 22px 0 }
@ -2540,7 +2540,7 @@ main#categorycms { margin-bottom: 30px }
.vote_box.button span { font-size: 15px; }
#postcms .note_article.stack{ width: 135px; }
#postcms #stack_right.stack { width: 293px; }
.newsletter_left div { margin-bottom: 14px; margin-top: 32px; padding: 0 10px;}
.newsletter_left h5 { margin-bottom: 14px; margin-top: 32px; padding: 0 10px;}
.newsletter_left p { font-size: 12px; padding-left: 121px; padding-right: 0; }
.newsletter_left .form-group .btn,
.newsletter_left .form-group #newsletter-input { width: 270px;}
@ -2576,7 +2576,7 @@ main#categorycms { margin-bottom: 30px }
}
#postcms .pack_bottom .title { font-size: 32px;}
.newsletter_left { background: #529bb6; height: auto; padding: 15px; }
.newsletter_left div { display: none;}
.newsletter_left h5 { display: none;}
.newsletter_left p { padding: 0; font-size: 14px; display: block; text-align: center;}
.newsletter_left .form-group{ width: 100%;}
.newsletter_left .form-group #newsletter-input { border-top: 1px solid #bbb; margin: 0;}

2
themes/toutpratique/modules/blocknewsletter/blocknewsletter.tpl
View File

@ -1,6 +1,6 @@
<!-- Block Newsletter module-->
<div class="newsletter col-md-12 col-sm-8 col-xs-7 col-xxs-12">
<div>{l s='Newsletter' mod='blocknewsletter'}</div>
<h5>{l s='Newsletter' mod='blocknewsletter'}</h5>
<p>{l s='Subscribe to receive our monthly news and our special offers by email !' mod='blocknewsletter'}</p>
<form action="{$link->getPageLink('index', null, null, null, false, null, true)|escape:'html':'UTF-8'}" method="post">

4
themes/toutpratique/modules/blocknewsletter/blocknewsletter_footer.tpl
View File

@ -3,10 +3,10 @@
{*if $page_name == 'homestore' || $page_name == 'category' || $page_name == 'product'*}
{if true == false}
<div>{l s='Profitez d\'une' mod='blocknewsletter'} <span>{l s='réduction de 10€' mod='blocknewsletter'}</span> {l s='tout de suite !' mod='blocknewsletter'}</div>
<h5>{l s='Profitez d\'une' mod='blocknewsletter'} <span>{l s='réduction de 10€' mod='blocknewsletter'}</span> {l s='tout de suite !' mod='blocknewsletter'}</h5>
<p>{l s='Abonnez-vous à ma sélection d\'astuces et conseils mensuels et recevez immédiatemment un bon de réduction de 10 € valable sur toute la boutique ToutPratique.com !' mod='blocknewsletter'}</p>
{else}
<div>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</div>
<h5>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</h5>
<p>{l s='Abonnez-vous à ma sélection d\'astuces et conseils mensuels et recevez immédiatemment mon guide du Tout Propre en PDF par email!' mod='blocknewsletter'}</p>
{/if}

2
themes/toutpratique/modules/blocknewsletter/blocknewsletter_left.tpl
View File

@ -1,6 +1,6 @@
<!-- Block Newsletter module-->
<div class="newsletter_left clearfix">
<div>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</div>
<h5>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</h5>
<p>{l s='Abonnez-vous à ma sélection d\'astuces et conseils mensuels et recevez immédiatemment mon guide du Tout Propre en PDF par email!' mod='blocknewsletter'}</p>
<form action="" method="post">

2
themes/toutpratique/modules/blocknewsletter/blocknewsletter_lightbox.tpl
View File

@ -3,7 +3,7 @@
<div class="newsletter_lightbox">
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="newsletter-box">
<div>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</div>
<h5>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</h5>
<p>{l s='Abonnez-vous à ma sélection d\'astuces et conseils mensuels et recevez immédiatemment mon guide du Tout Propre en PDF par email!' mod='blocknewsletter'}</p>
<form id="newsletterLightboxSubmit" class="form-inline" action="" method="post">