diff --git a/controllers/__pycache__/main.cpython-35.pyc b/controllers/__pycache__/main.cpython-35.pyc index d3cd011dbc346568728a269a0c6cd05ceaa37f3d..f03faf0267cb0c43ea40d9175bc6590eaf6d204d 100644 Binary files a/controllers/__pycache__/main.cpython-35.pyc and b/controllers/__pycache__/main.cpython-35.pyc differ diff --git a/controllers/main.py b/controllers/main.py index eb3136eaa030c97933e148da780b8fccc6ac4763..9002ddf67f83a84edd7b7797b80f30383caced3d 100644 --- a/controllers/main.py +++ b/controllers/main.py @@ -19,4 +19,14 @@ class PyloteDownloadPDF(http.Controller): blog_obj = request.env['blog.post'].sudo().search([('id', '=', id)]) response.data = base64.decodebytes(blog_obj.document) response.mimetype = 'application/pdf' + return response + + @http.route( + '/web/binary/download_pdf_bis/<id>', + type='http', auth="public", website=True) + def download_pdf_bis(self, id, **kw): + response = werkzeug.wrappers.Response() + blog_obj = request.env['blog.post'].sudo().search([('id', '=', id)]) + response.data = base64.decodebytes(blog_obj.document_bis) + response.mimetype = 'application/pdf' return response \ No newline at end of file diff --git a/models/__pycache__/website.cpython-35.pyc b/models/__pycache__/website.cpython-35.pyc index 568a1ae1b0f7aa69651eabf2101a16c73a7aa6fc..18c117dab86cfb3fdf415c29cfcecfebac76c6cc 100644 Binary files a/models/__pycache__/website.cpython-35.pyc and b/models/__pycache__/website.cpython-35.pyc differ diff --git a/models/__pycache__/website_blog.cpython-35.pyc b/models/__pycache__/website_blog.cpython-35.pyc index 025b0a2e2a44f67b6f663446157d28380e402b07..7eac856db61c984420115d2bfa636ef4d3ddccb0 100644 Binary files a/models/__pycache__/website_blog.cpython-35.pyc and b/models/__pycache__/website_blog.cpython-35.pyc differ diff --git a/models/website.py b/models/website.py index 74b564ddf9dc783392017d4495f1de4db096ec3b..a8d3e87ea6f34f160322a106790f77c102efc1f4 100644 --- a/models/website.py +++ b/models/website.py @@ -14,4 +14,4 @@ class PyloteWebsite(models.Model): @api.one def _compute_latest_news_ids(self): - self.latest_news_ids = self.env['blog.post'].search([]) + self.latest_news_ids = self.env['blog.post'].search([("website_published", "=", True)], limit=6, order='published_date desc') \ No newline at end of file diff --git a/models/website_blog.py b/models/website_blog.py index 0f3b3473e05beb37eb2645db51af71091718ad95..95cf13ec8cbb542870562280978f90d29dd37002 100644 --- a/models/website_blog.py +++ b/models/website_blog.py @@ -13,4 +13,7 @@ class PyloteBlogPost(models.Model): image = fields.Binary("Image de l'article", attachment=True) publication_home = fields.Boolean('Publication en home') document = fields.Binary("Document") - document_filename = fields.Char("Nom du document") \ No newline at end of file + document_filename = fields.Char("Nom du document") + document_bis = fields.Binary("Document 2") + document_filename_bis = fields.Char("Nom du document 2") + url_news = fields.Char('URL') \ No newline at end of file diff --git a/static/src/css/pylote.css b/static/src/css/pylote.css index 17c73701103bedb5b712ad3de4ba754747acd9cb..c8d25c9a2e85c3291cfeffcfc7a8e1f05be12d46 100644 --- a/static/src/css/pylote.css +++ b/static/src/css/pylote.css @@ -53,7 +53,7 @@ h2:after{ background-color: #56A099; display: block; margin: 20px auto; - margin-bottom: 50px; + } h3{ @@ -70,7 +70,7 @@ h5{ h6{ font-size: 21px; - font-weight: 700; + font-weight: 500; line-height: 31px; } @@ -85,7 +85,7 @@ h6{ background-color: #FFF; border: 2px solid #56A099; color: #56A099; - padding: 0px 20px; + padding: 3px 15px; border-radius: 100px; } @@ -112,6 +112,8 @@ li#menu-contact .btn-primary{ margin: 0.6rem 0rem; font-size: 13px; border-bottom: 2px solid #56A099; + text-align: center; + width: 82px; } .link-publi .btn-primary{ @@ -179,13 +181,23 @@ li#menu-contact .btn-primary{ /*Navigation*/ + +.navbar-collapse{ + height: -webkit-fill-available; + background-color: #fff; +} + +#wrapwrap .o_header_affix.affixed{ + background-color: #fff; +} + header .navbar-brand.logo .logo-mobile{ height: 60px; padding: 5px 15px; } .navbar-collapse{ - margin-top: 40px; + padding-top: 40px; } li.nav-item.active a{ @@ -257,7 +269,6 @@ div#wrap{ .navbar-light .navbar-nav .nav-link{ color: #56A099; font-weight: 400; - border-bottom: 3px solid transparent; } .navbar-light .navbar-nav .show > .nav-link, @@ -267,7 +278,6 @@ div#wrap{ .navbar-light .navbar-nav .nav-link:hover, .navbar-light .navbar-nav .nav-link:focus{ font-weight: 500; - border-bottom: 3px solid #56A099; color: #56A099; } @@ -326,7 +336,9 @@ div#wrap{ } li#menu-contact{ - padding: 0px; + padding: 0px 20px; + margin-top: 50px; + margin-bottom: 20px; } .page-submenu{ @@ -355,7 +367,11 @@ li#menu-contact{ border: none; border-top: 1px solid #fff; border-bottom: 1px solid #fff; - padding: 10px; + padding: 5px; +} + +.mentions-border br{ + display: none; } .contact-btn{ @@ -370,6 +386,8 @@ footer, footer .btn-primary{ font-weight: 700; color: #56A099; border-color: #fff; + background-color: #FFF; + padding: 3px 15px; } #footer .btn-primary:hover{ @@ -583,6 +601,7 @@ form label{ height: 100%; max-width: 650px; display: flex; + padding: 0px 15px; /*justify-content: flex-end;*/ flex-direction: column; } @@ -599,7 +618,7 @@ form label{ } .home-header-title h1{ - font-weight: 700; + font-weight: 400; } .home-header-title p{ @@ -612,6 +631,10 @@ form label{ justify-content: space-between; } +.home-bloc a{ + height: 400px; +} + .home-bloc{ padding: 0px; background-color: #fff; @@ -633,7 +656,7 @@ form label{ .home-bloc p span{ font-size: 18px; text-transform: uppercase; - font-weight: 700; + font-weight: 500; } hr{ @@ -643,11 +666,33 @@ hr{ margin-top: 0; } +.trait-title{ + display: none; + border-bottom: 1px solid #56A099; + /*width: 70px;*/ + /*padding: 0;*/ + /*margin-top: 0;*/ +} + +.circle-top{ + height: 170px; + display: flex; + align-items: center; +} + +.circle-home-text{ + display: flex; + flex-direction: column; + align-items: center; + height: 230px; +} + .circle-home-border h4, .circle-home-border h6, .circle-home-border p, .circle-home-mobile p, .circle-home p, .circle-home h4, .circle-home h6, .circle-home-mobile p, .circle-home p{ text-transform: uppercase; margin: 0; text-align: center; + letter-spacing: 2px; } .circle-home-border h6{ @@ -660,7 +705,7 @@ hr{ } .circle-home-border-mobil p{ - font-size: 12px; + font-size: 13px; } .circle-home-border{ @@ -718,7 +763,7 @@ hr{ text-transform: uppercase; font-size: 15px; line-height: 10px; - font-weight: 900; + font-weight: 700; } #cleaner .circle-home{ @@ -841,7 +886,7 @@ h2 span{ } .content-post{ - padding: 0px 0px 0px 50px; + padding: 0px; width: 600px; max-width: 600px; } @@ -920,6 +965,43 @@ h2 span{ } /*Page Blog*/ +.pagination-custom{ + justify-content: center; + align-items: center; + color: #56A099; +} + +.page-link { + padding: 0.5rem 0.75rem; + margin-left: -1px; + line-height: 26px; + color: #56A099; + background-color: transparent; + border: 0px solid #dee2e6; + font-size: 16px; +} + +.page-link:hover { + color: #56A099; + background-color: transparent; + border-color: transparent; + font-weight: 700; + font-size: 20px; +} + +.page-link:focus { + box-shadow: 0 0 0 0.2rem rgba(0, 160, 157, 0); +} + +.page-item.active .page-link { + z-index: 1; + color: #56A099; + background-color: transparent; + border-color: transparent; + font-weight: 700; + font-size: 20px; +} + .blogpost-body img{ width: 100%; } @@ -1008,13 +1090,14 @@ h2 span{ } #our-mission h3{ + font-size: 30px; font-weight: 300; } #our-mission h3:after{ content: ''; width: 200px; - height: 0.5px; + height: 1px; background-color: #56A099; display: block; margin: 0 auto; @@ -1038,18 +1121,20 @@ h2 span{ } .bloc-part li::before { - content: "•"; color: #56A099; + content: "•"; display: inline-block; - width: 15px; - font-size: 30px; + width: 1em; + font-weight: 900; + margin-left: 0px; + font-size: 15px; } .bloc-part li{ - margin: 0 auto; + /*margin: 0 auto; display: flex; justify-content: center; - flex-direction: row; + flex-direction: row;*/ } .on-environment-banner{ @@ -1086,15 +1171,14 @@ h2 span{ height: 260px; font-weight: 400; width: 330px; - padding: 30px 35px; + padding: 15px; display: flex; flex-direction: column; - justify-content: center; margin: 5px; } .env-bloc h3, .level-subbloc h3, #on-accompaniment h3{ - font-weight: 900; + font-weight: 500; text-transform: uppercase; padding: 5px 0px; } @@ -1110,7 +1194,7 @@ h2 span{ .env-bloc h3:after{ content: ''; - height: 0.5px; + height: 1px; background-color: #56A099; display: block; margin: 18px auto; @@ -1118,11 +1202,11 @@ h2 span{ .level-subbloc h3:after{ content: ''; - height: 0.5px; + height: 1px; width: 100px; background-color: #56A099; display: block; - margin: 16px 0px; + margin: 18px 0px; } .level-subbloc{ @@ -1180,8 +1264,11 @@ h2 span{ .img-complance img { padding: 20px; - height: 120px; + height: auto; width: auto; + padding: 20px; + width: auto; + max-width: 160px; } #our-recognition .img-complance img { @@ -1214,7 +1301,7 @@ h2 span{ #on-accompaniment h3:after{ content: ''; width: 350px; - height: 0.5px; + height: 1px; background-color: #56A099; display: block; margin: 10px auto; @@ -1252,13 +1339,19 @@ h2.o_default_snippet_text:after{ color: #56A099; } */ + +.carousel-right-inner-border{ + border-bottom: 1px solid #56A099; + padding-bottom: 20px; +} + .carousel-right-inner p, .link-bottom p{ font-weight: 700; } .carousel-right-inner .circle-home-border{ - width: 80px; - height: 80px; + width: 85px; + height: 85px; margin: 0; } @@ -1344,6 +1437,7 @@ h2.o_default_snippet_text:after{ .link-bottom p{ display: inline-block; margin-right: 10px; + text-transform: uppercase; } .link-bottom a { diff --git a/static/src/css/pylote_mobil.css b/static/src/css/pylote_mobil.css index f3e4bf0f519acf49c6de16ec376c18b3d076d5d2..333755834e74a68ebbd038478df9ea10e56bea26 100644 --- a/static/src/css/pylote_mobil.css +++ b/static/src/css/pylote_mobil.css @@ -14,8 +14,33 @@ font-size: 26px; } - .navbar-collapse{ + + .home-header-title { + padding: 0px ; + } + + li#menu-contact .btn-primary{ + text-align: inherit; + width: inherit; + } + + li#menu-contact{ + padding: 0; margin-top: 0; + margin-bottom: 0; + } + + .navbar-collapse{ + padding-top: 0; + } + + .navbar-collapse{ + height: inherit; + background-color: inherit; + } + + #wrapwrap .o_header_affix.affixed{ + background-color: inherit; } @@ -33,6 +58,12 @@ margin-top: 15px; } + .img-complance img { + height: 120px; + width: auto; + max-width: inherit; + } + div#wrap{ margin-top: 130px; } @@ -64,9 +95,15 @@ .mentions-border { text-align: left; border: none; + padding: 0px 30px; border-left: 1px solid #fff; } + .mentions-border br{ + display: block; + } + + .bloc-part li{ justify-content: inherit; } @@ -110,7 +147,7 @@ .home-bloc{ border: 1px solid #E7F1FC; - height: 390px; + height: 400px; width: 329px; padding: 0px 10px; } @@ -216,7 +253,7 @@ } #cleaner h2{ - text-align: left; + text-align: center; font-size: 31px; line-height: 37px; } @@ -226,9 +263,11 @@ height: 190px; } + #cleaner .circle-home-border h1{ font-size: 29px; line-height: 17px; + letter-spacing: 3px; } .carousel-text-right-inner{ @@ -261,7 +300,7 @@ .circle-home-border p.o_default_snippet_text{ - font-size: 16px; + font-size: 15px; } @@ -298,12 +337,28 @@ font-size: 30px; } + .content-post{ + padding: 0px 0px 0px 50px; + } + + .env-bloc{ + padding: 30px 35px; + } + } @media (min-width: 992px) { .on-environment-banner .d-flex{ justify-content: space-between; } + + .trait-title{ + display: block; + } + + #cleaner h2{ + text-align: left; + } } @media (min-width: 1200px) { .on-environment-banner .d-flex{ diff --git a/static/src/img/._greener-img-graph.png b/static/src/img/._greener-img-graph.png index 301d3868e3bada7c7b40ad58d31bf391cae39649..33e010031be329b0845527099c55faf99bbc93fb 100644 Binary files a/static/src/img/._greener-img-graph.png and b/static/src/img/._greener-img-graph.png differ diff --git a/static/src/img/._safer-img-graph.png b/static/src/img/._safer-img-graph.png index 33e010031be329b0845527099c55faf99bbc93fb..f0d7eb694d1132676ea8d0d7cc20ed19f9642e4c 100644 Binary files a/static/src/img/._safer-img-graph.png and b/static/src/img/._safer-img-graph.png differ diff --git a/static/src/img/cleaner-img2.png b/static/src/img/cleaner-img2.png index 181136a80f6a2fc68df0e2db42d38781eb404c1f..e1298c896caffe6a6f67dda5f5866de99fcfa384 100644 Binary files a/static/src/img/cleaner-img2.png and b/static/src/img/cleaner-img2.png differ diff --git a/static/src/img/greener-img-graph.png b/static/src/img/greener-img-graph.png index 102e9ed68ff50fbc47f5d0eb591ef1ad9083448d..b2623dd4cf552e620f22a71fc584d921472d36a8 100644 Binary files a/static/src/img/greener-img-graph.png and b/static/src/img/greener-img-graph.png differ diff --git a/static/src/img/safer-img-graph.png b/static/src/img/safer-img-graph.png index dfad9dad291804c291d66bda2b65e54fcf9937ce..1993ec855455e3a0ff69c27996b8b6b356aff45f 100644 Binary files a/static/src/img/safer-img-graph.png and b/static/src/img/safer-img-graph.png differ diff --git a/static/src/js/script_to_top.js b/static/src/js/script_to_top.js index 0fc59e460c1f699afc7f670ba47f31eb3a07b160..7ea50ca6e9d8802ac1c3bc45c17dcd218fb0e3bc 100644 --- a/static/src/js/script_to_top.js +++ b/static/src/js/script_to_top.js @@ -3,6 +3,10 @@ odoo.define('pylote_website.scroll_totop', function (require) { $(document).ready(function () { + $( '#navbar-toggler' ).on( 'click', function () { + $("#logo-mobile").attr('style','display: none'); + }); + $( '#myNavbar a' ).on( 'click', function () { $( '#myNavbar' ).find( 'li.active' ).removeClass( 'active' ); $( this ).parent( 'li' ).addClass( 'active' ); diff --git a/views/footer.xml b/views/footer.xml index 65bf3b42ed995ea23bf20ec617b78d4f675404d1..1d06cb60edfb1bc6b5a6858271764cf2b3debe98 100644 --- a/views/footer.xml +++ b/views/footer.xml @@ -14,7 +14,8 @@ <t t-esc="res_company.city"/> - <t t-esc="res_company.country_id.name"/> </div> - <div class="col-md-4 mentions-border pt-sm-3 pt-md-3 pb-sm-3 pb-md-0" > + <div class="col-md-4 mentions-border pb-sm-3 pb-md-2" > + <br/> <a href="/terms-of-use">Terms of use</a> </div> <div class="col-md-4 contact-btn pt-3"> diff --git a/views/home.xml b/views/home.xml index ea6de9693304df87b1c27747939fd301ae02d534..ac3fa512bc6bdd4bd36ddc8525133b91668db676 100644 --- a/views/home.xml +++ b/views/home.xml @@ -7,8 +7,8 @@ <div class="home-banner"> <img src="/pylote_website/static/src/img/etoile-picto-home.png" class="d-none d-sm-block-pylote img-absolute img img-responsive" /> <img src="/pylote_website/static/src/img/etoile-mobile-home.png" class="d-block d-sm-none-pylote img-absolute img img-responsive" /> - <div class="container"> - <div class="home-header-title pt-5 pb-3"> + <div class="container pt-5 pb-5"> + <div class="home-header-title"> <h1>The unique integrated <br/>natural protection</h1> <p>We manufacture in-house proprietary natural mineral microspheres. Integrated into everyday products, they improve our lives and protect the people & the planet.</p> </div> @@ -17,31 +17,43 @@ <div class="d-flex"> <div class="home-bloc"> <a id="cleaner-home" href="#"> - <div class="circle-home-border"> - <h6>Cleaner</h6> + <div class="circle-top"> + <div class="circle-home-border"> + <h6>Cleaner</h6> + </div> + </div> + <div class="circle-home-text"> + <p class="mt-3">We maintain <br/>microbiological hygiene</p><hr/> + <p><span>Find out more on <br/>our natural <br/>hygienic solutions</span></p> </div> - <p class="mt-3">We maintain <br/>microbiological hygiene</p><hr/> - <p><span>Find out more on <br/>our natural <br/>hygienic solutions</span></p> </a> </div> <div class="home-bloc"> <a id="safer-home" href="#"> - <div class="circle-home-border"> - <h6>Safer</h6> + <div class="circle-top"> + <div class="circle-home-border"> + <h6>Safer</h6> + </div> + </div> + <div class="circle-home-text"> + <p class="mt-3">We secure your products <br/>throughout their lifecycle</p><hr/> + <p><span>Find out more <br/>on our health <br/>and safety solutions</span></p> </div> - <p class="mt-3">We secure your products <br/>throughout their lifecycle</p><hr/> - <p><span>Find out more <br/>on our health <br/>and safety solutions</span></p> </a> </div> <div class="home-bloc"> <a id="greener-home" href="#"> - <div class="circle-home-border"> - <h6>Greener</h6> + <div class="circle-top"> + <div class="circle-home-border"> + <h6>Greener</h6> + </div> + </div> + <div class="circle-home-text"> + <p class="mt-3">We reduce <br/>the ecological footprint</p><hr/> + <p><span>Find out more <br/>on the positive environmental <br/>impact of our technology</span></p> </div> - <p class="mt-3">We reduce <br/>the ecological footprint</p><hr/> - <p><span>Find out more <br/>on our technology environmental <br/>impact technology</span></p> </a> </div> </div> @@ -286,13 +298,14 @@ <div class="container-modal" id="container-modal-cleaner"> <div id="cleaner" class="pt-5 pb-5"> <div class="container"> - <div class="circle-home-border"> + <div class="circle-home-border mb-5"> <h1><a id="modal-close-cleaner" href="#">Cleaner</a></h1> </div> <div class="row pt-5 pb-4"> <div class="col"> <h2>Application in Pharma <span>(eye-dropper)</span></h2> </div> + <div class="col trait-title"></div> </div> </div> <div class="banner-cleaner"> @@ -319,8 +332,11 @@ </div> </div> </div> - <div class="flex-trait-cleaner pt-5 pb-4"> - <h2>Application in Cosmetics <span>(make-up sponge)</span></h2> + <div class="row pt-5 pb-4 mt-5"> + <div class="col-md-7"> + <h2>Application in Cosmetics <span>(make-up sponge)</span></h2> + </div> + <div class="col trait-title"></div> </div> </div> <div class="banner-cleaner-second"> @@ -347,8 +363,11 @@ </div> </div> </div> - <div class="flex-trait-cleaner pt-5 pb-4"> - <h2>Application in cleanrooms environment <br/><span>(public or industrial places)</span></h2> + <div class="row pt-5 pb-4 mt-5"> + <div class="col-md-7"> + <h2>Application in cleanrooms environment <br/><span>(public or industrial places)</span></h2> + </div> + <div class="col trait-title"></div> </div> </div> <div class="banner-cleaner-third "> @@ -388,13 +407,14 @@ <div class="container-modal" id="container-modal-safer"> <div id="cleaner" class="pt-5 pb-5"> <div class="container"> - <div class="circle-home-border"> + <div class="circle-home-border mb-5"> <h1><a id="modal-close-safer" href="#">Safer</a></h1> </div> <div class="row pt-5 pb-4"> <div class="col"> <h2>Application in Pharma <span>(eye-dropper)</span></h2> </div> + <div class="col trait-title"></div> </div> </div> <div class="banner-safer"> @@ -426,19 +446,19 @@ </div> </div> - <!-- Cleaner Modal --> + <!-- Greener Modal --> <div id="modal-greener" class="o_hidden"> <div class="container-modal" id="container-modal-greener"> <div id="cleaner" class="pt-5 pb-5"> <div class="container"> - <div class="circle-home-border"> + <div class="circle-home-border mb-5"> <h1><a id="modal-close-greener" href="#">Greener</a></h1> </div> <div class="row pt-5 pb-4"> <div class="col"> <h2>Application in Pharma <span>(eye-dropper)</span></h2> </div> - + <div class="col trait-title"></div> </div> </div> <div class="banner-greener"> diff --git a/views/menu.xml b/views/menu.xml index 51bdd3106b0e94ee50d6c6616af678da006a9577..71f6e76fb58254da5deacab2940483487c8aca36 100644 --- a/views/menu.xml +++ b/views/menu.xml @@ -2,7 +2,7 @@ <odoo> <template id="custom_navbar" name="Custom nav-bar" customize_show="True" inherit_id="website.layout"> - + <!-- <xpath expr="//div[@class='collapse navbar-collapse']" position="before"> <t t-call="website.language_selector"/> </xpath> --> @@ -18,13 +18,15 @@ </a> </li> </xpath> + + <xpath expr="//header" position="attributes"> <attribute name="t-attf-class" add="#{'o_header_affix affix affixed'}" separator=" "/> </xpath> <xpath expr="//a[@class='navbar-brand logo']" position="replace"> <a href="/" class="navbar-brand logo"> - <img class="logo-mobile d-block d-sm-none-pylote" src="/pylote_website/static/src/img/logo-pylote-sans-text.png" t-att-alt="'Logo of %s' % res_company.name" t-att-title="res_company.name"/> + <img id="logo-mobile" class="logo-mobile d-block d-sm-none-pylote" src="/pylote_website/static/src/img/logo-pylote-sans-text.png" t-att-alt="'Logo of %s' % res_company.name" t-att-title="res_company.name"/> <img class="d-none d-sm-block-pylote" t-att-src="'/logo.png?company=%s' % res_company.id" t-att-alt="'Logo of %s' % res_company.name" t-att-title="res_company.name"/> </a> </xpath> diff --git a/views/page_our_commitments.xml b/views/page_our_commitments.xml index 72cc675ab56ad2041f3a96dad975aa115f2b3386..64ca9800b5a545af971566544cb4a088eb7142a3 100644 --- a/views/page_our_commitments.xml +++ b/views/page_our_commitments.xml @@ -71,7 +71,7 @@ <div class=" pt-5 pb-5"> <h2>On regulatory compliance</h2> <div class="row"> - <div class="col-md-12 "> + <div class="col-md-12 pt-5 pb-5"> <p><span>Compliance on several market segments and territories :</span> <br/>Pharma, cosmetic, food, aeronautic & industry</p> </div> <div class="col"></div> diff --git a/views/page_our_differenciation.xml b/views/page_our_differenciation.xml index e91eeaa08aeec3009e1872becfa9bcddf9bebdbe..5c30ac92ea201d57b540e5e9ec87e1e411e0eef2 100644 --- a/views/page_our_differenciation.xml +++ b/views/page_our_differenciation.xml @@ -42,9 +42,9 @@ <h2>Our mission, vision, values</h2> <div class="row "> <div class="col-md-6 mission-flex"> - <div class="d-flex mb64"> + <div class="d-flex mb64 pr-md-5 pr-sm-0"> <img src="/pylote_website/static/src/img/etoile-picto.png" class="img img-responsive" /> - <div class="ml-md-3 ml-sm-0 mb-5 mt-4"> + <div class="ml-md-3 ml-sm-0 mb-md-5 mb-sm-0 mt-4 pr-md-5 pr-sm-0"> <h3>Our mission</h3> <p>Develop and deliver cleaner, safer and greener innovative solutions to worldwide consumers that offer natural protection and contribute to a better life.</p> </div> @@ -72,7 +72,7 @@ <div class="col-md-5 mt128"> <div class="d-flex"> <img src="/pylote_website/static/src/img/etoile-picto.png" class="img img-responsive" /> - <div class="ml-md-3 ml-sm-0 mb-5 mt-4"> + <div class="ml-md-3 ml-sm-0 mb-md-5 mb-sm-0 mt-4"> <h3>Our vision</h3> <p>The growing awareness of global health and environmental issues requires a quick implementation of responsible solutions. At Pylote, we are committed to contribute to a better life and a better world by continuously developing and delivering cleaner, safer and greener innovative solutions to worldwide consumers, without changing anything in the existing industrial process.</p> </div> @@ -102,11 +102,11 @@ </g> </svg> </div> - <div id="our-techno" class="bloc-part mt64"> + <div id="our-techno" class="bloc-part"> <div class="container"> <div class="pt-5 pb-5"> <h2>Our innovative technology</h2> - <div class="row text-left mb64"> + <div class="row text-left "> <div class="d-none d-sm-block-pylote col-md-6"> <p><span>A world-first patented natural protection solution to avoid bacterial and viral contamination, based on a unique clean technology, patented & proprietary</span></p> </div> diff --git a/views/snippets.xml b/views/snippets.xml index 835b853e132117c34eb576d74e6ff3db51995ecf..410f9db9045d01e6d4c15d24fb62f8fc343a57c3 100644 --- a/views/snippets.xml +++ b/views/snippets.xml @@ -3,7 +3,12 @@ <template id="s_products" name="Product Case"> <div class="container"> - <h2>Product case. <span>Antimicrobial solution</span></h2> + <div class="row pt-md-5 pt-sm-0 pb-md-4 pb-sm-0"> + <div class="col"> + <h2>Product case. <span>Antimicrobial solution</span></h2> + </div> + <div class="col trait-title"></div> + </div> </div> <div id="myCarousel" class="container s_carousel s_carousel_default carousel slide" data-interval="10000"> <!-- Content --> @@ -17,7 +22,7 @@ </div> <div class="carousel-content col-lg-7"> <div class="carousel-right"> - <div class="carousel-right-inner"> + <div class="carousel-right-inner-border carousel-right-inner"> <div class="circle-home-border"> <p>Cleaner</p> </div> @@ -25,7 +30,7 @@ <p>We maintain microbiological hygiene until the use</p> </div> </div> - <div class="carousel-right-inner"> + <div class="carousel-right-inner-border carousel-right-inner"> <div class="circle-home-border"> <p>Safer</p> </div> @@ -79,7 +84,12 @@ <template id="s_partnership" name="Partnership stories"> <div class="container"> - <h2>Partnership stories</h2> + <div class="row pt-md-5 pt-sm-0 pb-md-4 pb-sm-0"> + <div class="col"> + <h2>Partnership stories</h2> + </div> + <div class="col trait-title"></div> + </div> </div> <div id="myCarousel" class="pb-5 container s_carousel s_carousel_default carousel slide" data-interval="10000"> <!-- Content --> diff --git a/views/website_blog_template.xml b/views/website_blog_template.xml index 9665dfda401576bc2b09cdc17147594f3784c3e3..2f5ff29b10f18a259ca6df2313099a3176bc7639 100644 --- a/views/website_blog_template.xml +++ b/views/website_blog_template.xml @@ -117,16 +117,7 @@ </div> </xpath> <xpath expr="//section[@class='mb0']" position="replace"> - <div class="page-intro"> - <div class="container"> - <div class="row"> - <t t-call="website.pager"> - <t t-set="classname">pull-right</t> - </t> - - </div> - </div> - </div> + </xpath> <xpath expr="//div[@id='main_column']" position="replace"> <div class="col-md-12 " id="main_column"> @@ -145,7 +136,7 @@ </div> </div> - <div class="container pt-sm-0 pt-md-5 pb-5"> + <div class="container pt-sm-0 pt-md-5 pb-5 mb-5"> <div name='blog_post' t-foreach="blog_posts" t-as="blog_post" class="clearfix blogpost pt-5" data-effect-delay="200"> <div class="row content"> @@ -213,6 +204,26 @@ </g> </svg> </a> </t> + <t t-if="blog_post.document_bis"> + <a target="_blank" t-attf-href="/web/binary/download_pdf_bis/{{ blog_post.id }}"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24.793" height="24.793" viewBox="0 0 24.793 24.793"> + <defs> + <clipPath id="clip-path"> + <rect width="24.793" height="24.793" fill="none"/> + </clipPath> + <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox"> + <stop offset="0" stop-color="#56a099"/> + <stop offset="1" stop-color="#56a099"/> + </linearGradient> + </defs> + <g id="Composant_8_2" data-name="Composant 8 – 2" clip-path="url(#clip-path)"> + <circle id="Ellipse_52" data-name="Ellipse 52" cx="12.396" cy="12.396" r="12.396" fill="url(#linear-gradient)"/> + <g id="Groupe_170" data-name="Groupe 170" transform="translate(5.815 6.258)"> + <path id="Tracé_226" data-name="Tracé 226" d="M141.722-4.715v-.472a.9.9,0,0,0-.9-.9.9.9,0,0,0-.9.9V.807l-.65-.655a.559.559,0,0,0-.37-.162h-1.946c-.074,0-.345.024-.083.288h0l3.545,3.573a.563.563,0,0,0,.838-.02L144.573.58h0c.586-.577-.042-.589-.042-.589h-1.488a.914.914,0,0,0-.615.183l-.041.04h0l-.665.654V-4.715Z" transform="translate(-134.334 6.136)" fill="#fff"/> + <path id="Tracé_227" data-name="Tracé 227" d="M133.484,6.673H121.3a.458.458,0,0,1-.458-.458V-5.975a.458.458,0,0,1,.458-.458h3.959a.458.458,0,0,1,.458.458.458.458,0,0,1-.458.458h-3.5V5.756h11.272V-5.516h-3.5a.458.458,0,0,1-.458-.458.458.458,0,0,1,.458-.458h3.959a.458.458,0,0,1,.458.458V6.214A.458.458,0,0,1,133.484,6.673Z" transform="translate(-120.837 6.433)" fill="#fff"/> + </g> + </g> + </svg> </a> + </t> </div> </footer> </div> @@ -223,6 +234,17 @@ </div> </div> <div class="col"></div> + <div class="container mb-5"> + <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination pagination-custom #{_classes}" t-att-style="style or None"> + <t t-foreach="pager['pages']" t-as="page"> + <t t-if="page_first"> + + </t> + <t t-else=""> - </t> + <li t-attf-class="page-item #{'active' if page['num'] == pager['page']['num'] else ''}"> <a t-att-href="page['url']" class="page-link" t-raw="page['num']"></a></li> + </t> + </ul> + </div> </xpath> </template> @@ -269,29 +291,63 @@ </div> </xpath> <xpath expr="//div[@id='blog_content']" position="after"> - <t t-if="blog_post.document"> - <div class="container pt-5 pb-5"> - <a target="_blank" t-attf-href="/web/binary/download_pdf/{{ blog_post.id }}"><t t-esc="blog_post.document_filename"/> - <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24.793" height="24.793" viewBox="0 0 24.793 24.793"> - <defs> - <clipPath id="clip-path"> - <rect width="24.793" height="24.793" fill="none"/> - </clipPath> - <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox"> - <stop offset="0" stop-color="#56a099"/> - <stop offset="1" stop-color="#56a099"/> - </linearGradient> - </defs> - <g id="Composant_8_2" data-name="Composant 8 – 2" clip-path="url(#clip-path)"> - <circle id="Ellipse_52" data-name="Ellipse 52" cx="12.396" cy="12.396" r="12.396" fill="url(#linear-gradient)"/> - <g id="Groupe_170" data-name="Groupe 170" transform="translate(5.815 6.258)"> - <path id="Tracé_226" data-name="Tracé 226" d="M141.722-4.715v-.472a.9.9,0,0,0-.9-.9.9.9,0,0,0-.9.9V.807l-.65-.655a.559.559,0,0,0-.37-.162h-1.946c-.074,0-.345.024-.083.288h0l3.545,3.573a.563.563,0,0,0,.838-.02L144.573.58h0c.586-.577-.042-.589-.042-.589h-1.488a.914.914,0,0,0-.615.183l-.041.04h0l-.665.654V-4.715Z" transform="translate(-134.334 6.136)" fill="#fff"/> - <path id="Tracé_227" data-name="Tracé 227" d="M133.484,6.673H121.3a.458.458,0,0,1-.458-.458V-5.975a.458.458,0,0,1,.458-.458h3.959a.458.458,0,0,1,.458.458.458.458,0,0,1-.458.458h-3.5V5.756h11.272V-5.516h-3.5a.458.458,0,0,1-.458-.458.458.458,0,0,1,.458-.458h3.959a.458.458,0,0,1,.458.458V6.214A.458.458,0,0,1,133.484,6.673Z" transform="translate(-120.837 6.433)" fill="#fff"/> - </g> - </g> - </svg></a> - </div> - </t> + <div class="container pt-5 pb-5"> + <t t-if="blog_post.document"> + <p> + <a target="_blank" t-attf-href="/web/binary/download_pdf/{{ blog_post.id }}"><t t-esc="blog_post.document_filename"/> + <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24.793" height="24.793" viewBox="0 0 24.793 24.793"> + <defs> + <clipPath id="clip-path"> + <rect width="24.793" height="24.793" fill="none"/> + </clipPath> + <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox"> + <stop offset="0" stop-color="#56a099"/> + <stop offset="1" stop-color="#56a099"/> + </linearGradient> + </defs> + <g id="Composant_8_2" data-name="Composant 8 – 2" clip-path="url(#clip-path)"> + <circle id="Ellipse_52" data-name="Ellipse 52" cx="12.396" cy="12.396" r="12.396" fill="url(#linear-gradient)"/> + <g id="Groupe_170" data-name="Groupe 170" transform="translate(5.815 6.258)"> + <path id="Tracé_226" data-name="Tracé 226" d="M141.722-4.715v-.472a.9.9,0,0,0-.9-.9.9.9,0,0,0-.9.9V.807l-.65-.655a.559.559,0,0,0-.37-.162h-1.946c-.074,0-.345.024-.083.288h0l3.545,3.573a.563.563,0,0,0,.838-.02L144.573.58h0c.586-.577-.042-.589-.042-.589h-1.488a.914.914,0,0,0-.615.183l-.041.04h0l-.665.654V-4.715Z" transform="translate(-134.334 6.136)" fill="#fff"/> + <path id="Tracé_227" data-name="Tracé 227" d="M133.484,6.673H121.3a.458.458,0,0,1-.458-.458V-5.975a.458.458,0,0,1,.458-.458h3.959a.458.458,0,0,1,.458.458.458.458,0,0,1-.458.458h-3.5V5.756h11.272V-5.516h-3.5a.458.458,0,0,1-.458-.458.458.458,0,0,1,.458-.458h3.959a.458.458,0,0,1,.458.458V6.214A.458.458,0,0,1,133.484,6.673Z" transform="translate(-120.837 6.433)" fill="#fff"/> + </g> + </g> + </svg> + </a> + </p> + </t> + <t t-if="blog_post.document_bis"> + <p> + <a target="_blank" t-attf-href="/web/binary/download_pdf_bis/{{ blog_post.id }}"><t t-esc="blog_post.document_filename_bis"/> + <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24.793" height="24.793" viewBox="0 0 24.793 24.793"> + <defs> + <clipPath id="clip-path"> + <rect width="24.793" height="24.793" fill="none"/> + </clipPath> + <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox"> + <stop offset="0" stop-color="#56a099"/> + <stop offset="1" stop-color="#56a099"/> + </linearGradient> + </defs> + <g id="Composant_8_2" data-name="Composant 8 – 2" clip-path="url(#clip-path)"> + <circle id="Ellipse_52" data-name="Ellipse 52" cx="12.396" cy="12.396" r="12.396" fill="url(#linear-gradient)"/> + <g id="Groupe_170" data-name="Groupe 170" transform="translate(5.815 6.258)"> + <path id="Tracé_226" data-name="Tracé 226" d="M141.722-4.715v-.472a.9.9,0,0,0-.9-.9.9.9,0,0,0-.9.9V.807l-.65-.655a.559.559,0,0,0-.37-.162h-1.946c-.074,0-.345.024-.083.288h0l3.545,3.573a.563.563,0,0,0,.838-.02L144.573.58h0c.586-.577-.042-.589-.042-.589h-1.488a.914.914,0,0,0-.615.183l-.041.04h0l-.665.654V-4.715Z" transform="translate(-134.334 6.136)" fill="#fff"/> + <path id="Tracé_227" data-name="Tracé 227" d="M133.484,6.673H121.3a.458.458,0,0,1-.458-.458V-5.975a.458.458,0,0,1,.458-.458h3.959a.458.458,0,0,1,.458.458.458.458,0,0,1-.458.458h-3.5V5.756h11.272V-5.516h-3.5a.458.458,0,0,1-.458-.458.458.458,0,0,1,.458-.458h3.959a.458.458,0,0,1,.458.458V6.214A.458.458,0,0,1,133.484,6.673Z" transform="translate(-120.837 6.433)" fill="#fff"/> + </g> + </g> + </svg> + </a> + </p> + </t> + <t t-if="blog_post.url_news"> + <p> + <a target="_blank" t-attf-href="{{blog_post.url_news}}"> + <t t-esc="blog_post.url_news"/> + </a> + </p> + </t> + </div> </xpath> <xpath expr="//div[@class='o_blog_post_complete o_sharing_links']" position="replace"> </xpath> diff --git a/views/website_blog_views.xml b/views/website_blog_views.xml index 975f8963dd1af5b75f0a96e047881365a31aac7c..770655a5eb2f1db8f4911e802b45cfc4eac69df0 100644 --- a/views/website_blog_views.xml +++ b/views/website_blog_views.xml @@ -12,6 +12,9 @@ <xpath expr="//field[@name='website_id']" position="after"> <field name="document_filename" invisible="1"/> <field widget="binary" name="document" filename="document_filename"/> + <field name="document_filename_bis" invisible="1"/> + <field widget="binary" name="document_bis" filename="document_filename_bis"/> + <field name="url_news" widget="url"/> <field name="content"/> </xpath> </field>