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

Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/chocolatdemariage.git

Browse Source
This commit is contained in:
Michael RICOIS 2017-08-28 17:32:24 +02:00
commit 84682fc048
7 changed files with 106 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
www/modules/antadisconfigurator/translations/fr.php Normal file
View File

@ -0,0 +1,36 @@
<?php
global $_MODULE;
$_MODULE = array();
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorcontroller_49ee3087348e8d44e1feda1917443987'] = 'Nom';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorcontroller_5b778a3fec84fa19607fe44ac9279023'] = 'Ajouter une nouvelle option';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorcontroller_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorcontroller_630f6dc397fe74e52d5189e2c80f282b'] = 'Retour à la liste';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorcontroller_fce2e84f3cce0e5351e85e9f0cb20107'] = 'Ajouter une nouvelle valeur';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorcontroller_e79d86d6e40ac7193bf110459c8524b3'] = 'Ajouter / Editer';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorcontroller_04b2e4188d4ef8051e4699da8af01335'] = 'Séparateur';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductgroupcontroller_c0babe5601b3f91313d53267c3c7ec24'] = 'Retour au produit';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductgroupcontroller_cad8a76c4d01c805ce0e9d2178709a2f'] = 'Nom de l\'option';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductgroupcontroller_b48968e1c912da07df5e8d6d246291ec'] = 'Nom affiché';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductgroupcontroller_a34e1a74ff1932de37feb1ebfd09f150'] = 'Référence de l\'option';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductgroupcontroller_b651efdb98a5d6bd2b3935d0c3f4a5e2'] = 'Requis';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductgroupcontroller_6e900c218e6594fdf2ae2865dfe7948b'] = 'Erreur lors de l\'enregistrement du statut obligatoire';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductgroupcontroller_8cc7b9210be608805579bc556f9685e8'] = 'Le status obligatoire a été mis à jour';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductgroupcontroller_6e8dcd20054269e2d205d3176bc6e2d8'] = 'Erreur lors de l\'enregistrement du statut de visibilité';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductgroupcontroller_3f37459f85173ef06b31b808ce3ae40d'] = 'Le statut de visibilité à été mis à jour';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductimpactcontroller_c0babe5601b3f91313d53267c3c7ec24'] = 'Retour au produit';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductimpactcontroller_e84b89aec8fddadf6ddc746d229ea8a9'] = 'Retour au groupe';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductimpactcontroller_689202409e48743b914713f96d93947c'] = 'Valeur';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductimpactcontroller_233c543a23378c4ffd0e1efb17408510'] = 'Impact sur le prix';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductimpactcontroller_c355df1f3a61d70462884158ccb25daa'] = 'Modifier l\'impact sur le prix';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductimpactcontroller_3601146c4e948c32b6424d2c0a7f0118'] = 'Prix';
$_MODULE['<{antadisconfigurator}prestashop>adminantadisconfiguratorproductimpactcontroller_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';
$_MODULE['<{antadisconfigurator}prestashop>displayadminproductsextra_cad8a76c4d01c805ce0e9d2178709a2f'] = 'Nom de l\'option';
$_MODULE['<{antadisconfigurator}prestashop>displayadminproductsextra_a13b0f2e9253cf4e9dd256b2463d4ff6'] = 'Référence de l\'option';
$_MODULE['<{antadisconfigurator}prestashop>displayadminproductsextra_19954120f7ad95815bfe1de9678cc3d7'] = 'Options du produit';
$_MODULE['<{antadisconfigurator}prestashop>getcontent_a8857300bc0616cb6add7ca3f6f0743c'] = 'Options du configurateur';
$_MODULE['<{antadisconfigurator}prestashop>getcontent_b56109f289e95055bb7fe3c8acd80084'] = 'Changement du prix sur l\'évennement du formulaire:';
$_MODULE['<{antadisconfigurator}prestashop>getcontent_405ffec1df2a2d5dc865cd0bbc6479ab'] = 'Pour de meilleures performances, désactiver l\'évènement si l\'option n\'a pas d\'impact sur le prix';
$_MODULE['<{antadisconfigurator}prestashop>getcontent_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
$_MODULE['<{antadisconfigurator}prestashop>getcontent_b9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
$_MODULE['<{antadisconfigurator}prestashop>getcontent_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer';

45
www/themes/chocolatdemariage/css/global.css
View File

@ -326,7 +326,7 @@ body.content_only { margin: 0; }
padding: 20px 15px;
}
.myaccount:hover .account-links {
opacity: 1;
opacity: 0;
pointer-events: auto;
background-color: #fff;
box-shadow: 0 0 10px rgba(0,0,0,0.2);
@ -1144,7 +1144,9 @@ body.content_only { margin: 0; }
}
.cart-layout i.icon-cart:before {
z-index: 1;
position: relative;
color: #4f3528;
}
.cart-layout:hover .ajax_cart_quantity > i {
@ -1216,10 +1218,10 @@ body.content_only { margin: 0; }
.cart-layout .products, .cart-layout
.cart_block .ajax_cart_no_product { }
.cart-layout .cart-prices { font-size: 16px; }
.cart-layout:hover .block-layout { display: none; }
@media (min-width: 990px) {
.cart-layout:hover .block-layout { display: block; top: 49px; opacity: 1; z-index: 100; height: auto; padding-top: 15px; }
.cart-layout:hover .block-layout { /*display: block;*/ top: 49px; opacity: 1; z-index: 100; height: auto; padding-top: 15px; }
.cart-layout:hover .block-layout.emptyBlock { display: none; }
}
@media (max-width: 1349px) {
@ -1227,6 +1229,7 @@ body.content_only { margin: 0; }
}
@media (max-width: 990px) {
#header-cart.cart-layout .nb-total-product {
color: #bd0132;
margin-left: -14px;
@ -1732,6 +1735,7 @@ body.content_only { margin: 0; }
bottom: auto;
top: 25px;
color: #fff;
z-index: 2;
}
@ -1750,9 +1754,11 @@ body.content_only { margin: 0; }
.subcategories-home > .row .item img {
float: left;
}
.subcategories-home .icon:before {
}
.subcategories-home .icon-pochette:before,
.subcategories-home .inner .icon-aurore_chocolats:before { font-size: 31px; }
.subcategories-home .inner .icon-aurore_chocolats:before { font-size: 21px; }
.subcategories-home .inner:before {
@ -1765,6 +1771,7 @@ body.content_only { margin: 0; }
background-color: rgba(53, 24, 15, 0.65);
opacity: 0;
display: block;
}
.subcategories-home .inner:hover:before {
opacity: 1;
@ -1772,23 +1779,36 @@ body.content_only { margin: 0; }
-webkit-transition: 0.5s all;
}
.subcategories-home .inner .icon-featured {
width: 105px;
height: 105px;
width: 88px;
height: 88px;
font-size: 40px;
line-height: 105px;
/*line-height: 88px;*/
text-align: center;
}
.subcategories-home .inner .icon-featured:after {
content: '\e917';
position: absolute;
right: 0;
font-size: 104px;
font-size: 70px;
line-height: 88px;
left: 0;
top: 0;
}
.subcategories-home .inner .icon-featured:before {
line-height: 88px;
font-size: 25px;
}
.subcategories-home .inner > .icon-featured {
position: absolute;
background-color: rgba(255, 255, 255, 0.65);
border-radius: 60px;
right: 14px;
top: 25px;
}
.subcategories-home .inner .icon-pochette:before,
.subcategories-home .inner .icon-icon-aurore_chocolats:before {
font-size: 19px;
}
.subcategories-home .inner .content {
height: 180px;
@ -2734,7 +2754,7 @@ body.content_only { margin: 0; }
}
.sitereviews-block {
position: relative;
/*position: relative;*/
padding-bottom: 45px;
padding-left: 45px;
}
@ -2832,6 +2852,7 @@ body.content_only { margin: 0; }
overflow: hidden;
background-repeat: no-repeat;
position: relative;
padding-bottom: 60px;
}
.sitereviews-slider-ctn .bg:after {
content: '';
@ -2845,6 +2866,8 @@ body.content_only { margin: 0; }
font-size: 16px;
color: #4f3528;
font-weight: bold;
bottom: 45px;
position: absolute;
}
.sitereviews .owl-nav i {
font-size: 10px;
@ -2852,6 +2875,10 @@ body.content_only { margin: 0; }
-webkit-transition: 0.5s all;
padding: 0;
}
.sitereviews .owl-carousel .owl-item {
position: static;
}
.sitereviews .owl-nav {
position: absolute;
right: 45px;

20
www/themes/chocolatdemariage/css/k2000.css
View File

@ -289,16 +289,24 @@ a { color: inherit; }
/**************************************** == FLEXSLIDER == ************************************/
.flex-control-paging li a:before { content: "\e91b"; font-family: 'icomoon'; font-size: 20px; color: #fff; }
.flex-control-paging li a:before {
content: "\e91b";
font-family: 'icomoon';
font-size: 20px;
line-height: 21px;
color: #fff;
}
.flex-control-paging li a.flex-active:after {
content: "\e91c";
font-family: 'icomoon';
color: #fff;
position: absolute;
top: 0px;
top: 0;
bottom: 0;
left: 0;
font-size: 13px;
line-height: 20px;
text-align: center;
right: 0;
height: 0;
@ -315,6 +323,8 @@ a { color: inherit; }
position: relative;
text-indent: 0;
font-size: 0;
line-height: 20px;
height: 20px;
}
.flex-control-paging li a:hover { background-color: transparent; }
@ -584,7 +594,10 @@ input[disabled].btn { background: #fff; border-color: #fff; color: #363842; curs
padding: 2px 1px;
position: relative;
}
.authentication .form-group .form-control-ctn *,
.account .form-group .form-control-ctn * {
z-index: 1;
}
.auth .form-group .form-control-ctn { background-color: #fff; }
.product-main:not(.configurator).form-group .form-control-ctn > * {
@ -685,6 +698,7 @@ header.page-heading.category { background: none; padding: 0; }
display: inline-block;
font-weight: normal;
padding-right: 15px;
cursor: pointer;
}
.back-crumb i {
padding-right: 0px;

BIN
www/themes/chocolatdemariage/img/default-cat.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 629 KiB

3
www/themes/chocolatdemariage/modules/advsitereviews/advsitereviews-carousel.tpl
View File

@ -33,13 +33,14 @@
$('.owl-reviews').owlCarousel({
margin: 0,
nav: true,
loop: true,
responsive:{
0:{
items: 1,
},
767 : {
items: 1,
stagePadding: 30,
// stagePadding: 30,
},
},
navText: ["<i class='icon icon-arrow-cupidon-left'></i>","<i class='icon icon-arrow-cupidon-right'></i>"]

5
www/themes/chocolatdemariage/modules/advslider/advslider.tpl
View File

@ -27,8 +27,9 @@
$('#slider .slider-img').height(ht);
});
$('#slider').flexslider({
slideshow: false,
animation: "slide",
slideshow: true,
slideshowSpeed: 8000,
animation: "fade",
directionNav: false,
controlNav: true,
});

14
www/themes/chocolatdemariage/modules/antadisconfigurator/views/templates/hook/displayProductForm.tpl
View File

@ -73,13 +73,12 @@
{if isset($optSelectedValues[$optGroup['id_configurator_opt_group']])}
{assign var="optValue" value=$optSelectedValues[$optGroup['id_configurator_opt_group']]}
{/if}
{foreach item=optImpact from=$optImpactList[$optGroup['id_product_configurator_opt_group']]}
{foreach name=optImpact item=optImpact from=$optImpactList[$optGroup['id_product_configurator_opt_group']]}
<div class="ctn-input">
<input type="radio" data-url="./?controller=product&impactprice=1&ajax=1" class="custom-input inline {$optGroup['reference']} configurator-opt-click"
name="optgroup-{$optGroup['id_configurator_opt_group']}"
value="{$optImpact['id_configurator_opt']}"{if in_array($optImpact['id_configurator_opt'], $optValue)} checked{/if}/>
<label>
<label for="{$optGroup['reference']}-{$smarty.foreach.optImpact.index}">
{$optImpact['name']}
</label>
</div>
@ -89,13 +88,13 @@
{if isset($optSelectedValues[$optGroup['id_configurator_opt_group']])}
{assign var="optValue" value=$optSelectedValues[$optGroup['id_configurator_opt_group']]}
{/if}
{foreach item=optImpact from=$optImpactList[$optGroup['id_product_configurator_opt_group']]}
{foreach name=optImpact item=optImpact from=$optImpactList[$optGroup['id_product_configurator_opt_group']]}
<div class="ctn-input">
<input type="checkbox" data-url="./?controller=product&impactprice=1&ajax=1" class="custom-input inline {$optGroup['reference']} configurator-opt-click"
name="optgroup-{$optGroup['id_configurator_opt_group']}[]"
name="optgroup-{$optGroup['id_configurator_opt_group']}"
id="{$optGroup['reference']}-{$smarty.foreach.optImpact.index}"
value="{$optImpact['id_configurator_opt']}"{if in_array($optImpact['id_configurator_opt'], $optValue)} checked{/if}/>
<label>
<label for="{$optGroup['reference']}-{$smarty.foreach.optImpact.index}">
{$optImpact['name']}
</label>
</div>
@ -105,6 +104,7 @@
{if isset($optSelectedValues[$optGroup['id_configurator_opt_group']])}
{assign var="optValue" value=$optSelectedValues[$optGroup['id_configurator_opt_group']]}
{/if}
<div class="ctn-input">
<div>
<select id="{$optGroup['reference']}" class="custom-input form-control configurator-opt-change" data-url="./?controller=product&impactprice=1&ajax=1" name="optgroup-{$optGroup['id_configurator_opt_group']}">