Merge branch 'ticket-14826-fix-product-title' into develop
# Conflicts: # themes/site_mobile/css/style.css # themes/site_mobile/product-list.tpl
This commit is contained in:
David
commit
2d84b8127e
@ -1670,6 +1670,7 @@ body#category .sale_title, body#product .sale_title {
|
||||
padding: 10px 0px;
|
||||
border-top: 1px solid #e4e4e4;
|
||||
border-bottom: 1px solid #e4e4e4;
|
||||
padding: 10px 0px;
|
||||
text-align: left;
|
||||
clear:both;
|
||||
}
|
||||
@ -1808,9 +1809,6 @@ body#order table#cart_summary tbody tr.cart_item .cart_description h5 a{
|
||||
body#category ul#product_list li div.list-product-price{
|
||||
font-size:12px;
|
||||
padding:0px 2% 0px 4%;
|
||||
position: absolute;
|
||||
bottom: 10px;
|
||||
width: 100%;
|
||||
}
|
||||
body#category ul#product_list li div.list-product-price span.old_price{
|
||||
display:block;
|
||||
@ -3821,9 +3819,9 @@ h2.title{
|
||||
margin-bottom: 10px;
|
||||
font-size: 18px;
|
||||
font-weight: normal;
|
||||
/* padding: 10px;*/
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
/* position: relative;*/
|
||||
clear:both;
|
||||
/* -webkit-box-shadow: 0 5px 3px -3px #ccc;
|
||||
-moz-box-shadow: 0 5px 3px -3px #ccc;
|
||||
box-shadow: 0 5px 3px -3px #ccc;*/
|
||||
@ -5124,7 +5122,7 @@ body#product #best-sellers_block_product{
|
||||
}
|
||||
*/
|
||||
#product_list li div.productQuantityAlert{
|
||||
/*text-align: center;*/
|
||||
text-align: center;
|
||||
/*width: 250px;*/
|
||||
margin: 0 !important;
|
||||
padding: 5px 0 !important;
|
||||
@ -5354,13 +5352,3 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
|
||||
height: 30px;
|
||||
width: 100%;
|
||||
}
|
||||
#product_list li div.right_block 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;
|
||||
}
|
||||
|
||||
@ -28,23 +28,6 @@
|
||||
{if $product_reduction>0}
|
||||
<span class="reduction">(-{$product_reduction|round|string_format:'%d'}%)</span>
|
||||
{/if}
|
||||
{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}
|
||||
<p>{l s='Warning: 1 item in stock!' mod='categoryscroll'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :' mod='categoryscroll'} {$product.quantity_all_versions} {l s='items in stock' mod='categoryscroll'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{elseif !isset($product.quantity_all_versions) && $product.quantity <= $last_qties && $product.quantity > 0}
|
||||
<div class="productQuantityAlert">
|
||||
{if $product.quantity == 1}
|
||||
<p>{l s='Warning: 1 item in stock!' mod='categoryscroll'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :' mod='categoryscroll'} {$product.quantity} {l s='items in stock' mod='categoryscroll'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
<div style="float:right; width:40%;">
|
||||
@ -72,6 +55,23 @@
|
||||
</div>
|
||||
</div>
|
||||
</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}
|
||||
<p>{l s='Warning: 1 item in stock!' mod='categoryscroll'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :' mod='categoryscroll'} {$product.quantity_all_versions} {l s='items in stock' mod='categoryscroll'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{elseif !isset($product.quantity_all_versions) && $product.quantity <= $last_qties && $product.quantity > 0}
|
||||
<div class="productQuantityAlert">
|
||||
{if $product.quantity == 1}
|
||||
<p>{l s='Warning: 1 item in stock!' mod='categoryscroll'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :' mod='categoryscroll'} {$product.quantity} {l s='items in stock' mod='categoryscroll'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
<div class="clearfix"></div>
|
||||
</li>
|
||||
{/foreach}
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
<a class="" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">
|
||||
<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="115" height="{$homeSize.height}"{/if} />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right_block">
|
||||
<div class="list-product-name">
|
||||
<a class="" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">
|
||||
@ -58,44 +58,44 @@
|
||||
{if $product_reduction>0}
|
||||
<span class="reduction">(-{$product_reduction|round|string_format:'%d'}%)</span>
|
||||
{/if}
|
||||
{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}
|
||||
<p>{l s='Warning: 1 item in stock!'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{elseif !isset($product.quantity_all_versions) && $product.quantity <= $last_qties && $product.quantity > 0}
|
||||
<div class="productQuantityAlert">
|
||||
{if $product.quantity == 1}
|
||||
<p>{l s='Warning: 1 item in stock!'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
{/if}
|
||||
<div style="float:right; width:40%;">
|
||||
{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&id_product={$product.id_product|intval}{if isset($static_token)}&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&id_product={$product.id_product|intval}{if isset($static_token)}&token={$static_token}{/if}" title="{l s='Express buy'}">
|
||||
</a>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="float:right; width:40%;">
|
||||
{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&id_product={$product.id_product|intval}{if isset($static_token)}&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&id_product={$product.id_product|intval}{if isset($static_token)}&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}
|
||||
<p>{l s='Warning: 1 item in stock!'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{elseif !isset($product.quantity_all_versions) && $product.quantity <= $last_qties && $product.quantity > 0}
|
||||
<div class="productQuantityAlert">
|
||||
{if $product.quantity == 1}
|
||||
<p>{l s='Warning: 1 item in stock!'}</p>
|
||||
{else}
|
||||
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
<div class="clearfix"></div>
|
||||
</li>
|
||||
{/foreach}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user