On rajoute des infos dans single-products (les pictos)

templates/frontOffice/custom/assets/dist/css/custom.min.css

@@ -1 +1 @@
-.btn,.tag-produit{border-radius:5px}@font-face{font-family:sofia_prolight;src:url(../fonts/sofiapro/sofiapro-light-webfont.woff2) format('woff2'),url(../fonts/sofiapro/sofiapro-light-webfont.woff) format('woff');font-weight:400;font-style:normal}#product-details .product-info .sku,aside.col-left,div.product-options,footer.footer-info,section.category-description,ul.pager{display:none}html{font-family:sofia_prolight,sans-serif!important}#products-new .overlay:after,#products-offer .overlay:after,#products-upsell .overlay:after,body{font-family:sofia_prolight,'Open Sans',sans-serif!important}div.container{width:90%!important}@media (min-width:992px){.header__main{width:90%}}@media (min-width:768px){.header__content{flex-direction:column}}.header__content{display:flex}.header__main{align-items:center;display:flex;flex-direction:row;justify-content:space-between}.header__secondary{display:inline-flex}.overlay:before{background-color:rgba(128,189,138,.4)}.navbar-default{background-color:transparent}.navbar li>a.home:before{display:none}.navbar li{font-size:1.72rem}.nav>li{text-transform:uppercase}.navbar-customer{display:flex;flex-direction:column;text-align:center}#search-button:before,address.adr span.street-address,article.col-main div#google-map{display:none}.navbar-customer>li>a{text-transform:none}.header__content .container-fluid{padding-left:0;padding-right:0}.navbar-form .form-control{width:150px}.navbar-form{margin:auto}.logo-boutique{width:160px}.navbar{margin-bottom:0}.glyphicon,a{color:#95c11e}.btn{border-color:#95c11e;border-left:1px solid #95c11e}.btn-default{color:#3c3c3b;background-color:#fff}.btn-default:active,.btn-default:focus,.btn-default:hover{color:#fff;background-color:#3c3c3b;text-decoration:none}.btn-primary{background-color:#95c11e;color:#fff}.btn-primary:active,.btn-primary:focus,.btn-primary:hover{background-color:#fff;border-color:#95c11e;color:#95c11e}.btn-primary[disabled]:focus,.btn-primary[disabled]:hover{background-color:#95c11e;border-color:#95c11e;color:#fff}.btn-link:focus,.btn-link:hover{color:#95c11e}.navbar-default .navbar-nav>li>a{color:#3c3c3b}.nav>li>a:focus,.nav>li>a:hover,.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{background-color:#95c11e;color:#fff}.breadcrumb{text-align:center;font-size:large;margin-bottom:30px}.checkout-progress .btn-step.active{background:#95c11e}.toolbar .amount{color:#95c11e}.grid #category-products .item>article .product-info .name{height:1.5em}.product-title,.product-title:active,.product-title:hover{text-decoration:none;color:#3c3c3b}.price,.table-cart tbody td.subprice .price,.table-cart thead th.subprice,.table-order tbody td.subprice .price,.table-order thead th.subprice{color:#95c11e}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{background-color:#95c11e;border-color:#95c11e}.products-heading{text-transform:uppercase;text-align:center}.products-heading>h2{color:#3c3c3b;font-weight:900}.fa-cart-plus,.fa-user,.glyphicon-search{font-size:2rem!important}#search-button{padding-top:6px}.footer-container .footer-block{background-color:rgba(128,189,138,.08)}.block.block-contact .block-content ul>li:before{color:#95c11e}.block.block-contact .block-content ul>li.contact-address:before{font-size:26px}.block .block-title{color:#3c3c3b}.block .block-content .block-subtitle,.block-default .block-content li:before{color:#95c11e}.boutons-plusmoins{display:inline-grid!important;margin-right:20px}.bouton-moins,.bouton-plus{font-family:FontAwesome;content:"f067"}.tag-produit{transform:rotate(-10deg);padding:0 5px;text-align:center;position:absolute;z-index:300;bottom:5px;right:10px}.tag-bio{background-color:#95c11e;color:#fff}.tag-local{background-color:red;color:#fff}
+.btn,.tag-produit{border-radius:5px}@font-face{font-family:sofia_prolight;src:url(../fonts/sofiapro/sofiapro-light-webfont.woff2) format('woff2'),url(../fonts/sofiapro/sofiapro-light-webfont.woff) format('woff');font-weight:400;font-style:normal}#product-details .product-info .sku,aside.col-left,div.product-options,footer.footer-info,section.category-description,ul.pager{display:none}html{font-family:sofia_prolight,sans-serif!important}#products-new .overlay:after,#products-offer .overlay:after,#products-upsell .overlay:after,body{font-family:sofia_prolight,'Open Sans',sans-serif!important}div.container{width:90%!important}@media (min-width:992px){.header__main{width:90%}}@media (min-width:768px){.header__content{flex-direction:column}}.header__content{display:flex}.header__main{align-items:center;display:flex;flex-direction:row;justify-content:space-between}.header__secondary{display:inline-flex}.overlay:before{background-color:rgba(128,189,138,.4)}.navbar-default{background-color:transparent}.navbar li>a.home:before{display:none}.navbar li{font-size:1.72rem}.nav>li{text-transform:uppercase}.navbar-customer{display:flex;flex-direction:column;text-align:center}#search-button:before,address.adr span.street-address,article.col-main div#google-map{display:none}.navbar-customer>li>a{text-transform:none}.header__content .container-fluid{padding-left:0;padding-right:0}.navbar-form .form-control{width:150px}.navbar-form{margin:auto}.logo-boutique{width:160px}.navbar{margin-bottom:0}.glyphicon,a{color:#95c11e}.btn{border-color:#95c11e;border-left:1px solid #95c11e}.btn-default{color:#3c3c3b;background-color:#fff}.btn-default:active,.btn-default:focus,.btn-default:hover{color:#fff;background-color:#3c3c3b;text-decoration:none}.btn-primary{background-color:#95c11e;color:#fff}.btn-primary:active,.btn-primary:focus,.btn-primary:hover{background-color:#fff;border-color:#95c11e;color:#95c11e}.btn-primary[disabled]:focus,.btn-primary[disabled]:hover{background-color:#95c11e;border-color:#95c11e;color:#fff}.btn-link:focus,.btn-link:hover{color:#95c11e}.navbar-default .navbar-nav>li>a{color:#3c3c3b}.nav>li>a:focus,.nav>li>a:hover,.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{background-color:#95c11e;color:#fff}.breadcrumb{text-align:center;font-size:large;margin-bottom:30px}.checkout-progress .btn-step.active{background:#95c11e}.toolbar .amount{color:#95c11e}.grid #category-products .item>article .product-info .name{height:1.5em}.product-title,.product-title:active,.product-title:hover{text-decoration:none;color:#3c3c3b}.price,.table-cart tbody td.subprice .price,.table-cart thead th.subprice,.table-order tbody td.subprice .price,.table-order thead th.subprice{color:#95c11e}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{background-color:#95c11e;border-color:#95c11e}.products-heading{text-transform:uppercase;text-align:center}.products-heading>h2{color:#3c3c3b;font-weight:900}.fa-cart-plus,.fa-user,.glyphicon-search{font-size:2rem!important}#search-button{padding-top:6px}.footer-container .footer-block{background-color:rgba(128,189,138,.08)}.block.block-contact .block-content ul>li:before{color:#95c11e}.block.block-contact .block-content ul>li.contact-address:before{font-size:26px}.block .block-title{color:#3c3c3b}.block .block-content .block-subtitle,.block-default .block-content li:before{color:#95c11e}.tag-produit{transform:rotate(-10deg);padding:0 5px;text-align:center;position:absolute;z-index:300;bottom:5px;right:10px}.tag-bio{background-color:#95c11e;color:#fff}.tag-local{background-color:red;color:#fff}.product-provenance{text-align:center;line-height:1rem;padding:5px 0 2px;border:1px solid #95c11e;border-radius:8px}.texte-provenance{color:#95c11e}.inline-flex{display:inline-flex;flex-wrap:nowrap;align-items:center;margin-left:5px}.table-pictos{margin-bottom:0!important}.table-pictos td.ligne{border:none!important;vertical-align:baseline!important}.image-auxbieauxlegumes{width:30px;height:auto}.bio{background-color:#95c11e;color:#fff;padding:0 2px}

