Merge branch 'master' into dev

This commit is contained in:
Rodney Figaro 2017-06-07 16:26:54 +02:00
commit 86f3a469eb

View File

@ -71,14 +71,14 @@
</div> </div>
<div class="product_desc"> <div class="product_desc">
<h1 itemprop="name">{$product->name|escape:'html':'UTF-8'}</h1> <h1 itemprop="name">{$product->name|escape:'html':'UTF-8'}</h1>
{*
<p id="product_reference"{if empty($product->reference) || !$product->reference} style="display: none;"{/if}> <p id="product_reference"{if empty($product->reference) || !$product->reference} style="display: none;"{/if}>
{l s='Model'} : {l s='Model'} :
<span class="editable" itemprop="sku"> <span class="editable" itemprop="sku">
{if !isset($groups)}{$product->reference|escape:'html':'UTF-8'}{/if} {if !isset($groups)}{$product->id|escape:'html':'UTF-8'}{/if}
</span> </span>
</p> </p>
*}
<div class="shape-red-long"></div> <div class="shape-red-long"></div>
<div> <div>
<p class="sale_date"> <p class="sale_date">