Merge branch 'tiket-productTemplate' into develop

This commit is contained in:
Marion Muszynski 2016-04-26 16:43:52 +02:00
commit 3aa40ff214
2 changed files with 37 additions and 34 deletions

View File

@ -5926,7 +5926,8 @@ div.two-part-form{
position: relative;
margin-bottom: 5px;
}
div.two-part-form:after{
div.two-part-form:after,
div.form-attr-qty:after{
display: block;
content: '';
clear: both;

View File

@ -309,6 +309,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</div>
<div class="form-right">
<div class="form-attr-qty">
{if isset($groups)}
<!-- attributes -->
<div id="attributes">
@ -343,6 +344,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
checkMinimalQuantity();
</script>
{/if}
</div>
<div class="clear"></div>
<p{if (!$allow_oosp && $product->quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE} style="display: none;"{/if} id="add_to_cart" class="buttons_bottom_block"><input type="submit" name="Submit" value="{l s='Add to cart'}" class="exclusive" /></p>
</div>