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

Merge branch 'master' of gitlab.antadis.net:dev-antadis/garancia into ticket/r11243-fix-echantillons

Browse Source
This commit is contained in:
Rodney Figaro 2016-11-30 12:28:26 +01:00
commit a12b27efb8
33 changed files with 1586 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/advmenu/controllers/admin/AdminAdvMenu.php
View File

@ -126,6 +126,7 @@ class AdminAdvMenuController extends ModuleAdminController {
array('id' => '', 'name' => 'Aucune'),
array('id' => 'arrow', 'name' => 'Flèche'),
array('id' => 'menu-subtitle', 'name' => 'Titre'),
array('id' => 'featured', 'name' => 'Mise en avant'),
),
'id' => 'id',
'name' => 'name'

5
modules/garanciavap/controllers/admin/AdminGaranciaVap.php
View File

@ -1,4 +1,8 @@
<?php
if (!defined('_PS_VERSION_'))
exit;
require_once _PS_MODULE_DIR_.'garanciavap/models/GaranciaVap.php';
class AdminGaranciaVapController extends AdminController
{
@ -11,7 +15,6 @@ class AdminGaranciaVapController extends AdminController
$this->lang = true;
$this->context = Context::getContext();
parent::__construct();
}

2
modules/garanciavap/models/GaranciaVap.php
View File

@ -1,4 +1,6 @@
<?php
if (!defined('_PS_VERSION_'))
exit;
class GaranciaVapModel extends ObjectModel
{

10
modules/garanciavap/views/templates/front/display.tpl
View File

@ -21,7 +21,7 @@
<div class="texte">
{$page->description1}
{if !empty($page->link1)}
<a class="link" href="">{l s='LabelLien1' mod='garanciavap'}<span>></span></a>
<a class="link" href="{$page->link1}">{l s='LabelLien1' mod='garanciavap'}<span>></span></a>
{/if}
</div>
</div>
@ -42,7 +42,7 @@
<div class="texte">
{$page->description2}
{if !empty($page->link2)}
<a class="link" href="">{l s='LabelLien2' mod='garanciavap'}<span>></span></a>
<a class="link" href="{$page->link2}">{l s='LabelLien2' mod='garanciavap'}<span>></span></a>
{/if}
</div>
</div>
@ -63,7 +63,7 @@
<div class="texte">
{$page->description3}
{if !empty($page->link3)}
<a class="link" href="">{l s='LabelLien3' mod='garanciavap'}<span>></span></a>
<a class="link" href="{$page->link3}">{l s='LabelLien3' mod='garanciavap'}<span>></span></a>
{/if}
</div>
</div>
@ -103,11 +103,11 @@
<!-- ZONE 5 -->
{if $page->active5 && !empty($page->description7)}
<div class="footer" {if $page->imgFooter}style="background: url({$img_dir}mavap/footer_{$id_lang}.jpg)"{/if}>
<div class="footer" {if $page->imgFooter}style="background-image: url({$img_dir}mavap/footer_{$id_lang}.jpg)"{/if}>
<div class="texte">
{$page->description7}
{if !empty($page->link5)}
<a class="link" href="">{l s='LabelFooter' mod='garanciavap'}<span>></span></a>
<a class="link" href="{$page->link5}">{l s='LabelFooter' mod='garanciavap'}<span>></span></a>
{/if}
</div>
</div>

11
themes/default/css/global.css
View File

@ -4253,7 +4253,8 @@ form input.inputText146 { margin-bottom: 0; }
font-size: 16px;
line-height: 24px;
}
#mavap .zone .texte .link {
#mavap .zone .texte .link,
#mavap .footer .link {
background: #b9da1a none repeat scroll 0 0;
border: 1px solid #a9c717;
color: #00000f;
@ -4263,7 +4264,8 @@ form input.inputText146 { margin-bottom: 0; }
padding: 10px 23px 10px 18px;
text-decoration: none;
}
#mavap .zone .texte .link span {
#mavap .zone .texte .link span,
#mavap .footer .link span {
margin-left: 10px;
}
#mavap h2 {
@ -4300,8 +4302,8 @@ form input.inputText146 { margin-bottom: 0; }
}
#mavap .prefooter .texte .inner p {
color: #000;
font-family: "ProximaNova";
font-size: 16px;
font-family: 'La Belle Aurore', cursive;
font-size: 24px;
line-height: 20px;
padding: 0;
text-align: center;
@ -4329,5 +4331,6 @@ form input.inputText146 { margin-bottom: 0; }
font-size: 18px;
font-style: italic;
line-height: 22px;
margin-bottom: 15px;
padding: 0;
}

