diff --git a/templates/frontOffice/custom/assets/dist/css/custom.min.css b/templates/frontOffice/custom/assets/dist/css/custom.min.css index 4839d10a..a7a252f3 100644 --- a/templates/frontOffice/custom/assets/dist/css/custom.min.css +++ b/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} \ No newline at end of file +.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} \ No newline at end of file diff --git a/templates/frontOffice/custom/assets/dist/img/flags/favicon.ico b/templates/frontOffice/custom/assets/dist/img/flags/favicon.ico new file mode 100644 index 00000000..9a6cf0a3 Binary files /dev/null and b/templates/frontOffice/custom/assets/dist/img/flags/favicon.ico differ diff --git a/templates/frontOffice/custom/assets/dist/img/flags/fr.png b/templates/frontOffice/custom/assets/dist/img/flags/fr.png new file mode 100644 index 00000000..0706dcc0 Binary files /dev/null and b/templates/frontOffice/custom/assets/dist/img/flags/fr.png differ diff --git a/templates/frontOffice/custom/assets/dist/img/flags/logo-npdc.png b/templates/frontOffice/custom/assets/dist/img/flags/logo-npdc.png new file mode 100644 index 00000000..402458a3 Binary files /dev/null and b/templates/frontOffice/custom/assets/dist/img/flags/logo-npdc.png differ diff --git a/templates/frontOffice/custom/assets/src/css/custom.css b/templates/frontOffice/custom/assets/src/css/custom.css index 1b67a437..4e781ebf 100644 --- a/templates/frontOffice/custom/assets/src/css/custom.css +++ b/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; } \ No newline at end of file diff --git a/templates/frontOffice/custom/assets/src/img/flags/favicon.ico b/templates/frontOffice/custom/assets/src/img/flags/favicon.ico new file mode 100644 index 00000000..9a6cf0a3 Binary files /dev/null and b/templates/frontOffice/custom/assets/src/img/flags/favicon.ico differ diff --git a/templates/frontOffice/custom/assets/src/img/flags/fr.png b/templates/frontOffice/custom/assets/src/img/flags/fr.png new file mode 100644 index 00000000..0706dcc0 Binary files /dev/null and b/templates/frontOffice/custom/assets/src/img/flags/fr.png differ diff --git a/templates/frontOffice/custom/assets/src/img/flags/logo-npdc.png b/templates/frontOffice/custom/assets/src/img/flags/logo-npdc.png new file mode 100644 index 00000000..c02e3d5f Binary files /dev/null and b/templates/frontOffice/custom/assets/src/img/flags/logo-npdc.png differ diff --git a/templates/frontOffice/custom/category.html b/templates/frontOffice/custom/category.html index ab5041b1..5a54feba 100644 --- a/templates/frontOffice/custom/category.html +++ b/templates/frontOffice/custom/category.html @@ -108,7 +108,7 @@
diff --git a/templates/frontOffice/custom/includes/pictos.html b/templates/frontOffice/custom/includes/pictos.html new file mode 100644 index 00000000..9c7e3380 --- /dev/null +++ b/templates/frontOffice/custom/includes/pictos.html @@ -0,0 +1,32 @@ +
+ + + {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}} + + {/loop} + {/if} + {/loop} + +
+ {if $TITLE eq "Français"} + {$TITLE} + {else} + {if $TITLE eq "AuxBieauxLegumes"} + {$TITLE} + {else} + {if $TITLE eq "Local"} + {$TITLE} + {else} + {if $TITLE eq "Bio"} + {$TITLE} + {else} + {$TITLE} + {/if} + {/if} + {/if} + {/if} +
+
\ No newline at end of file diff --git a/templates/frontOffice/custom/includes/single-product.html b/templates/frontOffice/custom/includes/single-product.html index 7eb28c52..e63dad03 100644 --- a/templates/frontOffice/custom/includes/single-product.html +++ b/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="IS_LOCAL" value=false} + {assign var="_PROVENANCE" value=""} {loop name="features-list" type="feature" product=$product_id} - {if $TITLE|strstr:"Locaux"}{assign var="IS_LOCAL" value=true}{/if} - {if $TITLE|strstr:"Audomarois"}{assign var="IS_LOCAL" value=true}{/if} - {loop name="feature-values-list" type="feature_value" product=$product_id feature={$ID}} - {if $TITLE|strstr:"Bio"}{assign var="IS_BIO" value=true}{/if} - {/loop} + {if $TITLE|strstr:"Provenance"} + {loop name="feature-values-list" type="feature_value" product=$product_id feature={$ID}} + {assign var="_PROVENANCE" value="$TITLE"} + {/loop} + {/if} {/loop} -
{hook name="singleproduct.top" product="{$product_id}"} @@ -31,21 +29,18 @@ {$productTitle} {/elseloop} -
+

{$productTitle}

 {if $hasDescription}

{$DESCRIPTION nofilter}

