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

fix divers

Browse Source
This commit is contained in:
Rémy 2017-07-19 16:42:14 +02:00
parent 5191ee8604
commit 65f428ada0
11 changed files with 79 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/config/defines.inc.php
View File

@ -26,7 +26,7 @@
/* Debug only */
if (!defined('_PS_MODE_DEV_')) {
define('_PS_MODE_DEV_', false);
define('_PS_MODE_DEV_', true);
}
/* Compatibility warning */
define('_PS_DISPLAY_COMPATIBILITY_WARNING_', false);

1
www/modules/advsitereviews/views/templates/hook/advsitereviews.tpl
View File

@ -14,6 +14,7 @@
margin: 0,
nav: false,
autoplay: true,
autoplayTimeout:5000,
mouseDrag: false,
items: 1
});

8
www/themes/versionecologique/category.tpl
View File

@ -42,7 +42,7 @@
</div>
</div>
</section>
{elseif $category->id}
{elseif $category->active == 0}
<p class="alert alert-warning ctn">{l s='This category is currently unavailable.'}</p>
{/if}
{if !empty($subcategories.children)}
@ -114,6 +114,7 @@
stagePadding: 30,
items: 2,
navText: ['<i class="icon icon-arrow-left"></i>','<i class="icon icon-arrow-right"></i>'],
mouseDrag: true,
responsive : {
992 : {
items: 4,
@ -122,8 +123,11 @@
mouseDrag: true
},
1320 : {
stagePadding: 0,
items: 6,
mouseDrag: false
nav: true,
navText: ['<i class="icon icon-arrow-left"></i>','<i class="icon icon-arrow-right"></i>'],
mouseDrag: true
}
}
});

64
www/themes/versionecologique/css/global.css
View File

