diff --git a/.gitignore b/.gitignore index 02845be2..7c8c7e4f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,132 @@ /local/session/ /web/assets/ /local/session/ +/web/revslider/media/templates/404-page-hero-collection/slide1.jpg +/web/revslider/media/templates/404-page-hero-collection/slide2.jpg +/web/revslider/media/templates/404-page-hero-collection/slide3.jpg +/web/revslider/media/templates/404-page-hero-collection/slide4.jpg +/web/revslider/media/templates/Claymorphism-Carousel/slide1.jpg +/web/revslider/media/templates/Claymorphism-Carousel/slide2.jpg +/web/revslider/media/templates/Claymorphism-Carousel/slide3.jpg +/web/revslider/media/templates/Claymorphism-Carousel/slide4.jpg +/web/revslider/media/templates/destinations-card-slider/slide1.jpg +/web/revslider/media/templates/destinations-card-slider/slide2.jpg +/web/revslider/media/templates/destinations-card-slider/slide3.jpg +/web/revslider/media/templates/furniture-store-isometric-slider/slide1.jpg +/web/revslider/media/templates/furniture-store-isometric-slider/slide2.jpg +/web/revslider/media/templates/furniture-store-isometric-slider/slide3.jpg +/web/revslider/media/templates/furniture-store-isometric-slider/slide4.jpg +/web/revslider/media/templates/happy-holidays-hero/slide1.jpg +/web/revslider/media/templates/image-comparison-slider/slide1.jpg +/web/revslider/media/templates/image-comparison-slider/slide2.jpg +/web/revslider/media/templates/image-comparison-slider/slide3.jpg +/web/revslider/media/templates/image-comparison-slider/slide4.jpg +/web/revslider/media/templates/knives-product-slider/slide1.jpg +/web/revslider/media/templates/knives-product-slider/slide2.jpg +/web/revslider/media/templates/knives-product-slider/slide3.jpg +/web/revslider/media/templates/knives-product-slider/slide4.jpg +/web/revslider/media/templates/material-ui-slider/slide1.jpg +/web/revslider/media/templates/material-ui-slider/slide2.jpg +/web/revslider/media/templates/material-ui-slider/slide3.jpg +/web/revslider/media/templates/packages/Wedding-Photo-Slider-Package.jpg +/web/revslider/media/templates/pet-store-product-slider/slide1.jpg +/web/revslider/media/templates/pet-store-product-slider/slide2.jpg +/web/revslider/media/templates/pet-store-product-slider/slide3.jpg +/web/revslider/media/templates/pet-store-product-slider/slide4.jpg +/web/revslider/media/templates/pet-store-product-slider/slide5.jpg +/web/revslider/media/templates/space-and-sci-fi-presentation-slider/slide1.png +/web/revslider/media/templates/space-and-sci-fi-presentation-slider/slide2.png +/web/revslider/media/templates/space-and-sci-fi-presentation-slider/slide3.png +/web/revslider/media/templates/space-and-sci-fi-presentation-slider/slide4.png +/web/revslider/media/templates/tiny-slider-dark/slide1.jpg +/web/revslider/media/templates/tiny-slider-dark/slide2.jpg +/web/revslider/media/templates/tiny-slider-dark/slide3.jpg +/web/revslider/media/templates/tiny-slider-dark/slide4.jpg +/web/revslider/media/templates/tiny-slider-dark/slide5.jpg +/web/revslider/media/templates/tiny-slider-dark/slide6.jpg +/web/revslider/media/templates/tiny-slider-light/slide1.jpg +/web/revslider/media/templates/tiny-slider-light/slide2.jpg +/web/revslider/media/templates/tiny-slider-light/slide3.jpg +/web/revslider/media/templates/tiny-slider-light/slide4.jpg +/web/revslider/media/templates/tiny-slider-light/slide5.jpg +/web/revslider/media/templates/tiny-slider-light/slide6.jpg +/web/revslider/media/templates/wedding-photo-slider/slide1.jpg +/web/revslider/media/templates/wedding-photo-slider/slide2.jpg +/web/revslider/media/templates/wedding-photo-slider/slide3.jpg +/web/revslider/media/templates/wedding-photo-slider/slide4.jpg +/web/revslider/media/templates/wedding-photo-slider-modal/slide1.jpg +/web/revslider/media/templates/wedding-photo-slider-modal/slide2.jpg +/web/revslider/media/templates/wedding-photo-slider-modal/slide3.jpg +/web/revslider/media/templates/wedding-photo-slider-modal/slide4.jpg +/web/revslider/media/thumb/gallery0b9ea-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-Nickel.png +/web/revslider/media/thumb/gallery0de73-Zennio-Z100A-ZVIZ100A.png +/web/revslider/media/thumb/gallery0e93f-Zennio-NarrowDIM-X2.-universal-dimmer.-2-channels.-ZDINDX2.png +/web/revslider/media/thumb/gallery2cbd7-JUNG_LS-TOUCH_M--tal-inox_UNG_LS-TOUCH_M--tal-inox_ES459D1S.png +/web/revslider/media/thumb/gallery4bd77-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50A.png +/web/revslider/media/thumb/gallery5cf1d-Zennio--2-Z100W-ZVIZ100W.png +/web/revslider/media/thumb/gallery6e5a8-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-Acier.png +/web/revslider/media/thumb/gallery8be78-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50W.png +/web/revslider/media/thumb/gallery8c4c9-Zennio-NarrowDIM-X4.--universal-dimmer.-4-channels.-ZDINDX4.png +/web/revslider/media/thumb/gallery11dc8-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-Mocca.png +/web/revslider/media/thumb/gallery18cf3-Zennio-inBOX-DIM-Actionneur-variateur-encastr---ZDI-IBD.png +/web/revslider/media/thumb/gallery89a68-Zennio-DIMinBOX-DX1-KNX-1-channel-universal-dimmer-actuator-ZDI-DBDX1.png +/web/revslider/media/thumb/gallery608d5-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50White.png +/web/revslider/media/thumb/gallery681e3-JUNG_LS-TOUCH_NOIR_LS459D1SSW.png +/web/revslider/media/thumb/gallery692c1-Zennio-Z100W-ZVIZ100W.png +/web/revslider/media/thumb/gallery5057e-JUNG-T--l--variateur-2-sorties-2x300W-3902REGHE.png +/web/revslider/media/thumb/gallery9300d-Zennio-DIMinBOX-DX4-Actionneur-VARIATEUR-Universel-4-sorties-ZDIDBDX4.png +/web/revslider/media/thumb/gallery21138-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-Anthracite.png +/web/revslider/media/thumb/gallery23552-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50Anthracite.png +/web/revslider/media/thumb/gallery37012-Zennio-Z100S-ZVIZ100S.png +/web/revslider/media/thumb/gallerya265c-JUNG_LS-TOUCH_Laiton-ancien_ME459D1SAT.png +/web/revslider/media/thumb/galleryab8a3-JUNG_LS-TOUCH_Corbusier_b.png +/web/revslider/media/thumb/galleryb7841-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50S.png +/web/revslider/media/thumb/gallerybd274-JUNG_LS-TOUCH_Blanc.png +/web/revslider/media/thumb/galleryc0c23-JUNG_LS-TOUCH_NOIR1_LS459D1SSW.png +/web/revslider/media/thumb/galleryc10c7-JUNG_LS-TOUCH_NOIR2_LS459D1SSW.png +/web/revslider/media/thumb/galleryc59ee-JUNG-T--l--variateur-1-sortie-500W-3901REGHE.png +/web/revslider/media/thumb/galleryce79c-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50Silver.png +/web/revslider/media/thumb/galleryd308e-Zennio-DIMinBOX-DX2-Actionneur-VARIATEUR-KNX-Universel-2-sorties-ZDI-DBDX2.png +/web/revslider/media/thumb/galleryd4884-JUNG_LS-TOUCH_Corbusier.png +/web/revslider/media/thumb/gallerydf261-JUNG-KNX-actionneur-t--l--variateur-universel-LED-4-sorties-390041SR.png +/web/revslider/media/thumb/gallerye4ca9-JUNG_LS-TOUCH_Laiton-dor--_ME459D1SC.png +/web/revslider/media/thumb/gallerye55a2-JUNG_LS-TOUCH_Noir-mat_UNG_LS-TOUCH_Noir-mat_LS-459-D1-S-SWM.png +/web/revslider/media/thumb/gallerye528a-JUNG_LS-TOUCH_Blanc-mat_UNG_LS-TOUCH_Blanc-mat_LS-459-D1-S-WWM.png +/web/revslider/media/thumb/galleryeb5d7-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-BlancLotus.png +/web/revslider/media/thumb/galleryf14dc-Zennio--2-Z100S-ZVIZ100S.png +/web/revslider/media/0b9ea-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-Nickel.png +/web/revslider/media/0de73-Zennio-Z100A-ZVIZ100A.png +/web/revslider/media/0e93f-Zennio-NarrowDIM-X2.-universal-dimmer.-2-channels.-ZDINDX2.png +/web/revslider/media/2cbd7-JUNG_LS-TOUCH_M--tal-inox_UNG_LS-TOUCH_M--tal-inox_ES459D1S.png +/web/revslider/media/4bd77-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50A.png +/web/revslider/media/5cf1d-Zennio--2-Z100W-ZVIZ100W.png +/web/revslider/media/6e5a8-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-Acier.png +/web/revslider/media/8be78-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50W.png +/web/revslider/media/8c4c9-Zennio-NarrowDIM-X4.--universal-dimmer.-4-channels.-ZDINDX4.png +/web/revslider/media/11dc8-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-Mocca.png +/web/revslider/media/18cf3-Zennio-inBOX-DIM-Actionneur-variateur-encastr---ZDI-IBD.png +/web/revslider/media/89a68-Zennio-DIMinBOX-DX1-KNX-1-channel-universal-dimmer-actuator-ZDI-DBDX1.png +/web/revslider/media/608d5-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50White.png +/web/revslider/media/681e3-JUNG_LS-TOUCH_NOIR_LS459D1SSW.png +/web/revslider/media/692c1-Zennio-Z100W-ZVIZ100W.png +/web/revslider/media/5057e-JUNG-T--l--variateur-2-sorties-2x300W-3902REGHE.png +/web/revslider/media/9300d-Zennio-DIMinBOX-DX4-Actionneur-VARIATEUR-Universel-4-sorties-ZDIDBDX4.png +/web/revslider/media/21138-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-Anthracite.png +/web/revslider/media/23552-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50Anthracite.png +/web/revslider/media/37012-Zennio-Z100S-ZVIZ100S.png +/web/revslider/media/a265c-JUNG_LS-TOUCH_Laiton-ancien_ME459D1SAT.png +/web/revslider/media/ab8a3-JUNG_LS-TOUCH_Corbusier_b.png +/web/revslider/media/b7841-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50S.png +/web/revslider/media/bd274-JUNG_LS-TOUCH_Blanc.png +/web/revslider/media/c0c23-JUNG_LS-TOUCH_NOIR1_LS459D1SSW.png +/web/revslider/media/c10c7-JUNG_LS-TOUCH_NOIR2_LS459D1SSW.png +/web/revslider/media/c59ee-JUNG-T--l--variateur-1-sortie-500W-3901REGHE.png +/web/revslider/media/ce79c-Zennio-Z50---Ecran-tactile-5--couleur-KNX-ZVIZ50Silver.png +/web/revslider/media/d308e-Zennio-DIMinBOX-DX2-Actionneur-VARIATEUR-KNX-Universel-2-sorties-ZDI-DBDX2.png +/web/revslider/media/d4884-JUNG_LS-TOUCH_Corbusier.png +/web/revslider/media/df261-JUNG-KNX-actionneur-t--l--variateur-universel-LED-4-sorties-390041SR.png +/web/revslider/media/e4ca9-JUNG_LS-TOUCH_Laiton-dor--_ME459D1SC.png +/web/revslider/media/e55a2-JUNG_LS-TOUCH_Noir-mat_UNG_LS-TOUCH_Noir-mat_LS-459-D1-S-SWM.png +/web/revslider/media/e528a-JUNG_LS-TOUCH_Blanc-mat_UNG_LS-TOUCH_Blanc-mat_LS-459-D1-S-WWM.png +/web/revslider/media/eb5d7-Schneider-D-Life-Dynamique--6-touches-MTN6193-6010-BlancLotus.png +/web/revslider/media/f14dc-Zennio--2-Z100S-ZVIZ100S.png diff --git a/templates/email/default2020/assets/img/logo.gif b/templates/email/default2020/assets/img/logo.gif deleted file mode 100644 index cfa39664..00000000 Binary files a/templates/email/default2020/assets/img/logo.gif and /dev/null differ diff --git a/templates/email/default2020/assets/img/logo.png b/templates/email/default2020/assets/img/logo_standard_hors_noel.png similarity index 100% rename from templates/email/default2020/assets/img/logo.png rename to templates/email/default2020/assets/img/logo_standard_hors_noel.png diff --git a/templates/email/default2020/email-layout.tpl b/templates/email/default2020/email-layout.tpl index 0071f383..3e19aad4 100644 --- a/templates/email/default2020/email-layout.tpl +++ b/templates/email/default2020/email-layout.tpl @@ -459,7 +459,7 @@ {/block} - + {block name="logo-header"}
|
- {$image = {image file='assets/img/logo.png' failsafe=true}}
+ {if $locale = "fr_FR"}
+ {$image = {image file="assets/img/logo_fr.png" failsafe=true}}
+ {else}
+ {$image = {image file="assets/img/logo_en.png" failsafe=true}}
+ {/if}
{if $image == null}
- {$image = {image file='assets/img/logo.gif' failsafe=true}}
+ {$image = {image file="assets/img/logo.gif" failsafe=true}}
{/if}
|
diff --git a/templates/frontOffice/default2020/assets/dist/img/logo.gif b/templates/frontOffice/default2020/assets/dist/img/logo.gif
deleted file mode 100644
index cfa39664..00000000
Binary files a/templates/frontOffice/default2020/assets/dist/img/logo.gif and /dev/null differ
diff --git a/templates/frontOffice/default2020/assets/dist/img/logo_en.OLD.png b/templates/frontOffice/default2020/assets/dist/img/logo_en.OLD.png
deleted file mode 100644
index 884b18b7..00000000
Binary files a/templates/frontOffice/default2020/assets/dist/img/logo_en.OLD.png and /dev/null differ
diff --git a/templates/frontOffice/default2020/assets/dist/img/logo_en.png b/templates/frontOffice/default2020/assets/dist/img/logo_en.png
index 058737ff..60fb7f74 100644
Binary files a/templates/frontOffice/default2020/assets/dist/img/logo_en.png and b/templates/frontOffice/default2020/assets/dist/img/logo_en.png differ
diff --git a/templates/frontOffice/default2020/assets/dist/img/logo_en_standard_hors_noel.png b/templates/frontOffice/default2020/assets/dist/img/logo_en_standard_hors_noel.png
new file mode 100644
index 00000000..058737ff
Binary files /dev/null and b/templates/frontOffice/default2020/assets/dist/img/logo_en_standard_hors_noel.png differ
diff --git a/templates/frontOffice/default2020/assets/dist/img/logo_fr.png b/templates/frontOffice/default2020/assets/dist/img/logo_fr.png
index 20f62a4c..1b1e6702 100644
Binary files a/templates/frontOffice/default2020/assets/dist/img/logo_fr.png and b/templates/frontOffice/default2020/assets/dist/img/logo_fr.png differ
diff --git a/templates/frontOffice/default2020/assets/dist/img/logo_fr_standard_hors_noel.png b/templates/frontOffice/default2020/assets/dist/img/logo_fr_standard_hors_noel.png
new file mode 100644
index 00000000..20f62a4c
Binary files /dev/null and b/templates/frontOffice/default2020/assets/dist/img/logo_fr_standard_hors_noel.png differ
diff --git a/templates/frontOffice/default2020/assets/dist/img/slider1.jpg b/templates/frontOffice/default2020/assets/dist/img/slider1.jpg
deleted file mode 100644
index 3492ab6e..00000000
Binary files a/templates/frontOffice/default2020/assets/dist/img/slider1.jpg and /dev/null differ
diff --git a/templates/frontOffice/default2020/assets/dist/img/slider2.jpg b/templates/frontOffice/default2020/assets/dist/img/slider2.jpg
deleted file mode 100644
index 08ce939c..00000000
Binary files a/templates/frontOffice/default2020/assets/dist/img/slider2.jpg and /dev/null differ
diff --git a/templates/frontOffice/default2020/assets/dist/img/slider3.jpg b/templates/frontOffice/default2020/assets/dist/img/slider3.jpg
deleted file mode 100644
index a986bef0..00000000
Binary files a/templates/frontOffice/default2020/assets/dist/img/slider3.jpg and /dev/null differ
diff --git a/templates/frontOffice/default2020/assets/src/img/logo.png b/templates/frontOffice/default2020/assets/src/img/logo.png
deleted file mode 100644
index 686e36c3..00000000
Binary files a/templates/frontOffice/default2020/assets/src/img/logo.png and /dev/null differ
diff --git a/templates/frontOffice/default2020/assets/src/img/logo_en.OLD.png b/templates/frontOffice/default2020/assets/src/img/logo_en.OLD.png
deleted file mode 100644
index 73acc961..00000000
Binary files a/templates/frontOffice/default2020/assets/src/img/logo_en.OLD.png and /dev/null differ
diff --git a/templates/pdf/default2020/assets/img/LogoLD.png b/templates/pdf/default2020/assets/img/LogoLD.png
deleted file mode 100644
index 365e6a21..00000000
Binary files a/templates/pdf/default2020/assets/img/LogoLD.png and /dev/null differ