From e60323f87665e08d4cb0bd099dd0ee0fd1630114 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 8 Aug 2019 10:33:22 +0000
Subject: [PATCH] [IMP] website, *: improve brand promotion in the footer

* web, website_event, website_sale, sale_quotation_builder

Instead of an ugly danger-colored badge promoting "odoo", we now use
the official odoo logo. The code is also refactored to use more
consistent and translatable sentences without duplicated code.

Note: the odoo logo is added in the repo, downloaded from our official
brand assets page (https://www.odoo.com/page/brand-assets), in its
'tiny' version. The repo already contained multiple odoo logos but they
are quite old and should be replaced in a further update. Note: the svg
version was not able to be used as it contains external margins...

Part of https://github.com/odoo/odoo/pull/34422
task-2026299
---
 .../views/sale_portal_templates.xml           |  12 +++++++-----
 addons/web/static/src/img/odoo_logo_tiny.png  | Bin 0 -> 1168 bytes
 addons/web/views/webclient_templates.xml      |  18 +++++++++++++++++-
 addons/website/views/website_templates.xml    |  12 +++++++-----
 .../website_event/views/event_templates.xml   |  10 ----------
 addons/website_sale/views/templates.xml       |  12 +++++++-----
 6 files changed, 38 insertions(+), 26 deletions(-)
 create mode 100644 addons/web/static/src/img/odoo_logo_tiny.png

diff --git a/addons/sale_quotation_builder/views/sale_portal_templates.xml b/addons/sale_quotation_builder/views/sale_portal_templates.xml
index 2b3bbe19ce4..4c5b2f6dc95 100644
--- a/addons/sale_quotation_builder/views/sale_portal_templates.xml
+++ b/addons/sale_quotation_builder/views/sale_portal_templates.xml
@@ -83,11 +83,13 @@
     </template>
 
     <template id="brand_promotion" inherit_id="website.brand_promotion">
-        <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
-            <div class="o_brand_promotion">
-                Powered by <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
-                an awesome <a target="_blank" href="http://www.odoo.com/page/crm">Open Source CRM</a>.
-            </div>
+        <xpath expr="//t[@t-call='web.brand_promotion_message']" position="replace">
+            <t t-call="web.brand_promotion_message">
+                <t t-set="_message">
+                    An awesome <a target="_blank" href="https://www.odoo.com/page/crm?utm_source=db&amp;utm_medium=portal">Open Source CRM</a>
+                </t>
+                <t t-set="_utm_medium">portal</t>
+            </t>
         </xpath>
     </template>
 
diff --git a/addons/web/static/src/img/odoo_logo_tiny.png b/addons/web/static/src/img/odoo_logo_tiny.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fd3895e662985ed01ac7a605c56f5e3c8d91732
GIT binary patch
literal 1168
zcmV;B1aJF^P)<h;3K|Lk000e1NJLTq002G!000yS1^@s6)%K1Q000D6Nkl<ZcmeHK
z1F$Vg483dHF05_awlCJUapzWjKijr#zqM`Kws}s~biKUnXsth0sh;lSO!_pEOz5wC
z^7Hdo%F4>RFFQN??VOyPeM0}22V_qJ@t-Il-~N9hey$+iH=p=F<;gyK?rKS=TKgxR
z8b5(;T6D&$L9svm^wWYMwFBgY+}zwSWDmTr7L<5NNy#G6?F8FnfIT8FFK>%qGxx&6
z!W9@lZ2t#B*7gOZglFuW9JX#sJ~jR$NdIJneU4MFAacS>!eIiW-Xk$3KR{X_xth3~
zFvilM`_uvdCggH1ipOc%oZp0eukjeWmy6&COpe5_ObS~+NWxmEr=7+Y6&0-o2M^Op
zP?5wjsZG&;F#zsXW(Eh+QQ*H0;4^s|Fe#ik^Oq#!Z{nEW%vS4CBGwrOTUAxHI6nG-
z-eEX-3hnJ^Kl379P*AWs-d|I?uON5h{ZWS<yjAWzNFPdn%7&-zW?)}&@Ew=;`7=Wb
zNBYI2h_$y|81^}CY-mrM?f7an=>eVqgKceXT?k`WK=-8+alF@y@$VqBfLYYw%gf7G
zR5p~$&Gq6n5Z`<Y^Epb@4%>18r4Pi7jYG-d#7sf@qs-WxwVbX3$Ei2A#Bm(XUJ@Uj
zKyX{Y<qn>#iDS3dLHnZ^yTS?Uut0Cx-#lMnzXr+8T;k7iuz6MB%RoH-fFXmOy~Zo}
zQEzOCW5kqXxRPFY9#csia-P6H!;GLYa_8l-XSC-x#P>42d^5vLTR24Qj|~|{ZNI2*
zY>C5)Zzu1S7uG%<a~1Ja(XaHw%OlHF$2cPVAL~;tuO~MNfzA5DkV%Wp*wPD3y|E=u
z5q~wn#N&c!BP2`o3j!?M-Nv4I9_@3Yf3VMvuQH7|NIW%l)DvfWfvGpP#NoKDsqXD+
zJ`?W|wn>mHWUlqXGT<@V3;UfQlY)4{3(x2;u%F<LTe*VF3u)1`rJR5qr{35SXOnqW
z1`UrD-&x*K^!H*gk_)FJvN|oZgzcwHX|TUuUNvMB#|rbNn{HZ|e}%%fEtC?qHo<-U
zUfkW$lrv|nDS_;BT-bb1oK5^<wd=EWg+-DwSL6L56aDdilNf(rke4O!6--0IF5T1s
z=zlK!-vj&x4neV%db#M-F{P!b3hfg}UrN|YXNw5_snpY6*4A{W^6blydN|C1+@@02
zx0u|n25(2_FLa3sDS%Wl+AH0QEN{gTzD)W45;nsa&p_MB#Z>y*sa2gZV?h)p^(5sh
zu%o@olWV}iV*yIeZy={Q-2KA^c~{}7VR@_ZBpI+w9%iNKP_J7TfZV$-q~E39?G9E{
zR4juJ=W$0}9N&XU@2GKV=WlYt+9#%-N82NKovce#8O#_DSVg)<znf;vSQtlni`1}n
zcycsxGF$dJ9t!Yaa!bS6E=)I&6Zuz!cHL0GhnWKQ`|-DuxtYJUXqONAOUxn)n8ScS
i334Rfw}C9CZGQ%=DHt%w%*XBk0000<MNUMnLSTZ7@k7c0

literal 0
HcmV?d00001

diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 51aa1423584..1ed2df632f2 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -478,9 +478,25 @@
         </xpath>
     </template>
 
+    <template id="brand_promotion_message" name="Brand Promotion Message">
+        <t t-set="odoo_logo">
+            <a target="_blank"
+                t-attf-href="http://www.odoo.com?utm_source=db&amp;utm_medium=#{_utm_medium}"
+                class="badge badge-light">
+                <img alt="Odoo"
+                        src="/web/static/src/img/odoo_logo_tiny.png"
+                        style="height: 1em; vertical-align: baseline;"/>
+            </a>
+        </t>
+        <t t-set="final_message">Powered by %s%s</t>
+        <t t-raw="final_message % (odoo_logo, _message and ('- %s' % _message) or '')"/>
+    </template>
     <template id="brand_promotion" name="Brand Promotion">
         <div class="o_brand_promotion">
-            Powered by <a target="_blank" href="http://www.odoo.com?utm_source=db&amp;utm_medium=portal">Odoo</a>
+            <t t-call="web.brand_promotion_message">
+                <t t-set="_message"></t>
+                <t t-set="_utm_medium">portal</t>
+            </t>
         </div>
     </template>
 
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 3b9979c712b..566a4ad8244 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -291,11 +291,13 @@
 </template>
 
 <template id="brand_promotion" inherit_id="web.brand_promotion" name="Brand Promotion">
-    <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
-        <div class="o_brand_promotion">
-            Create a <a target="_blank" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">free website</a> with
-            <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">Odoo</a>
-        </div>
+    <xpath expr="//t[@t-call='web.brand_promotion_message']" position="replace">
+        <t t-call="web.brand_promotion_message">
+            <t t-set="_message">
+                Create a <a target="_blank" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">free website</a>
+            </t>
+            <t t-set="_utm_medium">website</t>
+        </t>
     </xpath>
 </template>
 
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index c040583e697..791ea18f465 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -718,16 +718,6 @@
     </t>
 </template>
 
-<template id="website_event.brand_promotion" inherit_id="website.brand_promotion">
-    <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
-        <div class="o_brand_promotion">
-            Powered by <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">Odoo</a>.
-            Try the <a target="_blank" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">open source website builder</a>.
-        </div>
-    </xpath>
-</template>
-
-
 <!-- User Navbar -->
 <template id="user_navbar_inherit_website_event" inherit_id="website.user_navbar">
     <xpath expr="//div[@id='o_new_content_menu_choices']//div[@name='module_website_event']" position="attributes">
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index ae50d527f21..083b07426df 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1644,11 +1644,13 @@
     </template>
 
     <template id="website_sale.brand_promotion" inherit_id="website.brand_promotion">
-        <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
-            <div class="o_brand_promotion">
-                Powered by <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">Odoo</a>,
-                the #1 <a target="_blank" href="http://www.odoo.com/page/e-commerce?utm_source=db&amp;utm_medium=website">Open Source eCommerce</a>.
-            </div>
+        <xpath expr="//t[@t-call='web.brand_promotion_message']" position="replace">
+            <t t-call="web.brand_promotion_message">
+                <t t-set="_message">
+                    The #1 <a target="_blank" href="http://www.odoo.com/page/e-commerce?utm_source=db&amp;utm_medium=website">Open Source eCommerce</a>
+                </t>
+                <t t-set="_utm_medium">website</t>
+            </t>
         </xpath>
     </template>