Merge branch 'ticket-14904-achatexpressmobile' into develop

This commit is contained in:
Michael RICOIS 2017-12-11 17:15:15 +01:00
commit 942d900e47
3 changed files with 12 additions and 32 deletions

View File

@ -37,29 +37,6 @@ var customizationIdMessage = '{l s='Customization #' mod='blockcartex' js=1}';
var removingLinkText = '{l s='remove this product from my cart' mod='blockcartex' js=1}';
</script>
{/if}
<script type="text/javascript">{literal}
<!--
$(document).ready(function() {
var cart_hide = function(event){
if($("#cart_block #cart_block_list").has($(event.target)).length == 0) {
event.stopPropagation();
event.data.m.removeClass('active');
$("#cart_block #cart_block_list").hide();
$("html, #header_user li.last > a").unbind("click", cart_hide);
}
}
/*
$("#cart_block #cart_block_summary").click(function(event){
event.stopPropagation();
var m = $(this);
m.toggleClass('active');
$("#cart_block #cart_block_list").toggle();
$("html, #header_user li.last > a").bind("click", {m: m}, cart_hide);
});
*/
});
-->
{/literal}</script>
<!-- MODULE Block cart -->
<div id="cart_block" class="block exclusive">
@ -170,5 +147,4 @@ $(document).ready(function() {
</div>
</div>
<!-- /MODULE Block cart -->
{/if}

View File

@ -136,13 +136,9 @@
font-style: normal;
}
#availability_statut {
bottom: 15px;
text-align: center;
position: absolute;
margin: 0px;
width: 187px;
padding: 0px 15px;
line-height: 1.3em;
padding: 0px;
}
#add_to_cart input {
background : url('./themes/site_mobile/modules/expresscart/arrow.png') no-repeat right 9px #514C8C;
@ -286,8 +282,7 @@
text-align: center;
}*/
{/literal}</style>
</head>
<body id="product" class="singleCol">
<script type="text/javascript">
// <![CDATA[
@ -386,6 +381,15 @@
});
{/literal}
{literal}
$(function() {
$('p#add_to_cart input').unbind('click').click(function(){
ajaxCart.add( $('#product_page_product_id').val(), $('#idCombination').val(), true, null, $('#quantity_wanted').val(), null);
return false;
});
});
{/literal}
//]]>
</script>

View File

@ -77,7 +77,7 @@
{/if}
{/if}
{/if}
<div style="float:right; width:45%;">
<div style="float:right; width:40%;">
{if isset($product.quantity_all_versions)}
{if $product.quantity_all_versions <= 0 && $product.quantity <= 0}
{else}