From fbaf666f6f20dde163cc55d11c0a5d5fd816b0ad Mon Sep 17 00:00:00 2001
From: Julien Banken <jbn@odoo.com>
Date: Tue, 7 Sep 2021 07:10:27 +0000
Subject: [PATCH] [IMP] portal,auth_signup: improve the invitation portal email

This commit will improve the wording and the layout of the invitation
email sent to the users getting access to the portal. The signup link of
the email will now be a button that emphasizes the call-to-action.
We will also provide in the email another link that will allow the user
to access the login page. This commit will also improve the wording of a
placeholder in the portal backend.

task-2573334

closes odoo/odoo#74210

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 .../auth_signup/data/mail_template_data.xml   |  2 +-
 addons/portal/data/mail_template_data.xml     | 26 +++++++++----------
 addons/portal/wizard/portal_wizard_views.xml  |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/auth_signup/data/mail_template_data.xml b/addons/auth_signup/data/mail_template_data.xml
index 6d81d4c40ef..cbd1c50f824 100644
--- a/addons/auth_signup/data/mail_template_data.xml
+++ b/addons/auth_signup/data/mail_template_data.xml
@@ -143,7 +143,7 @@
                         % set website_url = object.get_base_url()
                         Your Odoo domain is: <b><a href='${website_url}'>${website_url}</a></b><br />
                         Your sign in email is: <b><a href="/web/login?login=${object.email}" target="_blank">${object.email}</a></b><br /><br />
-                        Never heard of Odoo? It’s an all-in-one business software loved by 3+ million users. It will considerably improve your experience at work and increase your productivity.
+                        Never heard of Odoo? It’s an all-in-one business software loved by 7+ million users. It will considerably improve your experience at work and increase your productivity.
                         <br /><br />
                         Have a look at the <a href="https://www.odoo.com/page/tour?utm_source=db&amp;utm_medium=auth" style="color: #875A7B;">Odoo Tour</a> to discover the tool.
                         <br /><br />
diff --git a/addons/portal/data/mail_template_data.xml b/addons/portal/data/mail_template_data.xml
index 004d917b33b..400ad7fa61c 100644
--- a/addons/portal/data/mail_template_data.xml
+++ b/addons/portal/data/mail_template_data.xml
@@ -3,9 +3,9 @@
     <data noupdate="1">
 
         <record id="mail_template_data_portal_welcome" model="mail.template">
-            <field name="name">Portal: new user</field>
+            <field name="name">Portal: User Invite</field>
             <field name="model_id" ref="portal.model_portal_wizard_user"/>
-            <field name="subject">Your Odoo account at ${object.user_id.company_id.name}</field>
+            <field name="subject">Your account at ${object.user_id.company_id.name}</field>
             <field name="email_to">${object.user_id.email_formatted | safe}</field>
             <field name="body_html" type="html">
 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
@@ -36,17 +36,17 @@
                 <tr><td valign="top" style="font-size: 13px;">
                     <div>
                         Dear ${object.user_id.name or ''},<br/> <br/>
-                        You have been given access to ${object.user_id.company_id.name}'s portal.<br/>
-                        Your login account data is:
-                        <ul>
-                            <li>Username: ${object.user_id.login or ''}</li>
-                            <li>Portal: <a href="${'portal_url' in ctx and ctx['portal_url'] or ''}">${'portal_url' in ctx and ctx['portal_url'] or ''}</a></li>
-                            <li>Database: ${'dbname' in ctx and ctx['dbname'] or ''}</li>
-                        </ul>
-                        You can set or change your password via the following url:
-                        <ul>
-                            <li><a href="${object.user_id.signup_url}">${object.user_id.signup_url}</a></li>
-                        </ul>
+                        Welcome to ${object.user_id.company_id.name}'s Portal!<br/><br/>
+                        An account has been created for you with the following login: ${object.user_id.login}<br/><br/>
+                        Click on the button below to pick a password and activate your account.
+                        <div style="margin: 16px 0px 16px 0px; text-align: center;">
+                            <a href="${object.user_id.signup_url}" style="display: inline-block; padding: 10px; text-decoration: none; font-size: 12px; background-color: #875A7B; color: #fff; border-radius: 5px;">
+                                <strong>Activate Account</strong>
+                            </a>
+                            <a href="/web/login" style="display: inline-block; padding: 10px; text-decoration: none; font-size: 12px;">
+                                <strong>Log in</strong>
+                            </a>
+                        </div>
                         ${object.wizard_id.welcome_message or ''}
                     </div>
                 </td></tr>
diff --git a/addons/portal/wizard/portal_wizard_views.xml b/addons/portal/wizard/portal_wizard_views.xml
index 48eb7c14b79..8f0f1d15997 100644
--- a/addons/portal/wizard/portal_wizard_views.xml
+++ b/addons/portal/wizard/portal_wizard_views.xml
@@ -29,7 +29,7 @@
                         If necessary, you can fix any contact's email address directly in the list.
                     </div>
                     <field name="welcome_message"
-                        placeholder="This text is included in the email sent to new portal users."
+                        placeholder="This text is included at the end of the email sent to new portal users."
                         class="mb-3"/>
                     <field name="user_ids">
                         <tree string="Contacts" editable="bottom" create="false" delete="false">