@ -188,7 +188,7 @@ body.content_only { margin: 0 }
position: absolute;
text-align: left;
top:124px;
width: 250px;
width: 260px;
}
#header #mainmenu:hover .menu-icon { color:#5986d5; }
#header #mainmenu:hover .block-mainmenu { display:block; }
@ -283,7 +283,7 @@ body.content_only { margin: 0 }
background: #ececec;
display: none;
left:0;
padding-left: 250px;
padding-left: 260px;
min-height: 100%;
position: absolute;
top: 0;
@ -455,6 +455,7 @@ body.content_only { margin: 0 }
#header #mainmenu > div > ul.menu-content > li > a:hover { text-decoration: none }
#header #mainmenu > div > ul.menu-content .close-tab > a { border: 0; color: #fff; text-transform: none; text-decoration: none; }
#header #mainmenu > div > ul.menu-content .close-tab > a i.icon-cross {float:left; font-size: 17px; margin-top: -4px; margin-left: -32px; }
#header #mainmenu > div > ul.menu-content .close-tab > a i.icon-arrow-left {float:left; font-size: 17px; margin-top: -4px; margin-left: -32px; }
#header #mainmenu > div > ul.menu-content > .search-on-menu { position: absolute; top: 5px; right: 11px; font-size: 25px; padding: 15px; color: #fff; }
#header #mainmenu > div > ul > li > .main-submenu { background: #fff; height: 100%; top:35px; left: -101%; margin: 0; overflow-y: auto; position: fixed; transition: all 0.3s ease 0s; width: 50%; z-index: 2 }
@ -464,7 +465,7 @@ body.content_only { margin: 0 }
#header #mainmenu > div > ul > li > * + .main-submenu .close-tab { padding: 0 30px 0 50px; width:100%;}
#header #mainmenu > div > ul > li > * + .main-submenu .close-tab a {display: block;}
#header #mainmenu > div > ul > li > * + .main-submenu .main-submenu-infos { margin-bottom:50px; }
#header #mainmenu > div > ul > li > * + .main-submenu .main-submenu-infos .title { display:block; font-size:18px; font-family:"RubikMedium"; padding: 10px 30px 15px 50px; width: 100%; }
#header #mainmenu > div > ul > li > * + .main-submenu .main-submenu-infos .title { display:block; font-size:18px; font-family:"RubikMedium"; padding: 10px 30px 15px 50px; text-decoration:none;width: 100%; }
#header #mainmenu > div > ul > li > * + .main-submenu .main-submenu-infos li { padding: 0 30px 0 50px; width: 100%;}
#header #mainmenu > div > ul > li > * + .main-submenu .menu-subtitle { border: 0; color: #363842; display: block; font-size: 16px; font-weight: 900; padding: 30px 0 0 0; text-transform: uppercase; }
#header #mainmenu > div > ul > li > * + .main-submenu .cta-menu { display: none; }
@ -522,6 +523,7 @@ body.content_only { margin: 0 }
#header #mainmenu .menu-content .infos-menu [class^="icon"] { font-size: 35px; }
#header #mainmenu .menu-content .infos-menu [class^="icon"]:before { color:#715bf4; }
#header #search_block_left #search_query_block { bottom:inherit; height:inherit;}
#header .header-right {
/*width:100%;*/
}
@ -529,6 +531,7 @@ body.content_only { margin: 0 }
left: 50%;
margin-bottom: 0;
position: fixed;
text-decoration: none;
top: 9px;
transform: translateX(-50%);
white-space: nowrap;
@ -1135,13 +1138,13 @@ body.content_only { margin: 0 }
#slider-home { height:1004px; position: relative; }
#slider-home #slider img {
float: none;
height:330px;
height:360px;
margin: 0 auto;
width:330px;
width:360px;
}
#slider-home .slider .homeslider-ctn .homeslider-description-block { width: 100%; left: 0; margin-top:40px; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .homeslider-title { width:200px; margin-top:60px; margin-bottom:90px; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .homeslider-baseline { font-size: 15px; top:74% }
#slider-home .slider .homeslider-ctn .homeslider-description-block .homeslider-title { width:200px; margin-top:60px; margin-bottom:120px; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .homeslider-baseline { font-size: 15px; margin-bottom:20px; }
#slider-home .slider .homeslider-ctn .homeslider-description-block span.btn-ctn { top:82%; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .btn-ctn a.btn { font-size: 13px; line-height: normal; padding: 7px 19px; }
@ -1173,11 +1176,11 @@ body.content_only { margin: 0 }
@media(max-width: 480px) {
#slider-home { top:80px; margin-bottom: 80px; height:924px; }
#slider-home #slider img { width:260px; height:260px; }
#slider-home #slider img { width:290px; height:290px; }
#slider-home .slider .homeslider-ctn { height: 420px; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .homeslider-title { width:200px; margin-top:60px; margin-bottom:90px; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .homeslider-title { width:200px; margin-top:60px; margin-bottom:120px; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .homeslider-title span { font-size: 20px; left:0; line-height:31px; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .homeslider-baseline { font-size: 15px; top:68%; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .homeslider-baseline { font-size: 15px; margin-bottom: 10px; }
#slider-home .slider .homeslider-ctn .homeslider-description-block span.btn-ctn { top:78%; }
#slider-home .slider .homeslider-ctn .homeslider-description-block .btn-ctn a.btn { font-size: 13px; line-height: normal; padding: 7px 19px; }
@ -1371,6 +1374,10 @@ body.content_only { margin: 0 }
.our-univers .featured-categories .featured-category:hover .featured-category-infos-ctn .favourites-link a {
display:block;
}
.our-univers .featured-categories .owl-blockcms .inner {height:300px;}
.our-univers .featured-categories .owl-blockcms .bloc-cms-item > .title,
.our-univers .featured-categories .owl-blockcms .bloc-cms-item > .img { display:none; }
.our-univers .featured-categories .owl-blockcms .bloc-cms-item > .content p img { display: block; width: initial; margin: 0 auto; height: initial;}
@media(min-width: 1320px) {
@ -2040,8 +2047,6 @@ body.content_only { margin: 0 }
#category .favorites-list .favorites-list-tabs label:hover:after { background-color:#715bf4;}
#category .favorites-list .favorites-list-tabs #content-favorites,
#category .favorites-list .favorites-list-tabs #content-news { display:none; font-size: 14px;}
#category .favorites-list .favorites-list-tabs #content-favorites .owl-favorites-tabs .owl-stage,
#category .favorites-list .favorites-list-tabs #content-news .owl-favorites-tabs .owl-stage{ right:30px;}
#category .favorites-list .favorites-list-tabs #content-favorites .owl-favorites-tabs .icon-arrow-left,
#category .favorites-list .favorites-list-tabs #content-news .owl-favorites-tabs .icon-arrow-left { display:none;}
#category .favorites-list .favorites-list-tabs #content-favorites .owl-favorites-tabs .icon-arrow-right,
@ -2364,6 +2369,10 @@ body.content_only { margin: 0 }
#category .categories-list .category-item .category-item-img-ctn img { height:140px; }
#category .favorites-list .products-list .inner { width:100%;}
#category .favorites-list .favorites-list-tabs #content-favorites .owl-favorites-tabs .owl-stage,
#category .favorites-list .favorites-list-tabs #content-news .owl-favorites-tabs .owl-stage{ right:30px;}
/***** BLOC FILTRES ******/
#category .listing-filters {
/*box-shadow: -720px 0 0 0 rgba(0, 0, 0, 0.5);*/
@ -2573,6 +2582,10 @@ body.content_only { margin: 0 }
#product .bloc-product-left .img-list .product-share-menu li + li { margin-top: 5px;}
#product .bloc-product-left .img-list .product-share-menu.displayMe { display:block;}
#product .fancybox-inner { overflow: hidden !important; }
#product .fancybox-inner .img-responsive { width:100%;}
#product .attribute-title { font-family : "RubikMedium"; font-size:14px; }
#product .bloc-product-right-configurator { font-family:"RubikRegular"; }
@ -2622,6 +2635,8 @@ body.content_only { margin: 0 }
#product .product-configurator .bloc-options-FILEVISUEL1 {}
#product .product-configurator .bloc-options-FILEVISUEL1 h4 { display:none;}
#product .product-configurator .bloc-options-FILEVISUEL1 .subtitle-infos { display:none;}
#product .product-configurator .bloc-options-FILEVISUEL1 .uploaded-file { display:inline; position:relative;}
#product .product-configurator .bloc-options-FILEVISUEL1 .file-value {
border: 2px solid #ccc;
border-radius: 6px;
@ -2629,8 +2644,27 @@ body.content_only { margin: 0 }
font-family: "RubikMedium";
font-size: 14px;
margin-right:30px;
padding: 13px 22px;
padding: 13px 42px 13px 22px;
}
#product .product-configurator .bloc-options-FILEVISUEL1 .delete_upload {
background: #ccc;
border-bottom-right-radius: 6px;
border-top-right-radius: 6px;
padding: 13px 12px;
position: absolute;
right: 35px;
top: -10px;
opacity:0;
cursor: pointer;
}
#product .product-configurator .bloc-options-FILEVISUEL1 .delete_upload i {font-size:12px; position:relative; top:-1px;}
#product .product-configurator .bloc-options-FILEVISUEL1 .delete_upload:hover,
#product .product-configurator .bloc-options-FILEVISUEL1 .file-value:hover ~ .delete_upload { opacity:1;}
#product .product-configurator .bloc-options-FILEVISUEL1 .delete_upload:hover { background:#715bf4;}
#product .product-configurator .bloc-options-FILEVISUEL1 .delete_upload:hover i { color:#fff;}
#product .product-configurator .bloc-options-FILEVISUEL1 .file-infos { display:inline-block; font-size:12px; margin-right:30px; }
#product .product-configurator .bloc-options-FILEVISUEL1 .file-infos span { font-size:14px; }
#product .product-configurator .bloc-options-FILEVISUEL1 .file-infos p { margin:0; width:150px; }
@ -3753,6 +3787,10 @@ body.content_only { margin: 0 }
#search .results-info { padding:15px; display:block;}
@media (max-width: 991px) {
#search section { padding:120px 0 60px;}
}
/*************************************************************************************************************

4
www/themes/versionecologique/css/k2000.css
View File

@ -498,7 +498,7 @@ header.page-heading.order-process { padding: 70px 0 0 0; }
}
.product-ctn .inner {
height: 450px;
height: 460px;
position: relative;
width:300px;
}
@ -548,7 +548,7 @@ header.page-heading.order-process { padding: 70px 0 0 0; }
.product-ctn .color-list-container ul.color_to_pick_list li span[style*="ffffff"] { border:1px solid #C6C6C6; }
.product-ctn .product-infos {
background: #fff;
height:150px;
height:160px;
padding: 5px 20px 10px;
position: static;
z-index: 2;

3
www/themes/versionecologique/js/global.js
View File

@ -271,13 +271,16 @@ $(document).ready(function() {
});
$(".bloc-options-FILEVISUEL1 .file-value").hide();
$(".bloc-options-FILEVISUEL1 .delete_upload").hide();
$(".file-value").on('change', function(){
if($(".bloc-options-FILEVISUEL1 .file-value").html().length > 0) {
$(".bloc-options-FILEVISUEL1 .file-value").show();
$(".bloc-options-FILEVISUEL1 .delete_upload").show();
$(".bloc-options-FILEVISUEL1 .already-uploaded").hide();
} else {
$(".bloc-options-FILEVISUEL1 .file-value").hide();
$(".bloc-options-FILEVISUEL1 .delete_upload").hide();
$(".bloc-options-FILEVISUEL1 .already-uploaded").show();
}
});

4
www/themes/versionecologique/modules/advmenu/advmenu.tpl
View File

@ -29,16 +29,16 @@
<div class="close-tab backButton">
<a href="#">
<span>{l s='Retour' mod='advmenu'}</span>
<i class="icon icon-cross"></i>
<i class="icon icon-arrow-left"></i>
</a>
</div>
<div class="hidden-xxs hidden-xs hidden-sm main-submenu-img">
<img src="{$base_dir}img/c/home/{$rootLink.id_category}.jpg" alt="" />
</div>
<div class="main-submenu-infos">
<span class="title">{$rootLink.category->name}</span>
{if !empty($rootLink.subcategories)}
<ul class="submenu-infos-list">
<li><a href="{$link->getCategoryLink($rootLink.id_category)}" class="title">{$rootLink.category->name}</a></li>
{foreach from=$rootLink.subcategories item=subcategory name=subcategory key=k}
<li><a href="{$link->getCategoryLink($subcategory.id_category)}">{$subcategory.name}{if ($k + 1) < $rootLink.subcategories|@count},{/if}</a></li>
{/foreach}

3
www/themes/versionecologique/modules/advslider/advslider.tpl
View File

@ -52,8 +52,7 @@
loop: true,
nav: false,
dots:true,
// navText: ['<i class="icon icon-arrow-left"></i>','<i class="icon icon-arrow-right"></i>'],
// autoplay: true,
autoplay: true,
autoplayTimeout:5000,
animateIn: 'fadeIn',
animateOut: 'fadeOut',

3
www/themes/versionecologique/modules/antadisconfigurator/displayProductForm.tpl
View File

@ -47,7 +47,10 @@
{elseif $optGroup['type'] == 'file'}
<div class="valign-middle">
{assign var="optValue" value=""}
<div class="uploaded-file">
<span id="response-optgroup-{$optGroup['id_configurator_opt_group']}-{$optImpact['id_configurator_opt']}" class="file-value">{$optValue}</span>
<span class="delete_upload"><i class="icon icon-cross"></i></span>
</div>
<div class="file-infos">
<span>{$optGroup['name']}</span>
<p>{$optGroup['description']}</p>

1
www/themes/versionecologique/product-list.tpl
View File

@ -109,6 +109,7 @@
</div>
<!-- Pictos -->
{if $product.favorites_product != 1}qdqzd{/if}
{hook h="displayPictogrammesProduct" id_product=$product.id_product is_listing=true}
</div>

6
www/themes/versionecologique/product.tpl
View File

@ -44,7 +44,9 @@
{assign var=imageTitle value=$product->name|escape:'html':'UTF-8'}
{/if}
<li id="large_{$image.id_image}">
<img class="img-responsive" id="lg_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'large_default')|escape:'html':'UTF-8'}" alt="{$imageTitle}" title="{$imageTitle}"{if isset($cartSize)} height="{$cartSize.height}" width="{$cartSize.width}"{/if} itemprop="image" />
<a href="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'thickbox_default')|escape:'html':'UTF-8'}" class="fancybox">
<img class="img-responsive" id="lg_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'large_default')|escape:'html':'UTF-8'}" alt="{$imageTitle}" title="{$imageTitle}" itemprop="image" />
</a>
</li>
{/foreach}
{/if}
@ -394,7 +396,7 @@
var input_file = $(this).siblings('input[type=file]');
input_file.trigger("click");
});
$(".slides .img-responsive").fancybox();
$("#slider .img-responsive").fancybox();
});
</script>