7
themes/default/css/modules/advmenu/menuStyle.css
View File

@ -252,4 +252,9 @@
padding-bottom: 0;
}
}
}
#header #mainmenu .menu-content > li > a.featured,
#header #mainmenu .menu-content > li > span.featured { color: #B9D300; }
#header #mainmenu .menu-content > li ul li span.featured,
#header #mainmenu .menu-content > li ul li a.featured { color: #90ae00; }

2
themes/default/header.tpl
View File

@ -44,7 +44,7 @@
<meta name="viewport" id="viewport" content="width=1280" >
<link href="https://fonts.googleapis.com/css?family=La+Belle+Aurore" rel="stylesheet">
<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
<script type="text/javascript">

BIN
themes/default/img/footer_1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 141 KiB

BIN
themes/default/img/header.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 160 KiB

BIN
themes/default/img/mavap/footer_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 144 KiB

BIN
themes/default/img/mavap/footer_2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 140 KiB

BIN
themes/default/img/mavap/zone3_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 161 KiB

After

Width:  |  Height:  |  Size: 126 KiB

BIN
themes/default/img/mavap/zone3_2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 161 KiB

After

Width:  |  Height:  |  Size: 126 KiB

BIN
themes/default/img/mavap/zone4_1.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 107 KiB

BIN
themes/default/img/mavap/zone4_2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 107 KiB

BIN
themes/default/img/zone3_1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 125 KiB

BIN
themes/default/img/zone4_1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 130 KiB

32
themes/default/mobile/css/global.css
View File

@ -1,3 +1,14 @@
@font-face {
font-family: 'LaBelleAurore';
src: url('../fonts/LaBelleAurore.eot');
src: url('../fonts/LaBelleAurore.eot') format('embedded-opentype'),
url('../fonts/LaBelleAurore.woff2') format('woff2'),
url('../fonts/LaBelleAurore.woff') format('woff'),
url('../fonts/LaBelleAurore.ttf') format('truetype'),
url('../fonts/LaBelleAurore.svg#LaBelleAurore') format('svg');
}
.op05 {
opacity: 0.5 !important;
}
@ -5473,7 +5484,8 @@ body form .check_mobile #check_label {
font-size: 16px;
line-height: 24px;
}
#mavap .zone .texte .link {
#mavap .zone .texte .link,
#mavap .footer .link {
background: #b9da1a none repeat scroll 0 0;
border: 1px solid #a9c717;
color: #00000f;
@ -5521,8 +5533,8 @@ body form .check_mobile #check_label {
}
#mavap .prefooter .texte .inner p {
color: #000;
font-family: "ProximaNova";
font-size: 16px;
font-family: 'LaBelleAurore', cursive;
font-size: 24px;
line-height: 20px;
padding: 0;
text-align: center;
@ -5535,18 +5547,24 @@ body form .check_mobile #check_label {
background-size: cover;
font-size: 0;
overflow: hidden;
padding: 30px;
padding: 10px;
text-align: center;
}
#mavap .footer .texte {
background: rgba(255, 255, 255, 0.7);
padding: 25px;
float: right;
width: 30%;
padding: 10px;
}
#mavap .footer .texte p {
color: #000;
font-family: "ProximaNova";
font-size: 18px;
font-size: 14px;
font-style: italic;
line-height: 22px;
line-height: 16px;
padding: 0;
}
#mavap .footer .link {
margin-top: 5px;
padding: 3px 15px;
}

BIN
themes/default/mobile/fonts/LaBelleAurore.eot Normal file
View File

Binary file not shown.

1511
themes/default/mobile/fonts/LaBelleAurore.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 258 KiB

