diff --git a/local/config/database.yml b/local/config/database.yml index 2ab7c71c..2627b636 100644 --- a/local/config/database.yml +++ b/local/config/database.yml @@ -3,4 +3,4 @@ database: driver: mysql user: pala4545_thel858 password: Yi9C8X3G888pPgNouc - dsn: mysql:host=localhost;dbname=pala4545_thel858;port=3306 + dsn: mysql:host=localhost;dbname=pala4545_thel858;port=3306 \ No newline at end of file diff --git a/local/modules/Recettes/Config/config.xml b/local/modules/Recettes/Config/config.xml index 083a6bae..a4858f04 100644 --- a/local/modules/Recettes/Config/config.xml +++ b/local/modules/Recettes/Config/config.xml @@ -6,6 +6,7 @@
+ diff --git a/local/modules/Recettes/Controller/BackController.php b/local/modules/Recettes/Controller/BackController.php index 5db8e09d..aeb0d9d5 100755 --- a/local/modules/Recettes/Controller/BackController.php +++ b/local/modules/Recettes/Controller/BackController.php @@ -178,7 +178,7 @@ class BackController extends BaseAdminController ->setNbOfProducts($quantityProposed) ->save(); - return $this->render('ajax/related-products', [ 'content_id' => $contentId ]); + return $this->render('includes/related-products', [ 'content_id' => $contentId ]); } } diff --git a/local/modules/Recettes/Form/StepCreateForm.php b/local/modules/Recettes/Form/StepCreateForm.php new file mode 100644 index 00000000..4544d6f5 --- /dev/null +++ b/local/modules/Recettes/Form/StepCreateForm.php @@ -0,0 +1,44 @@ +formBuilder + ->add( + "step", + "number", + [ + "required" => true, + "label" => "Step", + "label_attr" => ['for' => 'step'] + ]) + ->add( + "description", + "textarea", + [ + "required" => true, + "label" => "Description", + "label_attr" => ['for' => 'description'] + ]); + } + + /** + * @inheritDoc + */ + public function getName() + { + return "recette-step-create"; + } +} diff --git a/local/modules/Recettes/I18n/fr_FR.php b/local/modules/Recettes/I18n/fr_FR.php index 0e94af20..2132dd59 100644 --- a/local/modules/Recettes/I18n/fr_FR.php +++ b/local/modules/Recettes/I18n/fr_FR.php @@ -20,7 +20,10 @@ return array( 'Add to cart' => 'Ajouter au panier', 'Print recipe' => 'Imprimer la recette', 'Some products may not be in stock' => '* ce produit n\'est plus en stock, désolé', + 'Step' => 'Etape', + 'Detail' => 'Description', 'Name' => 'Notre recette', 'Created on' => 'Rédigée le', 'Save recipe' => 'Sauvegarder la recette', + 'Create a new step' => 'Ajouter une étape à votre recette', ); diff --git a/local/modules/Recettes/Loop/StepsLoop.php b/local/modules/Recettes/Loop/StepsLoop.php index fc07427c..c60047e0 100644 --- a/local/modules/Recettes/Loop/StepsLoop.php +++ b/local/modules/Recettes/Loop/StepsLoop.php @@ -16,7 +16,7 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection; */ class StepsLoop extends BaseLoop implements PropelSearchLoopInterface { - public $countable = false; + public $countable = true; public $timestampable = false; public $versionable = false; diff --git a/local/modules/Recettes/templates/backOffice/default/ajax/steps.html b/local/modules/Recettes/templates/backOffice/default/ajax/steps.html deleted file mode 100644 index 7c380804..00000000 --- a/local/modules/Recettes/templates/backOffice/default/ajax/steps.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - {loop name="steps-loop" type="recipe_steps" recipe_id=$recipe_id} - - - - - {/loop} - -
{intl l="Step" d="recettes"}{intl l="Detail" d="recettes"}
{$STEP}{$DESCRIPTION}
\ No newline at end of file diff --git a/local/modules/Recettes/templates/backOffice/default/ajax/related-products.html b/local/modules/Recettes/templates/backOffice/default/includes/related-products.html similarity index 93% rename from local/modules/Recettes/templates/backOffice/default/ajax/related-products.html rename to local/modules/Recettes/templates/backOffice/default/includes/related-products.html index a821ca1c..f6eb006b 100644 --- a/local/modules/Recettes/templates/backOffice/default/ajax/related-products.html +++ b/local/modules/Recettes/templates/backOffice/default/includes/related-products.html @@ -1,8 +1,3 @@ -{loop type="recipe" name="recipe-loop" content_id=$content_id limit="1"} - {assign var="recipe_id" value="$ID"} - -{/loop} - diff --git a/local/modules/Recettes/templates/backOffice/default/includes/steps.html b/local/modules/Recettes/templates/backOffice/default/includes/steps.html new file mode 100644 index 00000000..2c543ca5 --- /dev/null +++ b/local/modules/Recettes/templates/backOffice/default/includes/steps.html @@ -0,0 +1,51 @@ +
{intl l="Product" d="recettes"}
+ + + + + + {assign var="last_step" value="0"} + {loop name="steps-loop" type="recipe_steps" recipe_id=$recipe_id} + + + + + + {if $LOOP_COUNT=$LOOP_TOTAL}{assign var="last_step" value="$STEP"}{/if} + {/loop} + +
{intl l="Step" d="recettes"}{intl l="Detail" d="recettes"}
+ {$STEP} + {if $LOOP_COUNT > 1} + + {/if} + {if $LOOP_COUNT < $LOOP_TOTAL} + + {/if}{$DESCRIPTION} + +
+ + + + + +{form name="recette-step-create"} + {capture "step_create"} + {include file="modal/step-edit.html" form_name="recette-step-create" next_step=($last_step+1)} + {/capture} + + {include file="includes/generic-create-dialog.html" + + dialog_id = "add-step-modal" + dialog_title = {intl l="Create a new step" d="recettes"} + dialog_body = {$smarty.capture.step_create nofilter} + + dialog_ok_label = {intl l="Create"} + dialog_cancel_label = {intl l="Cancel"} + + form_action = {$current_url} + form_enctype = {form_enctype form=$form} + } +{/form} \ No newline at end of file diff --git a/local/modules/Recettes/templates/backOffice/default/modal/step-edit.html b/local/modules/Recettes/templates/backOffice/default/modal/step-edit.html new file mode 100644 index 00000000..10bc56a1 --- /dev/null +++ b/local/modules/Recettes/templates/backOffice/default/modal/step-edit.html @@ -0,0 +1,26 @@ +{form name=$form_name} + + {form_hidden_fields form=$form} + + {render_form_field form=$form field="success_url" value={$success_url|default:{url path="/admin/content/update/$contentId?current_tab=recipe"}}} + + {form_field form=$form field="step"} +
+ + +
+ {/form_field} + + {form_field form=$form field="description"} +
+ + + {form_error form=$form field="description"}{$message}{/form_error} + +
+ {/form_field} + +{/form} \ No newline at end of file diff --git a/local/modules/Recettes/templates/backOffice/default/recette-tab.html b/local/modules/Recettes/templates/backOffice/default/recette-tab.html index 91ba7c2b..ccdc9da4 100644 --- a/local/modules/Recettes/templates/backOffice/default/recette-tab.html +++ b/local/modules/Recettes/templates/backOffice/default/recette-tab.html @@ -1,4 +1,5 @@ {loop type="recipe" name="recipe-loop" content_id=$content_id limit="1"} + {assign var="recipe_id" value=$ID} {assign var="title" value=$TITLE} {assign var="summary" value=$SUMMARY} {assign var="people" value=$PEOPLE} @@ -114,12 +115,12 @@

- {include file="ajax/steps.html" content_id=$content_id} + {include file="includes/steps.html" recipe_id="$recipe_id"}
diff --git a/templates/frontOffice/custom/I18n/fr_FR.php b/templates/frontOffice/custom/I18n/fr_FR.php index 8e3be86e..7e74dcb1 100644 --- a/templates/frontOffice/custom/I18n/fr_FR.php +++ b/templates/frontOffice/custom/I18n/fr_FR.php @@ -1,62 +1,146 @@ '%nb élément', + '%nb Items' => '%nb éléments', '+' => '+', + '404' => '404', + 'Sorry! We are not able to give you a delivery method for your order.' => 'Désolé !Nous ne pouvons pas trouver de mode de livraison pour votre commande.', + 'A new password has been sent to your e-mail address. Please check your mailbox.' => 'Un nouveau mot de passe vient d\'être envoyé à votre adresse e-mail. Merci de vérifier votre boite de réception.', + 'A problem occured' => 'Un problème est survenu', + 'A summary of your order has been sent to the following address' => 'Un récapitulatif de commande vous a été envoyé par e-mail à l\'adresse suivante', + 'Account' => 'Mon compte', 'Add a new address' => 'Ajouter une nouvelle adresse', 'Add to cart' => 'Ajouter au panier', 'Additional Info' => 'Informations complémentaires', + 'Address' => 'Adresse', 'Address %nb' => 'Adresse n°', + 'Address Update' => 'Mise à jour de l\'adresse', + 'All' => 'Tout', 'All brands' => 'Toutes les marques', + 'All brands in %store' => 'Toutes les marques %store', 'All contents' => 'Tous les contenus', + 'All contents in' => 'tous les contenus de', + 'All product in brand %title' => 'Tous les produits de la marque %title', 'All products' => 'Tous les produits', + 'All products for brand %title in %store' => 'Tous les produits %title de %store', 'All products in' => 'Tous les produits de', + 'Amount' => 'Montant', + 'An error occurred' => 'Une erreur est survenue', 'Availability' => 'Disponibilité', 'Available' => 'Disponible', 'Back' => 'Retour', + 'Billing' => 'Facturation', + 'Billing Mode' => 'Mode de facturation', + 'Billing address' => 'Adresse de facturation', 'Billing and delivery' => 'Facturation et livraison', 'Brand information' => 'Marque', + 'Brands' => 'Marques', + 'Cancel' => 'Annuler', + 'Cancel Newsletter Subscription' => 'Annuler l\'abonnement à la Newsletter', 'Cart' => 'Panier', + 'Cart total excl. taxes' => 'Total articles HT', + 'Cart total incl. taxes' => 'Total articles TTC', 'Categories' => 'Rubriques', + 'Change Password' => 'Modifier mon mot de passe', + 'Change address' => 'Changer d\'adresse', + 'Change my account information' => 'Modifier mes informations personnelles', + 'Change my password' => 'Changer mon mot de passe', + 'Check my order' => 'Vérifier ma commande', 'Choose your delivery address' => 'Choisissez une adresse de livraison', 'Choose your delivery method' => 'Choisissez votre moyen de livraison', + 'Choose your payment method' => 'Choisissez votre moyen de paiement', 'Code :' => 'Code :', + 'Connecting to the secure payment server, please wait a few seconds...' => 'Connexion au serveur sécurisé, merci de patienter quelques secondes.', 'Contact Us' => 'Contactez-nous', + 'Contact page' => 'Page contact', 'Continue Shopping' => 'Continuer mes achats', 'Copyright' => 'Copyright', 'Coupon code' => 'Code promo', + 'Create' => 'Créer', 'Create New Account' => 'Créer un nouveau compte', + 'Create New Address' => 'Créer une nouvelle adresse', + 'Created' => 'Créée le', + 'Currency' => 'Devise', + 'Customer Number' => 'Numéro de client', + 'Date' => 'Date', 'Delete' => 'Supprimer', + 'Delivery' => 'Bon de livraison', 'Delivery Information' => 'Information de livraison', + 'Delivery Mode' => 'Mode de livraison', + 'Delivery REF' => 'Référence livraison', + 'Delivery address' => 'Adresse de livraison', + 'Demo product description' => 'Descrption produit de démo', + 'Demo product title' => 'Titre produit de démo', 'Description' => 'Description', 'Discount incl. taxes' => 'Remise TTC', + 'Discount with tax' => 'Remise TTC', + 'Do you have an account?' => 'Avez-vous un compte ?', 'Do you really want to delete this address ?' => 'Voulez-vous vraiment supprimer cette adresse ?', 'Documents' => 'Documents', + 'Download' => 'Télécharger', 'Edit' => 'Modifier', 'Edit this address' => 'Editer cette adresse', 'Estimated shipping ' => 'Estimation des frais de port', + 'Expected delivery date: %delivery_date' => 'Date de livraison estimée :', 'Forgot your Password?' => 'Mot de passe oublié ?', 'Free shipping' => 'Livraison gratuite', 'From %price' => 'A partir de %price', + 'Go back to the previous page' => 'Retour à la page précédente', + 'Go home' => 'Retour à l\'accueil', + 'Grid' => 'Grille', 'Home' => 'Accueil', + 'I\'ve read and agreed on Terms & Conditions' => 'J\'ai lu et j\'accepte les conditions générales de vente', + 'If nothing happens within 10 seconds, please click here.' => 'Si rien ne se passe dans les 10 secondes, merci de cliquer ici. ', + 'If you want to change your email, please contact us.' => 'Pour changer votre email, merci de nous contacter', 'In Stock' => 'Disponible', + 'Including %tax tax' => 'Dont taxes %tax', + 'Invoice REF' => 'Numéro de facture', + 'Invoice date' => 'Date de facturation', + 'Language' => 'Langue', + 'Latest' => 'Nouveautés', + 'Latest products' => 'Derniers produits', + 'List' => 'Liste', + 'List of orders' => 'Liste de mes commandes', + 'Login' => 'Connexion', 'Login Information' => 'Informations de connexion', 'Main Address' => 'Adresse Principale', 'More information about this brand' => 'Plus de détails sur cette marque', 'Multi-payment platform' => 'Plateforme de paiement multiple', 'My Account' => 'Mon compte', + 'My Address Books' => 'Mes carnets d\'adresses', + 'My Address book' => 'Mon carnet d\'adresses', + 'My Orders' => 'Mes commandes', + 'My order' => 'Ma commande', 'Name' => 'Nom', + 'Name ascending' => 'Nom croissant', + 'Name descending' => 'Nom décroissant', 'Need help ?' => 'Besoin d\'aide ?', + 'Newsletter' => 'Lettre d\'information', + 'Newsletter Subscription' => 'Inscription à la newsletter', + 'Next' => 'Suivant', 'Next Step' => 'Etape suivante', 'Next product' => 'Produit suivant.', + 'No Contents in this folder.' => 'Aucun contenu pour ce dossier.', 'No deliveries available for this cart and this country' => 'Aucun mode de livraison disponible pour ce panier et ce pays', + 'No products available in this brand' => 'Aucun produit de cette marque n\'est disponible', 'No products available in this category' => 'Aucun produit dans cette catégorie.', + 'No results found' => 'Aucun résultat', 'No.' => 'N°', 'Ok' => 'Ok', 'Options' => 'Options', + 'Order details' => 'Détail de la commande', + 'Order details %ref' => 'Détail de la commande %ref', + 'Order number' => 'Commande numéro', 'Orders over $50' => 'Commande supérieure à 50€', 'Out of Stock' => 'Hors stock', + 'PDF invoice' => 'Facture PDF', + 'Pagination' => 'Pagination', 'Password' => 'Mot de passe', + 'Password Forgotten' => 'Mot de passe oublié', + 'Pay with %module_title' => 'Payer avec %module_title ', 'Personal Information' => 'Informations personnelles', + 'Placeholder address label' => 'Maison, Domicile, Travail...', 'Placeholder address1' => 'Adresse', 'Placeholder address2' => 'Adresse', 'Placeholder cellphone' => 'Numéro de portable', @@ -72,49 +156,117 @@ return array( 'Placeholder lastname' => 'Nom de famille', 'Placeholder phone' => 'Numéro de téléphone', 'Placeholder zipcode' => 'Code postal', + 'Please enter your email address below.' => 'Veuillez saisir votre adresse e-mail ci-dessous.', + 'Please try again to order' => 'Merci de réessayer', + 'Position' => 'Position', + 'Postage' => 'Frais de livraison TTC', + 'Previous' => 'Précédent', 'Previous product' => 'Produit précédent.', 'Price' => 'Prix', + 'Price ascending' => 'Prix croissant', + 'Price descending' => 'Prix décroissant', 'Proceed checkout' => 'Continuer la commande', + 'Product Empty Button' => 'Bouton produit vide', + 'Product Empty Message' => 'Message produit vide', + 'Product Empty Title' => 'Titre produit vide', 'Product Name' => 'Nom du produit', + 'Product Offers' => 'Offre spéciale', 'Qty' => 'Qté', 'Quantity' => 'Quantité', 'Questions ? See our F.A.Q.' => 'Questions ? Voir notre FAQ', + 'REF' => 'REF', + 'Rating' => 'Avis', + 'Redirect to bank service' => 'Redirection vers le service bancaire', 'Ref.' => 'Réf.', 'Register' => 'S\'inscrire', 'Regular Price:' => 'Prix normal', + 'Related' => 'Liés', 'Remove' => 'Supprimer', 'Remove this address' => 'Supprimer cette adresse', + 'SELECT YOUR CURRENCY' => 'Sélectionnez votre devise', + 'SELECT YOUR LANGUAGE' => 'Sélectionnez votre langue', + 'Sale was not found' => 'La promotion n\'a pas été trouvée', + 'Save %amount%sign on these products' => 'Economisez %amount%sign sur ces produits', 'Save %amount%sign on this product' => 'Economisez %amount%sign sur ce produit', 'Search' => 'Recherche', + 'Search Result for' => 'Résultat de recherche pour', + 'Secondary Navigation' => 'Navigation secondaire', + 'Secure Payment' => 'Paiement sécurisé', 'Secure payment' => 'Paiement sécurisé', 'Select Country' => 'Choisissez un pays', 'Select State' => 'Sélectionnez un Etat', 'Select Title' => 'Civilité', 'Select your country:' => 'Sélectionnez votre pays :', 'Send' => 'Envoyer', + 'Send new password again' => 'Renvoyer un mot de passe', 'Send us a message' => 'Envoyez nous un message.', + 'Shipping' => 'Frais de livraison TTC', + 'Show' => 'Voir', + 'Sign in' => 'Se connecter', 'Skip to content' => 'Aller au contenu', 'Sorry but this combination does not exist.' => 'Désolé, cette déclinaison n\'existe pas.', + 'Sorry, your cart is empty. There\'s nothing to pay.' => 'Désolé, votre panier est vide. Il n\'y a rien à payer.', + 'Sort By' => 'Trier par', 'Special Price:' => 'Prix promo', + 'Status' => 'Etat', + 'Subscribe' => 'Inscription', + 'Tax %name: %tax' => 'Dont %name: %tax', + 'Tax: %tax' => 'Dont taxe %tax', + 'Taxed Price' => 'Prix TTC', + 'Taxes total' => 'Total des taxes', + 'Thank you for the trust you place in us.' => 'Merci pour votre confiance. ', + 'Thanks !' => 'Merci !', + 'Thanks for signing up! We\'ll keep you posted whenever we have any new updates.' => 'Merci de votre inscription ! Nous vous tiendrons informé dès qu\'il y aura des nouveautés.', + 'Thanks for your message, we will contact as soon as possible.' => 'Merci de votre message, nous vous contacterons dès que possible.', + 'The page cannot be found' => 'La page ne peut pas être trouvée', 'The product has been added to your cart' => 'Le produit a été ajouté à votre panier', 'Thelia V2' => 'Thelia v2', 'This offer is valid until %date' => 'Cette offre est valide jusqu\'au %date', + 'To cancel your subscription to our newsletter, please enter your email address below.' => 'Pour annuler votre abonnement à notre newsletter, veuillez entrer votre adresse email ci-dessous.', 'Toggle navigation' => 'Basculer la navigation', 'Total' => 'Total', + 'Total incl. tax' => 'Total TTC', 'Total incl. taxes' => 'Total TTC', - 'Total incl. taxes without postage' => 'Total TTC avec livraison', + 'Total incl.tax' => 'Total HT', + 'Total with tax' => 'Total TTC', + 'Total without tax' => 'Total HT', + 'Transaction REF : %ref' => 'Référence transaction', + 'Try again' => 'Ré-essayer le paiement', + 'Unit Price' => 'Prix unitaire', 'Unit Price incl. taxes' => 'Prix unitaire TTC', + 'Unit Taxed Price' => 'Prix unitaire TTC', + 'Unsubscribe' => 'Me désabonner', + 'Update' => 'Mettre à jour', + 'Update Profile' => 'Mettre à jour votre profil', 'Update Quantity' => 'Mettre à jour la quantité', 'Upsell Products' => 'Produits liés', + 'View' => 'Voir', 'View Cart' => 'Voir le panier', + 'View all' => ' Voir tout', + 'View as' => 'Voir en tant que', + 'View order %ref details' => 'Voir le détail de la commande %ref', 'View product' => 'Voir le produit', 'Warning' => 'Attention', 'We apologize but some of the ordered products are not available any more.' => 'Nous sommes désolés, certains des produits que vous avez commandé ne sont plus disponibles.', + 'We\'re sorry but an error occured. Please try to contact the site administrator' => 'Nous sommes désolés mais une erreur est survenue. Veuillez contacter l\'administrateur', + 'We\'re sorry, a problem occured and your payment was not successful.' => 'Nous sommes désolés, un problème est survenu lors du paiement.', + 'You are here:' => 'Vous êtes ici :', + 'You choose' => 'Vous avez choisi ', + 'You choose to pay by' => 'Vous avez choisi de payer par', + 'You don\'t have orders yet.' => 'Vous n\'avez pas encore de commande.', 'You have no items in your shopping cart.' => 'Vous n\'avez pas de produit dans votre panier.', + 'You may have a coupon ?' => 'Avez-vous un code promo ?', + 'You want to subscribe to the newsletter? Please enter your email address below.' => 'Vous voulez vous inscrire à la newsletter ? Veuillez saisir votre adresse e-mail ci-dessous.', + 'You will receive a link to reset your password.' => 'Vous recevrez un lien pour réinitialiser votre mot de passe.', 'Your Cart' => 'Votre panier', + 'Your customer account was successfully activated, you can now login.' => 'Votre compte client a bien été activé, vous pouvez maintenant vous connecter.', + 'Your order payment' => 'Votre paiement', + 'Your order will be confirmed by us upon receipt of your payment.' => 'Votre commande sera confirmée à réception de votre paiement.', + 'Your subscription to our newsletter has been canceled.' => 'Votre inscription à notre newsletter a été annulée.', 'for' => 'pour', 'instead of' => 'au lieu de', 'missing or invalid data' => 'Information erronée ou incomplète', + 'per page' => 'par page', 'update' => 'mettre à jour', 'with:' => 'avec :', ); diff --git a/templates/frontOffice/custom/assets/dist/css/custom.min.css b/templates/frontOffice/custom/assets/dist/css/custom.min.css index a40598fd..672c3d30 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}.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;border-radius:3px;cursor:default}.grid #category-products .item{line-height:6.5rem}.texte-normal{font-family:inherit;line-height:1.1;color:inherit}.texte-normal:link{text-decoration:none} \ 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;border-radius:3px;cursor:default}.grid #category-products .item{line-height:6.5rem}.texte-normal{font-family:inherit;line-height:1.1;color:inherit}.texte-normal:link{text-decoration:none}span.product-categorie{margin:auto!important;line-height:1rem!important;height:1.5rem} \ No newline at end of file diff --git a/templates/frontOffice/custom/assets/dist/img/218x146.png b/templates/frontOffice/custom/assets/dist/img/218x146.png index 07f043b1..6e964a2c 100644 Binary files a/templates/frontOffice/custom/assets/dist/img/218x146.png and b/templates/frontOffice/custom/assets/dist/img/218x146.png differ diff --git a/templates/frontOffice/custom/assets/dist/img/280x196.png b/templates/frontOffice/custom/assets/dist/img/280x196.png index 0df3c940..592012de 100644 Binary files a/templates/frontOffice/custom/assets/dist/img/280x196.png and b/templates/frontOffice/custom/assets/dist/img/280x196.png differ diff --git a/templates/frontOffice/custom/assets/dist/img/email/header.jpg b/templates/frontOffice/custom/assets/dist/img/email/header.jpg index c80e1652..8cdff684 100644 Binary files a/templates/frontOffice/custom/assets/dist/img/email/header.jpg and b/templates/frontOffice/custom/assets/dist/img/email/header.jpg differ diff --git a/templates/frontOffice/custom/assets/dist/img/email/logo.png b/templates/frontOffice/custom/assets/dist/img/email/logo.png index 6cb56aea..8f14ec09 100644 Binary files a/templates/frontOffice/custom/assets/dist/img/email/logo.png and b/templates/frontOffice/custom/assets/dist/img/email/logo.png differ diff --git a/templates/frontOffice/custom/assets/dist/img/favicon.png b/templates/frontOffice/custom/assets/dist/img/favicon.png index 5669f3e7..e481a99d 100644 Binary files a/templates/frontOffice/custom/assets/dist/img/favicon.png and b/templates/frontOffice/custom/assets/dist/img/favicon.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 index c02e3d5f..402458a3 100644 Binary files a/templates/frontOffice/custom/assets/dist/img/flags/logo-npdc.png and b/templates/frontOffice/custom/assets/dist/img/flags/logo-npdc.png differ diff --git a/templates/frontOffice/custom/assets/dist/img/logo.png b/templates/frontOffice/custom/assets/dist/img/logo.png index 6cb56aea..8f14ec09 100644 Binary files a/templates/frontOffice/custom/assets/dist/img/logo.png and b/templates/frontOffice/custom/assets/dist/img/logo.png differ diff --git a/templates/frontOffice/custom/assets/dist/img/product/1/118x85.png b/templates/frontOffice/custom/assets/dist/img/product/1/118x85.png index cf9e98b4..eb018927 100644 Binary files a/templates/frontOffice/custom/assets/dist/img/product/1/118x85.png and b/templates/frontOffice/custom/assets/dist/img/product/1/118x85.png differ diff --git a/templates/frontOffice/custom/assets/src/css/custom.css b/templates/frontOffice/custom/assets/src/css/custom.css index 047ed4f5..cf16f5a1 100644 --- a/templates/frontOffice/custom/assets/src/css/custom.css +++ b/templates/frontOffice/custom/assets/src/css/custom.css @@ -342,4 +342,9 @@ article.col-main div#google-map { } .texte-normal:link { text-decoration: none; +} +span.product-categorie { + margin: auto !important; + line-height: 1rem !important; + height: 1.5rem; } \ 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 dfe98b3a..74f423d4 100644 --- a/templates/frontOffice/custom/includes/single-product.html +++ b/templates/frontOffice/custom/includes/single-product.html @@ -9,13 +9,19 @@ {assign var="product_id" value=$ID} {/if} - {assign var="_PROVENANCE" value=""} + {assign var="origine" value=""} + {assign var="categorie" value=""} {loop name="features-list" type="feature" product=$product_id} {if $TITLE|strstr:"Provenance"} {loop name="feature-values-list" type="feature_value" product=$product_id feature={$ID}} - {assign var="_PROVENANCE" value="$TITLE"} + {assign var="origine" value="$TITLE"} {/loop} {/if} + {if $TITLE|strstr:"Catégorie"} + {loop name="feature-values-list" type="feature_value" product=$product_id feature={$ID}} + {assign var="categorie" value="$TITLE"} + {/loop} + {/if} {/loop}
@@ -30,8 +36,9 @@ {/elseloop} -

{$productTitle}

 + {if $categorie ne ""}Cat : {$categorie}{/if} {if $hasDescription}

{$DESCRIPTION nofilter}

@@ -42,7 +49,7 @@
- {if $_PROVENANCE ne ""}{$_PROVENANCE}{else}{intl l="Non précisée"}{/if} + {if $origine ne ""}{$origine}{else}{intl l="Non précisée"}{/if}
{* Stock *} @@ -56,7 +63,6 @@ {/if}
-
@@ -133,7 +139,6 @@ {/if}
- {if $hasBtn == true} {if $hasSubmit == true && $current_stock_content == "in_stock"} {form name="thelia.cart.add" }