templates/frontOffice/custom/assets/src/css/custom.css

@@ -238,6 +238,7 @@ article.col-main div#google-map {
     color: #95c11e;
 }
 
+/*
 .boutons-plusmoins {
     display: inline-grid !important;
     margin-right: 20px;
@@ -250,7 +251,7 @@ article.col-main div#google-map {
     font-family: FontAwesome;
     content: "f067";
 }
-
+*/
 .tag-produit {
     transform: rotate(-10deg);
     padding: 0 5px;
@@ -268,4 +269,63 @@ article.col-main div#google-map {
 .tag-local {
     background-color: red;
     color: white;
+}
+
+/*
+.titre-info-complementaire {
+    font-size: 2.2rem;
+    font-weight: 900;
+    color: #95c11e;
+}
+.titre-info-complementaire:after {
+    font-family: "FontAwesome";
+    content: " \f067";
+}
+.titre-info-complementaire:hover:after {
+    font-family: "FontAwesome";
+    content: " \f068";
+}
+
+.texte-info-complementaire {
+    font-size: 1.8rem;
+    display: none;
+}
+
+.info-complementaire:hover > .texte-info-complementaire {
+    display: block;
+}
+*/
+
+.product-provenance {
+    text-align: center;
+    line-height: 1rem;
+    padding: 5px 0 2px 0;
+    border: 1px solid #95c11e;
+    border-radius: 8px;
+}
+.texte-provenance {
+    color: #95c11e;
+}
+
+.inline-flex {
+    display: inline-flex;
+    flex-wrap: nowrap;
+    align-items: center;
+    margin-left: 5px;
+}
+.table-pictos {
+    margin-bottom: 0 !important;
+}
+.table-pictos td.ligne {
+    border: none !important;
+    vertical-align: baseline !important;
+}
+.image-auxbieauxlegumes {
+    width: 30px;
+    height: auto;
+}
+.bio {
+    background-color: #95c11e;
+    color: white;
+    padding: 0 2px;
 }

templates/frontOffice/custom/category.html

@@ -108,7 +108,7 @@
                     <div class="products-content">
                         <ul class="list-unstyled row">
                             {loop type="product" name="product_list" category=$category_id limit=$limit page=$product_page order=$product_order}
-                                {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=true hasQuickView=false width="218" height="146"}
+                                {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false hasQuickView=false width="218" height="146"}
                             {/loop}
                         </ul>
                     </div>

templates/frontOffice/custom/includes/pictos.html

@@ -0,0 +1,32 @@
+<div class="product-pictos col-sm-8">
+  <table class="table table-pictos">
+    <tr>
+      {loop name="features-list" type="feature" product=$product_id}
+        {if $TITLE|strstr:"Pictogrammes"}
+          {loop name="feature-values-list" type="feature_value" product=$product_id feature={$ID}}
+            {assign var="largeurCol" value=12/{$LOOP_TOTAL}}
+            <td class="col-sm-{$largeurCol} ligne">
+              {if $TITLE eq "Français"}
+                 <img src="{image file='assets/src/img/flags/fr.png'}" alt="{$TITLE}" title="Produit français"/>
+              {else}
+                {if $TITLE eq "AuxBieauxLegumes"}
+                  <img src="{image file='assets/src/img/flags/favicon.ico'}" alt="{$TITLE}" title="Nous cultivons nous même ce produit" class="image-auxbieauxlegumes"/>
+                {else}
+                  {if $TITLE eq "Local"}
+                  <img src="{image file='assets/src/img/flags/logo-npdc.png'}" alt="{$TITLE}" title="Produit local" class="image-auxbieauxlegumes"/>
+                  {else}
+                    {if $TITLE eq "Bio"}
+                       <span class="bio">{$TITLE}</span>
+                    {else}
+                       {$TITLE}
+                    {/if}
+                 {/if}
+              {/if}
+            {/if}
+            </td>
+          {/loop}
+        {/if}
+      {/loop}
+    </tr>
+  </table>
+</div>

templates/frontOffice/custom/includes/single-product.html

@@ -9,17 +9,15 @@
        {assign var="product_id" value=$ID}
     {/if}
 
-    {assign var="IS_BIO" value=false}
+    {assign var="_PROVENANCE" value=""}
-    {assign var="IS_LOCAL" value=false}
     {loop name="features-list" type="feature" product=$product_id}
-        {if $TITLE|strstr:"Locaux"}{assign var="IS_LOCAL" value=true}{/if}
+        {if $TITLE|strstr:"Provenance"}
-        {if $TITLE|strstr:"Audomarois"}{assign var="IS_LOCAL" value=true}{/if}
+            {loop name="feature-values-list" type="feature_value" product=$product_id feature={$ID}}
-        {loop name="feature-values-list" type="feature_value" product=$product_id feature={$ID}}
+                {assign var="_PROVENANCE" value="$TITLE"}
-            {if $TITLE|strstr:"Bio"}{assign var="IS_BIO" value=true}{/if}
+            {/loop}
-        {/loop}
+        {/if}
     {/loop}
 
-
     <article class="row" itemscope itemtype="http://schema.org/Product">
         {hook name="singleproduct.top" product="{$product_id}"}
 
@@ -31,21 +29,18 @@
                 <img itemprop="image" src="{image file='assets/dist/img/218x146.png'}" class="img-responsive" alt="{$productTitle}">
             {/elseloop}
         </a>
-        <div class="product-info col-sm-6">
+        <div class="product-info col-sm-12">
             <a href="{$URL nofilter}" class="product-title"><h2 class="name"><span itemprop="name">{$productTitle}</span></h2></a>
             {if $hasDescription}
             <div class="description" itemprop="description">
                 <p>{$DESCRIPTION nofilter}</p>
             </div>
             {/if}
+        </div>
 
-            {if $IS_BIO}
+        <div class="product-provenance col-sm-12">
-            <span class="tag-produit tag-bio">{intl l="Produit bio"}</span>
+            <label class="label-provenance">{intl l="Provenance"}&nbsp;:&nbsp;</label>
-            {/if}
+            <span class="texte-provenance">{if $_PROVENANCE ne ""}{$_PROVENANCE}{else}<i>{intl l="Non précisé"}</i>{/if}</span>
-            {if $IS_LOCAL}
-            <span class="tag-produit tag-local">{intl l="Produit local"}</span>
-            {/if}
-
         </div>
 
         {* Stock *}
@@ -58,130 +53,137 @@
             {/if}
         {/if}
 
-        <div class="product-price col-sm-3">
+        <div class="row inline-flex">
-            <div class="price-container row" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                <meta itemprop="category" content="{category attr="title"}">
-                {* Issue #2525 Remove itemCondition need improvement (not used like this) *}
-                {* List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition *}
-                {*<meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition">*}
-                {* List of currency : The currency used to describe the product price, in three-letter ISO format. *}
-                <meta itemprop="priceCurrency" content="{currency attr="symbol"}">
-                <link itemprop="availability" href="{$current_stock_href}" content="{$current_stock_content}" />
 
-                {if $IS_PROMO }
+            <div class="product-price col-sm-3">
-                    {assign var="combination_count" value={count type="product_sale_elements" promo="1" product=$ID}}
+                <div class="price-container row" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+                    <meta itemprop="category" content="{category attr="title"}">
+                    {* Issue #2525 Remove itemCondition need improvement (not used like this) *}
+                    {* List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition *}
+                    {*<meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition">*}
+                    {* List of currency : The currency used to describe the product price, in three-letter ISO format. *}
+                    <meta itemprop="priceCurrency" content="{currency attr="symbol"}">
+                    <link itemprop="availability" href="{$current_stock_href}" content="{$current_stock_content}" />
 
-                    {ifloop rel="dp"}
+                    {if $IS_PROMO }
-                        {loop type="digressive" name="dp" product_id=$ID order="false" limit=1}
+                        {assign var="combination_count" value={count type="product_sale_elements" promo="1" product=$ID}}
-                            <span class="special-price col-xs-6">
+
-                                <span class="price">{intl l="From %price" price={format_money number=$TAXED_PROMO_PRICE}}
+                        {ifloop rel="dp"}
+                            {loop type="digressive" name="dp" product_id=$ID order="false" limit=1}
+                                <span class="special-price col-xs-6">
+                                    <span class="price">{intl l="From %price" price={format_money number=$TAXED_PROMO_PRICE}}
+                                    {loop name="attributes" type="attribute" product="$product_id" order="manual"}
+                                        <span class="unite">{$TITLE}</span>
+                                    {/loop}
+                                    </span>
+                                </span>
+                                {if $SHOW_ORIGINAL_PRICE}
+                                <span class="old-price col-xs-6">
+                                    <span class="price-label">{intl l="Regular Price:"} </span>
+                                    <span class="price">{format_money number=$TAXED_PRICE}</span>
+                                </span>
+                                {/if}
+                            {/loop}
+                        {/ifloop}
+                        {elseloop rel="dp"}
+                            {loop type="product_sale_elements" name="pse" default=1 product=$product_id}
+                                <span class="regular-price col-xs-6">
+                                    <span itemprop="price" class="price" content="{$TAXED_PROMO_PRICE}">{format_money number=$TAXED_PROMO_PRICE}
+                                    {if $LOOP_COUNT = 1}
+                                        {loop name="attributes" type="attribute" product="$product_id" order="manual"}
+                                            <span class="unite">{$TITLE}</span>
+                                        {/loop}
+                                    {/if}
+                                    </span>
+                                </span>
+                                {if $SHOW_ORIGINAL_PRICE}
+                                <span class="old-price col-xs-6">
+                                    <span class="price-label">{intl l="Regular Price:"} </span>
+                                    <span class="price">{format_money number=$TAXED_PRICE}</span>
+                                </span>
+                                {/if}
+                            {/loop}
+                        {/elseloop}
+
+                    {else}   <!-- Produit pas en promo //-->
+
+                        {ifloop rel="dp"}
+                            {loop type="digressive" name="dp" limit=1 product_id=$product_id order="false"}
+                                <span class="regular-price col-xs-12"><span itemprop="price" class="price" content="{$TAXED_PRICE}">{intl l="From %price" price={format_money number=$TAXED_PRICE}}
                                 {loop name="attributes" type="attribute" product="$product_id" order="manual"}
                                     <span class="unite">{$TITLE}</span>
                                 {/loop}
-                                </span>
+                                </span></span>
-                            </span>
+                            {/loop}
-                            {if $SHOW_ORIGINAL_PRICE}
+                        {/ifloop}
-                            <span class="old-price col-xs-6">
+                        {elseloop rel="dp"}
-                                <span class="price-label">{intl l="Regular Price:"} </span>
+                            {loop type="product_sale_elements" name="pse" default=1 product=$product_id}
-                                <span class="price">{format_money number=$TAXED_PRICE}</span>
+                                <span class="regular-price col-xs-12"><span itemprop="price" class="price" content="{$TAXED_PRICE}">{format_money number=$TAXED_PRICE}
-                            </span>
-                            {/if}
-                        {/loop}
-                    {/ifloop}
-                    {elseloop rel="dp"}
-                        {loop type="product_sale_elements" name="pse" default=1 product=$product_id}
-                            <span class="regular-price col-xs-6">
-                                <span itemprop="price" class="price" content="{$TAXED_PROMO_PRICE}">{format_money number=$TAXED_PROMO_PRICE}
                                 {if $LOOP_COUNT = 1}
                                     {loop name="attributes" type="attribute" product="$product_id" order="manual"}
                                         <span class="unite">{$TITLE}</span>
                                     {/loop}
                                 {/if}
-                                </span>
+                                </span></span>
-                            </span>
-                            {if $SHOW_ORIGINAL_PRICE}
-                            <span class="old-price col-xs-6">
-                                <span class="price-label">{intl l="Regular Price:"} </span>
-                                <span class="price">{format_money number=$TAXED_PRICE}</span>
-                            </span>
-                            {/if}
-                        {/loop}
-                    {/elseloop}
-
-                {else}   <!-- Produit pas en promo //-->
-
-                    {ifloop rel="dp"}
-                        {loop type="digressive" name="dp" limit=1 product_id=$product_id order="false"}
-                            <span class="regular-price col-xs-12"><span itemprop="price" class="price" content="{$TAXED_PRICE}">{intl l="From %price" price={format_money number=$TAXED_PRICE}}
-                            {loop name="attributes" type="attribute" product="$product_id" order="manual"}
-                                <span class="unite">{$TITLE}</span>
                             {/loop}
-                            </span></span>
+                        {/elseloop}
-                        {/loop}
-                    {/ifloop}
-                    {elseloop rel="dp"}
-                        {loop type="product_sale_elements" name="pse" default=1 product=$product_id}
-                            <span class="regular-price col-xs-12"><span itemprop="price" class="price" content="{$TAXED_PRICE}">{format_money number=$TAXED_PRICE}
-                            {if $LOOP_COUNT = 1}
-                                {loop name="attributes" type="attribute" product="$product_id" order="manual"}
-                                    <span class="unite">{$TITLE}</span>
-                                {/loop}
-                            {/if}
-                            </span></span>
-                        {/loop}
-                    {/elseloop}
 
+                    {/if}
+                </div>
+
+
+                {if $hasBtn == true}
+                    {if $hasSubmit == true && $current_stock_content == "in_stock"}
+                        {form name="thelia.cart.add" }
+                        <form id="form-product-details{$product_id}" action="{url path="/cart/add" }" method="post" class="form-product">
+                            {form_hidden_fields}
+                            <input type="hidden" name="view" value="product">
+                            <input type="hidden" name="product_id" value="{$product_id}">
+                            {form_field field="append"}
+                                <input type="hidden" name="{$name}" value="1">
+                            {/form_field}
+
+                            {if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
+
+                            {form_field field='product_sale_elements_id'}
+                                <input type="hidden" class="pse-id" name="{$name}" value="{$PRODUCT_SALE_ELEMENT}" {$attr}>
+                            {/form_field}
+                            {form_field field="product"}
+                                <input id="{$label_attr.for}" type="hidden" name="{$name}" value="{$product_id}" {$attr} >
+                            {/form_field}
+
+                            <fieldset class="product-cart form-inline">
+                                {form_field field='quantity'}
+                                    <div class="form-group group-qty hide {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                                        <label for="{$label_attr.for}">{$label}</label>
+                                        <input type="number" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value|default:1}" min="0" required>
+                                        {if $error }
+                                            <span class="help-block"><i class="fa fa-remove"></i> {$message}</span>
+                                        {elseif $value != "" && !$error}
+                                            <span class="help-block"><i class="fa fa"></i></span>
+                                        {/if}
+                                    </div>
+                                {/form_field}
+                                <div>
+                                    <div class="product-btn">
+                                        <button type="submit" class="btn btn-primary btn-block"><i class="fa fa-shopping-cart"></i> {intl l="Add to cart"}</button>
+                                    </div>
+                                </div>
+                            </fieldset>
+                        </form>
+                        {/form}
+                    {else}
+                        <div>
+                            <div class="product-btn">
+                                <a href="{$URL nofilter}" class="btn btn-primary btn-block"><i class="fa fa-eye"></i> {intl l="View product"}</a>
+                            </div>
+                        </div>
+                    {/if}
                 {/if}
             </div>
 
-            {if $hasBtn == true}
+            {include file="includes/pictos.html" product_id=$ID}
-                {if $hasSubmit == true && $current_stock_content == "in_stock"}
-                    {form name="thelia.cart.add" }
-                    <form id="form-product-details{$product_id}" action="{url path="/cart/add" }" method="post" class="form-product">
-                        {form_hidden_fields}
-                        <input type="hidden" name="view" value="product">
-                        <input type="hidden" name="product_id" value="{$product_id}">
-                        {form_field field="append"}
-                            <input type="hidden" name="{$name}" value="1">
-                        {/form_field}
 
-                        {if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
-
-                        {form_field field='product_sale_elements_id'}
-                            <input type="hidden" class="pse-id" name="{$name}" value="{$PRODUCT_SALE_ELEMENT}" {$attr}>
-                        {/form_field}
-                        {form_field field="product"}
-                            <input id="{$label_attr.for}" type="hidden" name="{$name}" value="{$product_id}" {$attr} >
-                        {/form_field}
-
-                        <fieldset class="product-cart form-inline">
-                            {form_field field='quantity'}
-                                <div class="form-group group-qty hide {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
-                                    <label for="{$label_attr.for}">{$label}</label>
-                                    <input type="number" name="{$name}" id="{$label_attr.for}" class="form-control" value="{$value|default:1}" min="0" required>
-                                    {if $error }
-                                        <span class="help-block"><i class="fa fa-remove"></i> {$message}</span>
-                                    {elseif $value != "" && !$error}
-                                        <span class="help-block"><i class="fa fa"></i></span>
-                                    {/if}
-                                </div>
-                            {/form_field}
-                            <div>
-                                <div class="product-btn">
-                                    <button type="submit" class="btn btn-primary btn-block"><i class="fa fa-shopping-cart"></i> {intl l="Add to cart"}</button>
-                                </div>
-                            </div>
-                        </fieldset>
-                    </form>
-                    {/form}
-                {else}
-                    <div>
-                        <div class="product-btn">
-                            <a href="{$URL nofilter}" class="btn btn-primary btn-block"><i class="fa fa-eye"></i> {intl l="View product"}</a>
-                        </div>
-                    </div>
-                {/if}
-            {/if}
         </div>
 
         {hook name="singleproduct.bottom" product={$product_id}}

templates/frontOffice/custom/product.html

@@ -125,13 +125,15 @@
                         <div class="item active">
                             <ul class="list-inline">
                                 {loop name="image.carousel" type="image" product={$ID} width="560" height="445" resize_mode="borders" limit="5"}
-                                <li>
+                                    {if $LOOP_COUNT > 1}
-                                    <a href="{$IMAGE_URL nofilter}" class="thumbnail {if $LOOP_COUNT == 1}active{/if}">
+                                    <li>
-                                        {loop type="image" name="image.thumbs" id={$ID} product="$OBJECT_ID" width="118" height="85" resize_mode="borders"}
+                                        <a href="{$IMAGE_URL nofilter}" class="thumbnail {if $LOOP_COUNT == 1}active{/if}">
-                                            <img src="{$IMAGE_URL nofilter}" alt="{$TITLE}">
+                                            {loop type="image" name="image.thumbs" id={$ID} product="$OBJECT_ID" width="118" height="85" resize_mode="borders"}
-                                        {/loop}
+                                                <img src="{$IMAGE_URL nofilter}" alt="{$TITLE}">
-                                    </a>
+                                            {/loop}
-                                </li>
+                                        </a>
+                                    </li>
+                                    {/if}
                                 {/loop}
                             </ul>
                         </div>
@@ -370,13 +372,31 @@
                 {/capture}
             {/strip}
 
-            <section id="product-tabs" class="col-sm-12">
+            {strip}
+                {capture "associated_content"}
+                    {ifloop rel="ac-loop"}
+                    <ul>
+                        {loop name="ac-loop" type="associated_content" product=$product_id}
+                            {loop type="content" name="ac-content-loop" id=$CONTENT_ID}
+                            <div class="description">
+                                {$DESCRIPTION nofilter}
+                            </div>
+                            {/loop}
+                        {/loop}
+                    </ul>
+                    {/ifloop}
+                {/capture}
+            {/strip}
+
+            <section id="product-tabs" class="col-sm-6">
                 {hookblock name="product.additional" product=$product_id fields="id,class,title,content"}
                 <ul class="nav nav-tabs" role="tablist">
                     <li class="active" role="presentation"><a id="tab1" href="#description" data-toggle="tab" role="tab">{intl l="Description"}</a></li>
                     {if $smarty.capture.additional ne ""}<li role="presentation"><a id="tab2" href="#additional" data-toggle="tab" role="tab">{intl l="Additional Info"}</a></li>{/if}
                     {if $smarty.capture.brand_info ne ""}<li role="presentation"><a id="tab3" href="#brand_info" data-toggle="tab" role="tab">{intl l="Brand information"}</a></li>{/if}
                     {if $smarty.capture.document ne ""}<li role="presentation"><a id="tab4" href="#document" data-toggle="tab" role="tab">{intl l="Documents"}</a></li>{/if}
+{*                    {if $smarty.capture.associated_content ne ""}<li role="presentation"><a id="tab5" href="#associated_content" data-toggle="tab" role="tab">{intl l="Associated content"}</a></li>{/if}   *}
+
                     {forhook rel="product.additional"}
                         <li role="presentation"><a id="tab{$id}" href="#{$id}" data-toggle="tab" role="tab">{$title}</a></li>
                     {/forhook}
@@ -405,6 +425,11 @@
                         {$content nofilter}
                     </div>
                     {/forhook}
+                    {if $smarty.capture.associated_content ne ""}
+                    <div class="tab-pane" id="associated_content" role="tabpanel" aria-labelledby="tab5">
+                        {$smarty.capture.associated_content nofilter}
+                    </div>
+                    {/if}
                 </div>
                 {/hookblock}
             </section>