BIN
themes/default/mobile/fonts/LaBelleAurore.ttf Normal file
View File

Binary file not shown.

BIN
themes/default/mobile/fonts/LaBelleAurore.woff Normal file
View File

Binary file not shown.

BIN
themes/default/mobile/fonts/LaBelleAurore.woff2 Normal file
View File

Binary file not shown.

1
themes/default/mobile/header.tpl
View File

@ -37,6 +37,7 @@
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
<meta name="generator" content="PrestaShop" />
<meta name="robots" content="{if isset($nobots)}no{/if}index,follow" />
<link href="https://fonts.googleapis.com/css?family=La+Belle+Aurore" rel="stylesheet">
<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
<script type="text/javascript">

124
themes/default/mobile/modules/garanciavap/display.tpl
View File

@ -1,124 +0,0 @@
{assign var="imgHeader" value="`$smarty.const._PS_ALL_THEMES_DIR_`/default/img/mavap/header.jpg"}
{assign var="imgZone1" value="`$smarty.const._PS_ALL_THEMES_DIR_`/default/img/mavap/zone1.jpg"}
{assign var="imgZone2" value="`$smarty.const._PS_ALL_THEMES_DIR_`/default/img/mavap/zone2.jpg"}
{assign var="imgZone3" value="`$smarty.const._PS_ALL_THEMES_DIR_`/default/img/mavap/zone3.jpg"}
{assign var="imgZone4" value="`$smarty.const._PS_ALL_THEMES_DIR_`/default/img/mavap/zone4.jpg"}
{assign var="imgFooter" value="`$smarty.const._PS_ALL_THEMES_DIR_`/default/img/mavap/footer.jpg"}
<div id="mavap" class="clear relative">
<div id="center_column" class="borderGreen auto">
<div class="header">
<img src="{$img_dir}mavap/header.jpg" />
</div>
<span class="h1"><span class="g">[</span>{$page->titre1}<span class="g">]</span></span>
<div class="zones">
{if $page->active1}
<div class="zone zone1">
<div class="media">
{if !empty($page->video1)}
<div class="video">
<iframe src="https://www.youtube.com/embed/{$page->video1}" frameborder="0" allowfullscreen></iframe>
</div>
{elseif file_exists($imgZone1)}
<img src="{$img_dir}mavap/zone1.jpg" alt="" />
{/if}
</div>
<div class="texte">
{$page->description1}
{if !empty($page->link1)}
<a class="link" href="">{l s='Find out more'}<span>></span></a>
{/if}
</div>
</div>
{/if}
<!-- ZONE 2 -->
{if $page->active2}
<div class="zone zone2">
<div class="media">
{if !empty($page->video2)}
<div class="video">
<iframe src="https://www.youtube.com/embed/{$page->video2}" frameborder="0" allowfullscreen></iframe>
</div>
{elseif file_exists($imgZone2)}
<img src="{$img_dir}mavap/zone2.jpg" alt="" />
{/if}
</div>
<div class="texte">
{$page->description2}
{if !empty($page->link2)}
<a class="link" href="">{l s='Find out more'}<span>></span></a>
{/if}
</div>
</div>
{/if}
<!-- ZONE 3 -->
{if $page->active3}
<div class="zone zone3">
<div class="media">
{if !empty($page->video3)}
<div class="video">
<iframe src="https://www.youtube.com/embed/{$page->video3}" frameborder="0" allowfullscreen></iframe>
</div>
{elseif file_exists($imgZone3)}
<img src="{$img_dir}mavap/zone3.jpg" alt="" />
{/if}
</div>
<div class="texte">
{$page->description3}
{if !empty($page->link3)}
<a class="link" href="">{l s='Find out more'}<span>></span></a>
{/if}
</div>
</div>
{/if}
</div>
<h2><span class="g">[</span>{$page->titre2}<span class="g">]</span></h2>
<!-- ZONE 4 -->
{if $page->active4}
<div class="prefooter" {if file_exists($imgZone4)}style="background-image: url({$img_dir}mavap/zone4.jpg)"{/if}>
{if !empty($page->description4)}
<div class="texte">
<div class="inner">
{$page->description4}
</div>
</div>
{/if}
{if !empty($page->description5)}
<div class="texte">
<div class="inner">
{$page->description5}
</div>
</div>
{/if}
{if !empty($page->description6)}
<div class="texte">
<div class="inner">
{$page->description6}
</div>
</div>
{/if}
</div>
{/if}
{if !empty($page->description7)}
<div class="footer" {if file_exists($imgFooter)}style="background: url({$img_dir}mavap/footer.jpg)"{/if}>
<div class="texte">
{$page->description7}
</div>
</div>
{/if}
<!-- ZONE 5 -->
{if $page->active5}
{/if}
</div>
</div>

