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

Merge branch 'ticket-12571-randomProduct'

Browse Source
This commit is contained in:
Marion Muszynski 2017-02-23 15:22:01 +01:00
commit 349eb7cbe4
4 changed files with 62 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
themes/site/css/style.css
View File

@ -3051,7 +3051,7 @@ div.addresses ul.address li.address_title {
top: -37px;
width: 257px;
display: none;
z-index: 2;
z-index: 3;
}
#product .info_coeur p{
color: #666666;
@ -7100,6 +7100,30 @@ table#carrierTable tbody td {
z-index: 2;
border-top: 0;
}
#category .info_random {
background: #fff;
height: auto!important;
padding: 10px!important;
left: 300px;
width: 150px;
position: absolute;
top: 115px;
display: none;
z-index: 3;
border-radius: 4px;
-webkit-filter:drop-shadow(rgba(0, 0, 0, 0.3) 0 2px 10px);
filter: drop-shadow(rgba(0, 0, 0, 0.3) 0 2px 10px);
}
#category .info_random:before{
content: '';
left: -10px;
top: 20px;
position: absolute;
border-top: 15px solid transparent;
border-bottom: 15px solid transparent;
border-right: 15px solid #fff;
}
#product .random{
left: 370px;
position: absolute;
@ -7110,13 +7134,25 @@ table#carrierTable tbody td {
height: 50px;
}
#product .info_random {
background: url(../img/bg_coup_coeur.png) no-repeat;
height: 143px;
left: 410px;
padding: 30px 45px;
background: #fff;
height: auto;
padding: 10px;
left: 412px;
width: 150px;
position: absolute;
top: -10px;
width: 257px;
top: 45px;
display: none;
z-index: 2;
}
z-index: 3;
border-radius: 4px;
-webkit-filter:drop-shadow(rgba(0, 0, 0, 0.3) 0 2px 10px);
filter: drop-shadow(rgba(0, 0, 0, 0.3) 0 2px 10px);
}
#product .info_random:before{
content: '';
left: -10px;
top: 20px;
position: absolute;
border-top: 15px solid transparent;
border-bottom: 15px solid transparent;
border-right: 15px solid #fff;
}

16
themes/site/modules/categoryscroll/header.tpl
View File

@ -5,6 +5,12 @@ $(document).ready(function() {
var endreached = false;
var filter = new Array();
$('.random').hover(function() {
$('.info_random').stop(true, true).fadeIn();
}, function(){
$('.info_random').stop(true, true).fadeOut();
});
$(window).scroll(function() {
if(!endreached && !error) {
if((($(window).scrollTop() + $(window).height()) + 550) >= $(document).height()) {
@ -26,7 +32,7 @@ $(document).ready(function() {
animation: "slide",
controlNav: false,
slideshow: false,
itemWidth: 300,
itemWidth: 300,
pauseOnHover : false,
mousewheel: false,
});
@ -48,14 +54,14 @@ $(document).ready(function() {
}
}
});
$(".block_filter :checkbox").change(function(){
if(loading == false) {
filter.length = 0;
$(".block_filter input:checkbox[name=size]:checked").each(function(){
filter.push($(this).val());
});
$("#product_list").val(0);
$("#product_list").val(0);
loading = true;
$.get("{/literal}{$base_dir_ssl}{literal}modules/categoryscroll/ajax.php?c={/literal}{$id_category}{literal}&init=1&f="+ filter +"&p=1", function(loaded) {
@ -69,7 +75,7 @@ $(document).ready(function() {
animation: "slide",
controlNav: false,
slideshow: false,
itemWidth: 300,
itemWidth: 300,
pauseOnHover : false,
mousewheel: false,
});
@ -87,7 +93,7 @@ $(document).ready(function() {
loading = false;
$("#product_list").trigger('updated');
});
}
}
// $.scrollTo('#product_list', 400);
});

3
themes/site/modules/categoryscroll/product-list.tpl
View File

@ -10,6 +10,9 @@
<div class="random">
<img src="{$img_dir}random.png" alt="{l s='Random'}">
</div>
<div class="info_random">
<p>{l s='Bébé Boutik vous propose se produit de façon aléatoire !'}</p>
</div>
{/if}
<h3>{if isset($product.new) && $product.new == 1}<span class="new">{l s='New' mod='categoryscroll'}</span>{/if}<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:64:'...'|escape:'htmlall':'UTF-8'}</a></h3>
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}

3
themes/site/product-list.tpl
View File

@ -39,6 +39,9 @@
<div class="random">
<img src="{$img_dir}random.png" alt="{l s='Random'}">
</div>
<div class="info_random">
<p>{l s='Bébé Boutik vous propose se produit de façon aléatoire !'}</p>
</div>
{/if}
<h3>{if isset($product.new) && $product.new == 1}<span class="new">{l s='New'}</span>{/if}<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:64:'...'|escape:'htmlall':'UTF-8'}</a></h3>
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.av3ailable_for_order) && $product.available_for_order)))}