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

Merge branch 'ticket/r13185-productpack' into 'master'

Browse Source 
Ticket/r13185 productpack

See merge request !15
This commit is contained in:
Michael 2017-06-20 10:02:04 +02:00
commit 50e5ac74b7
8 changed files with 18 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,35 +0,0 @@
<?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;

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

@ -1084,7 +1084,7 @@ body .ac_results {
background-size: contain; background-size: contain;
height: 256px; height: 256px;
} }
.newsletter_footer h5 { .newsletter_footer div {
font-family: 'nautilus'; font-family: 'nautilus';
font-size: 50px; font-size: 50px;
text-align: center; text-align: center;
@ -1095,7 +1095,7 @@ body .ac_results {
-o-text-shadow: 1px 1px 1px #696565; -o-text-shadow: 1px 1px 1px #696565;
text-shadow: 1px 1px 1px #696565; text-shadow: 1px 1px 1px #696565;
} }
.newsletter_footer h5 span { .newsletter_footer div span {
color: #333333; color: #333333;
} }
.newsletter_footer p { .newsletter_footer p {
@ -1198,7 +1198,7 @@ body .ac_results {
padding-left: 280px; padding-left: 280px;
padding-right: 25px; padding-right: 25px;
} }
.newsletter_lightbox h5 { .newsletter_lightbox div {
font-family: 'nautilus'; font-family: 'nautilus';
font-size: 50px; font-size: 50px;
margin-bottom: 20px; margin-bottom: 20px;
@ -1209,7 +1209,7 @@ body .ac_results {
-o-text-shadow: 1px 1px 1px #696565; -o-text-shadow: 1px 1px 1px #696565;
text-shadow: 1px 1px 1px #696565; text-shadow: 1px 1px 1px #696565;
} }
.newsletter_lightbox h5 span { .newsletter_lightbox div span {
color: #333333; color: #333333;
} }
.newsletter_lightbox p{ .newsletter_lightbox p{
@ -1316,7 +1316,7 @@ body .ac_results {
.post-product .product_post .price{ font-size: 18px;} .post-product .product_post .price{ font-size: 18px;}
.post-product .product_post .old_price{ font-size: 14px;} .post-product .product_post .old_price{ font-size: 14px;}
.newsletter_footer h5 { font-size: 30px; } .newsletter_footer div { font-size: 30px; }
.newsletter_footer p { font-size: 14px; padding: 0 190px; } .newsletter_footer p { font-size: 14px; padding: 0 190px; }
#header #mainmenu .menu-content > li a { font-size: 13px; padding: 9px 6px } #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;} .video_home h4 { font-size: 30px;}
.newsletter_footer { height: 159px;} .newsletter_footer { height: 159px;}
.newsletter_footer h5 { margin-top: 0; padding-top: 30px; } .newsletter_footer div { margin-top: 0; padding-top: 30px; }
.newsletter_footer p { display: none; } .newsletter_footer p { display: none; }
@ -1504,7 +1504,7 @@ body .ac_results {
width: 100%; width: 100%;
} }
.newsletter_footer .form-group { width: 100%; } .newsletter_footer .form-group { width: 100%; }
.newsletter_footer h5 { margin-top: 0; padding-top: 0; text-shadow:0px 0px;} .newsletter_footer div { margin-top: 0; padding-top: 0; text-shadow:0px 0px;}
.newsletter_footer p { display: block; padding: 0; } .newsletter_footer p { display: block; padding: 0; }
.newsletter_footer .btn{ width: 100%; } .newsletter_footer .btn{ width: 100%; }
@ -1522,7 +1522,7 @@ body .ac_results {
padding-left: 170px; padding-left: 170px;
padding-right: 5px; padding-right: 5px;
} }
.newsletter_lightbox h5{ .newsletter_lightbox div{
font-size: 35px; font-size: 35px;
} }
.newsletter_lightbox p{ .newsletter_lightbox p{
@ -1615,7 +1615,7 @@ body .ac_results {
.newsletter_lightbox{width: 100%; background:#529bb6;} .newsletter_lightbox{width: 100%; background:#529bb6;}
.newsletter_lightbox .newsletter-box {padding-left: 5px;} .newsletter_lightbox .newsletter-box {padding-left: 5px;}
.newsletter_lightbox h5{font-size: 30px} .newsletter_lightbox div{font-size: 30px}
.newsletter_lightbox .form-group{padding: 0 5px;} .newsletter_lightbox .form-group{padding: 0 5px;}
.newsletter_lightbox input.newsletter-input, .newsletter_lightbox .btn.btn-black{display: block; width: 100%; text-align: center;} .newsletter_lightbox input.newsletter-input, .newsletter_lightbox .btn.btn-black{display: block; width: 100%; text-align: center;}
.video_home { padding: 22px 0 } .video_home { padding: 22px 0 }
@ -2540,7 +2540,7 @@ main#categorycms { margin-bottom: 30px }
.vote_box.button span { font-size: 15px; } .vote_box.button span { font-size: 15px; }
#postcms .note_article.stack{ width: 135px; } #postcms .note_article.stack{ width: 135px; }
#postcms #stack_right.stack { width: 293px; } #postcms #stack_right.stack { width: 293px; }
.newsletter_left h5 { margin-bottom: 14px; margin-top: 32px; padding: 0 10px;} .newsletter_left div { margin-bottom: 14px; margin-top: 32px; padding: 0 10px;}
.newsletter_left p { font-size: 12px; padding-left: 121px; padding-right: 0; } .newsletter_left p { font-size: 12px; padding-left: 121px; padding-right: 0; }
.newsletter_left .form-group .btn, .newsletter_left .form-group .btn,
.newsletter_left .form-group #newsletter-input { width: 270px;} .newsletter_left .form-group #newsletter-input { width: 270px;}
@ -2576,7 +2576,7 @@ main#categorycms { margin-bottom: 30px }
} }
#postcms .pack_bottom .title { font-size: 32px;} #postcms .pack_bottom .title { font-size: 32px;}
.newsletter_left { background: #529bb6; height: auto; padding: 15px; } .newsletter_left { background: #529bb6; height: auto; padding: 15px; }
.newsletter_left h5 { display: none;} .newsletter_left div { display: none;}
.newsletter_left p { padding: 0; font-size: 14px; display: block; text-align: center;} .newsletter_left p { padding: 0; font-size: 14px; display: block; text-align: center;}
.newsletter_left .form-group{ width: 100%;} .newsletter_left .form-group{ width: 100%;}
.newsletter_left .form-group #newsletter-input { border-top: 1px solid #bbb; margin: 0;} .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--> <!-- Block Newsletter module-->
<div class="newsletter col-md-12 col-sm-8 col-xs-7 col-xxs-12"> <div class="newsletter col-md-12 col-sm-8 col-xs-7 col-xxs-12">
<h5>{l s='Newsletter' mod='blocknewsletter'}</h5> <div>{l s='Newsletter' mod='blocknewsletter'}</div>
<p>{l s='Subscribe to receive our monthly news and our special offers by email !' mod='blocknewsletter'}</p> <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"> <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 $page_name == 'homestore' || $page_name == 'category' || $page_name == 'product'*}
{if true == false} {if true == false}
<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> <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>
<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> <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} {else}
<h5>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</h5> <div>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</div>
<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> <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} {/if}

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

@ -1,6 +1,6 @@
<!-- Block Newsletter module--> <!-- Block Newsletter module-->
<div class="newsletter_left clearfix"> <div class="newsletter_left clearfix">
<h5>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</h5> <div>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</div>
<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> <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"> <form action="" method="post">

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

@ -3,7 +3,7 @@
<div class="newsletter_lightbox"> <div class="newsletter_lightbox">
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="newsletter-box"> <div class="newsletter-box">
<h5>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</h5> <div>{l s='Recevez' mod='blocknewsletter'} <span>{l s='gratuitement' mod='blocknewsletter'}</span> {l s='mon guide !' mod='blocknewsletter'}</div>
<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> <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"> <form id="newsletterLightboxSubmit" class="form-inline" action="" method="post">

4
themes/toutpratique/product-list-blocs.tpl
View File

@ -59,7 +59,7 @@
{if isset($column)} {if isset($column)}
<h2 class="product-name" itemprop="name"> <h2 class="product-name" itemprop="name">
{else} {else}
<h5 class="product-name" itemprop="name"> <h2 class="product-name" itemprop="name">
{/if} {/if}
<a href="{$product.link|escape:'html':'UTF-8'}" title="{$product.name|escape:'html':'UTF-8'}" itemprop="url" > <a href="{$product.link|escape:'html':'UTF-8'}" title="{$product.name|escape:'html':'UTF-8'}" itemprop="url" >
{if !isset($column)} {if !isset($column)}
@ -71,7 +71,7 @@
{if isset($column)} {if isset($column)}
</h2> </h2>
{else} {else}
</h5> </h2>
{/if} {/if}
<div class="featureConditioning"> <div class="featureConditioning">
{foreach from=$product.features item='feature' name='feature'} {foreach from=$product.features item='feature' name='feature'}

3
themes/toutpratique/product.tpl
View File

@ -475,9 +475,6 @@
</div> </div>
<div class="col-md-9 content_pack"> <div class="col-md-9 content_pack">
{$packItem.pack_quantity} x <a class="link" href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)|escape:'html':'UTF-8'}">{$packItem.name|escape:'html':'UTF-8'}</a> {$packItem.pack_quantity} x <a class="link" href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)|escape:'html':'UTF-8'}">{$packItem.name|escape:'html':'UTF-8'}</a>
<p class="price">
{l s='Prix unitaire :'} <span class="red">{convertPrice price=$packItem.price}</span>
</p>
<!-- <h5>{l s='Data sheet'}</h5> --> <!-- <h5>{l s='Data sheet'}</h5> -->
<ul class="features"> <ul class="features">