{/if} +
- {if $IS_BIO} - {intl l="Produit bio"} - {/if} - {if $IS_LOCAL} - {intl l="Produit local"} - {/if} - +
+ + {if $_PROVENANCE ne ""}{$_PROVENANCE}{else}{intl l="Non précisé"}{/if}
{* Stock *} @@ -58,130 +53,137 @@ {/if} {/if} -
-
- - {* Issue #2525 Remove itemCondition need improvement (not used like this) *} - {* List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition *} - {**} - {* List of currency : The currency used to describe the product price, in three-letter ISO format. *} - - +
- {if $IS_PROMO } - {assign var="combination_count" value={count type="product_sale_elements" promo="1" product=$ID}} +
+
+ + {* Issue #2525 Remove itemCondition need improvement (not used like this) *} + {* List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition *} + {**} + {* List of currency : The currency used to describe the product price, in three-letter ISO format. *} + + - {ifloop rel="dp"} - {loop type="digressive" name="dp" product_id=$ID order="false" limit=1} - - {intl l="From %price" price={format_money number=$TAXED_PROMO_PRICE}} + {if $IS_PROMO } + {assign var="combination_count" value={count type="product_sale_elements" promo="1" product=$ID}} + + {ifloop rel="dp"} + {loop type="digressive" name="dp" product_id=$ID order="false" limit=1} + + {intl l="From %price" price={format_money number=$TAXED_PROMO_PRICE}} + {loop name="attributes" type="attribute" product="$product_id" order="manual"} + {$TITLE} + {/loop} + + + {if $SHOW_ORIGINAL_PRICE} + + {intl l="Regular Price:"} + {format_money number=$TAXED_PRICE} + + {/if} + {/loop} + {/ifloop} + {elseloop rel="dp"} + {loop type="product_sale_elements" name="pse" default=1 product=$product_id} + + {format_money number=$TAXED_PROMO_PRICE} + {if $LOOP_COUNT = 1} + {loop name="attributes" type="attribute" product="$product_id" order="manual"} + {$TITLE} + {/loop} + {/if} + + + {if $SHOW_ORIGINAL_PRICE} + + {intl l="Regular Price:"} + {format_money number=$TAXED_PRICE} + + {/if} + {/loop} + {/elseloop} + + {else} + + {ifloop rel="dp"} + {loop type="digressive" name="dp" limit=1 product_id=$product_id order="false"} + {intl l="From %price" price={format_money number=$TAXED_PRICE}} {loop name="attributes" type="attribute" product="$product_id" order="manual"} {$TITLE} {/loop} - - - {if $SHOW_ORIGINAL_PRICE} - - {intl l="Regular Price:"} - {format_money number=$TAXED_PRICE} - - {/if} - {/loop} - {/ifloop} - {elseloop rel="dp"} - {loop type="product_sale_elements" name="pse" default=1 product=$product_id} - - {format_money number=$TAXED_PROMO_PRICE} + + {/loop} + {/ifloop} + {elseloop rel="dp"} + {loop type="product_sale_elements" name="pse" default=1 product=$product_id} + {format_money number=$TAXED_PRICE} {if $LOOP_COUNT = 1} {loop name="attributes" type="attribute" product="$product_id" order="manual"} {$TITLE} {/loop} {/if} - - - {if $SHOW_ORIGINAL_PRICE} - - {intl l="Regular Price:"} - {format_money number=$TAXED_PRICE} - - {/if} - {/loop} - {/elseloop} - - {else} - - {ifloop rel="dp"} - {loop type="digressive" name="dp" limit=1 product_id=$product_id order="false"} - {intl l="From %price" price={format_money number=$TAXED_PRICE}} - {loop name="attributes" type="attribute" product="$product_id" order="manual"} - {$TITLE} + {/loop} - - {/loop} - {/ifloop} - {elseloop rel="dp"} - {loop type="product_sale_elements" name="pse" default=1 product=$product_id} - {format_money number=$TAXED_PRICE} - {if $LOOP_COUNT = 1} - {loop name="attributes" type="attribute" product="$product_id" order="manual"} - {$TITLE} - {/loop} - {/if} - - {/loop} - {/elseloop} + {/elseloop} + {/if} +
+ + + {if $hasBtn == true} + {if $hasSubmit == true && $current_stock_content == "in_stock"} + {form name="thelia.cart.add" } +
+ {form_hidden_fields} + + + {form_field field="append"} + + {/form_field} + + {if $form_error}
{$form_error_message}
{/if} + + {form_field field='product_sale_elements_id'} + + {/form_field} + {form_field field="product"} + + {/form_field} + +
+ {form_field field='quantity'} +
+ + + {if $error } + {$message} + {elseif $value != "" && !$error} + + {/if} +
+ {/form_field} +
+
+ +
+
+
+
+ {/form} + {else} + + {/if} {/if}
- {if $hasBtn == true} - {if $hasSubmit == true && $current_stock_content == "in_stock"} - {form name="thelia.cart.add" } -
- {form_hidden_fields} - - - {form_field field="append"} - - {/form_field} + {include file="includes/pictos.html" product_id=$ID} - {if $form_error}
{$form_error_message}
{/if} - - {form_field field='product_sale_elements_id'} - - {/form_field} - {form_field field="product"} - - {/form_field} - -
- {form_field field='quantity'} -
- - - {if $error } - {$message} - {elseif $value != "" && !$error} - - {/if} -
- {/form_field} -
-
- -
-
-
-
- {/form} - {else} - - {/if} - {/if}
{hook name="singleproduct.bottom" product={$product_id}} diff --git a/templates/frontOffice/custom/product.html b/templates/frontOffice/custom/product.html index 36bb9499..4e27c9f7 100644 --- a/templates/frontOffice/custom/product.html +++ b/templates/frontOffice/custom/product.html @@ -125,13 +125,15 @@
@@ -370,13 +372,31 @@ {/capture} {/strip} -
+ {strip} + {capture "associated_content"} + {ifloop rel="ac-loop"} +
    + {loop name="ac-loop" type="associated_content" product=$product_id} + {loop type="content" name="ac-content-loop" id=$CONTENT_ID} +
    + {$DESCRIPTION nofilter} +
    + {/loop} + {/loop} +
+ {/ifloop} + {/capture} + {/strip} + +
{hookblock name="product.additional" product=$product_id fields="id,class,title,content"}
{/forhook} + {if $smarty.capture.associated_content ne ""} +
+ {$smarty.capture.associated_content nofilter} +
+ {/if}
{/hookblock}