0
themes/default/modules/advmenu/translations/en.php Normal file
View File

4
themes/default/modules/antadis_diagnostic/translations/en.php
View File

@ -33,8 +33,8 @@ $_MODULE['<{antadis_diagnostic}default>diagnosticpdf_2d6c8dbb8458920911b38e731ea
$_MODULE['<{antadis_diagnostic}default>form_c29b4db02e3a590f542fc48d67ce5dc4'] = 'Produit(s) pour ce profil';
$_MODULE['<{antadis_diagnostic}default>form__d64ed3e9c10229648e069f56e32f4c8e'] = 'Réponse';
$_MODULE['<{antadis_diagnostic}default>form__f82d23953042ea85c19df31837485e0b'] = 'ajouter une réponse';
$_MODULE['<{antadis_diagnostic}default>display_d61a848bc8171e16f00b5cce13e8a633'] = 'Savéria COSTE';
$_MODULE['<{antadis_diagnostic}default>display_a37ac9e372e05e1eadeb1925e6cfe618'] = 'Garancia Skin Diagnosis';
$_MODULE['<{antadis_diagnostic}default>display_d61a848bc8171e16f00b5cce13e8a633'] = 'Savéria COSTE';
$_MODULE['<{antadis_diagnostic}default>display_674f36e7f3407e6b2c69651ccd487c4e'] = 'a qualified pharmacist, shares her expertise with you to make a diagnosis of your skin.';
$_MODULE['<{antadis_diagnostic}default>display_71515c38bbd750bd3b789688582a3c30'] = 'Are you using the right techniques? The right beauty routine?';
$_MODULE['<{antadis_diagnostic}default>display_154e6cc42695795f9b5a284db0ffa196'] = 'Answer the following questions for a clear and accurate diagnosis.';
@ -48,7 +48,7 @@ $_MODULE['<{antadis_diagnostic}default>display_ebe0870af16a379c8beee2776a57d4fd'
$_MODULE['<{antadis_diagnostic}default>display_a1254c53bba08f9be26febc9ef40d804'] = 'Add Selection to Cart';
$_MODULE['<{antadis_diagnostic}default>display_17e8103f26ba581a8dd1b18cbe34d841'] = 'Print my diagnosis';
$_MODULE['<{antadis_diagnostic}default>display_221e274835a7d65ac9fe7cc72671ca70'] = 'Receive my diagnosis by email';
$_MODULE['<{antadis_diagnostic}default>display_770a1a1e17972d73a5f39914e0d5c6b1'] = 'Send';
$_MODULE['<{antadis_diagnostic}default>display_5a95a425f74314a96f13a2f136992178'] = 'Partager';
$_MODULE['<{antadis_diagnostic}default>display_0602d06debefa749620c2fda7ba70329'] = 'Invite your friends to do their diagnosis';
$_MODULE['<{antadis_diagnostic}default>display_7f84beab04579bef70043ca0cc72fb85'] = 'Diagnosis';
$_MODULE['<{antadis_diagnostic}default>display_11952d7ed10766f7471bca3d795619a0'] = 'Your diagnosis has been sent by email';

10
themes/default/modules/antadis_iframefacebook/translations/en.php Normal file
View File

@ -0,0 +1,10 @@
<?php
global $_MODULE;
$_MODULE = array();
$_MODULE['<{antadis_iframefacebook}default>antadis_iframefacebook_8cf9819abb030461a994b51bd73b7476'] = 'nos-magasins';
$_MODULE['<{antadis_iframefacebook}default>stores_7ab6c2300ac1d74d35cadcfb39254827'] = 'Aucun magasin trouvé !';
$_MODULE['<{antadis_iframefacebook}default>stores_e80ba8cf66845d479eb275578353e358'] = 'magasin trouvé -- voir details';
$_MODULE['<{antadis_iframefacebook}default>stores_c3d0689b0ded3217c1b4fef6e9513930'] = 'magasins trouvés -- voir tous les résultats';
$_MODULE['<{antadis_iframefacebook}default>stores_673ae02fffb72f0fe68a66f096a01347'] = 'téléphone';
$_MODULE['<{antadis_iframefacebook}default>stores_9cb6cc1db7fee0f732a1650b1c2f2c52'] = 'Merci d\'indiquer votre code postal. Pour vos recherches hors France métropolitaine, merci d’indiquer une ville et un code postal';

0
themes/default/modules/antadis_productpack/translations/en.php Normal file
View File

7
themes/default/modules/blocknewsletter/translations/en.php
View File

@ -11,10 +11,3 @@ $_MODULE['<{blocknewsletter}default>blocknewsletter_77c576a354d5d6f5e2c1ba50167a
$_MODULE['<{blocknewsletter}default>blocknewsletter_99c8b8e5e51bf8f00f1d66820684be9a'] = 'This email is already registered and/or invalid.';
$_MODULE['<{blocknewsletter}default>blocknewsletter_198584454b0ce1101ff5b50323325aa8'] = 'Your email address';
$_MODULE['<{blocknewsletter}default>blocknewsletter_b26917587d98330d93f87808fc9d7267'] = 'Subscribe';
$_MODULE['<{blocknewsletter}default>blocknewsletter_a12a22304203af6dbfbdd825373d4816'] = 'To receive information for Laboratoire Garancia,';
$_MODULE['<{blocknewsletter}default>blocknewsletter_c5a429e67a1ec707c103b37c88e6e204'] = 'subscribe to our newsletter.';
$_MODULE['<{blocknewsletter}default>blocknewsletter_d59ed62281b8f663e40f815d1cb4db77'] = 'Fill in your email';
$_MODULE['<{blocknewsletter}default>blocknewsletter_2885912f0eeacf9db5feaad8779c8ffc'] = 'Subscribe';
$_MODULE['<{blocknewsletter}default>blocknewsletter_31608c30a446b67b459947b8e5f2cc55'] = 'Unsubscribe from our newsletter';
$_MODULE['<{blocknewsletter}default>blocknewsletter_bba9f1bf751834fe93d82cf0870ffa23'] = 'Back';
$_MODULE['<{blocknewsletter}default>blocknewsletter_7d206237f9912ea010005db2c20b60ce'] = 'Close';

8
themes/default/modules/garanciavap/translations/en.php Normal file
View File

@ -0,0 +1,8 @@
<?php
global $_MODULE;
$_MODULE = array();
$_MODULE['<{garanciavap}default>garanciavap_ea876c69223ea3bfaa3a80b58157aff0'] = 'evenement-garancia';
$_MODULE['<{garanciavap}default>display_fbf01217c6170866cdcda2916ae98802'] = 'I already love it';
$_MODULE['<{garanciavap}default>display_8fc054f6ce1e64407b1371999d5584ba'] = 'Gift founded';
$_MODULE['<{garanciavap}default>display_aeba239d552d5da1164277971c55a9d8'] = 'I want it !';

3
themes/default/modules/garanciavap/translations/fr.php
View File

@ -3,3 +3,6 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{garanciavap}default>garanciavap_ea876c69223ea3bfaa3a80b58157aff0'] = 'evenement-garancia';
$_MODULE['<{garanciavap}default>display_fbf01217c6170866cdcda2916ae98802'] = 'Je l\'aime déjà';
$_MODULE['<{garanciavap}default>display_8fc054f6ce1e64407b1371999d5584ba'] = 'Cadeau trouvé';
$_MODULE['<{garanciavap}default>display_aeba239d552d5da1164277971c55a9d8'] = 'Je craque !';

0
themes/default/modules/powatag/translations/en.php Normal file
View File