Merge branch 'ticket-14826-fix-product-title' into develop

# Conflicts:
#	themes/site_mobile/product-list.tpl
This commit is contained in:
David 2018-01-02 11:52:06 +01:00
commit c71c1e7712
3 changed files with 30 additions and 1 deletions

View File

@ -5352,3 +5352,17 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
height: 30px;
width: 100%;
}
#product_list li div.expresscart_container {
float: right;
width: 40%;
}
#product_list li div.expresscart_container a.button.expresscart {
padding-left: 36px;
background: url("../img/add_to_cart.png") no-repeat left center #fb66a9;
height: 32px;
width: 38px;
display: block;
position: absolute;
bottom: 4px;
border-radius: 20px;
}

View File

@ -55,6 +55,21 @@
</div>
</div>
</div>
<div class="expresscart_container">
{if isset($product.quantity_all_versions)}
{if $product.quantity_all_versions <= 0 && $product.quantity <= 0}
{else}
<a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart.php')}?add&amp;id_product={$product.id_product|intval}{if isset($static_token)}&amp;token={$static_token}{/if}" title="{l s='Express buy'}">
</a>
{/if}
{else}
{if $product.quantity <= 0}
{else}
<a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart.php')}?add&amp;id_product={$product.id_product|intval}{if isset($static_token)}&amp;token={$static_token}{/if}" title="{l s='Express buy'}">
</a>
{/if}
{/if}
</div>
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}

View File

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