From 14316fbc31a58b9a8ab2d9ae0dd29d59a4ba69ff Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Tue, 1 Sep 2020 06:53:37 +0000
Subject: [PATCH] [FIX] im_livechat: fix livechat usability

Fix issues in livechat display

  * rename Rated user filter into Rated Operator
  * add padding to improve readability of the feedback screen in the livechat
window.
  * fixed URL in placeholders to match existing "contactus" page URL

Task ID-2301261
PR odoo/odoo#60549

X-original-commit: 60e27876bb7ccdd6a6f871db82d44ac194b6f739
---
 addons/im_livechat/static/src/legacy/public_livechat.xml | 4 ++--
 addons/im_livechat/views/im_livechat_channel_views.xml   | 2 +-
 addons/rating/i18n/rating.pot                            | 3 ++-
 addons/rating/models/rating.py                           | 2 +-
 addons/rating/views/rating_rating_views.xml              | 2 +-
 addons/website_links/i18n/website_links.pot              | 2 +-
 addons/website_links/views/website_links_template.xml    | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/im_livechat/static/src/legacy/public_livechat.xml b/addons/im_livechat/static/src/legacy/public_livechat.xml
index e9873f44f52..e582fea12e9 100644
--- a/addons/im_livechat/static/src/legacy/public_livechat.xml
+++ b/addons/im_livechat/static/src/legacy/public_livechat.xml
@@ -16,11 +16,11 @@
             </div>
             <div class="o_livechat_rating_reason">
                 <textarea id="reason" placeholder="Explain your note"></textarea>
-                <div class="o_livechat_rating_reason_button">
+                <div class="o_livechat_rating_reason_button pb-3">
                     <input type="button" class="btn btn-primary btn-sm o_rating_submit_button" value="Send" />
                 </div>
             </div>
-            <div class="o_livechat_email">
+            <div class="o_livechat_email text-left">
                 <span class="text-muted">Receive a copy of this conversation</span>
                 <div class="input-group">
                     <input id="o_email" type="text" class="form-control" placeholder="mail@example.com"/>
diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml
index 17004087657..7713c298aec 100644
--- a/addons/im_livechat/views/im_livechat_channel_views.xml
+++ b/addons/im_livechat/views/im_livechat_channel_views.xml
@@ -234,7 +234,7 @@
                     <sheet>
                         <group>
                             <field name="action" widget="radio"/>
-                            <field name="regex_url" placeholder="e.g. /page/contactus"/>
+                            <field name="regex_url" placeholder="e.g. /contactus"/>
                             <label for="auto_popup_timer" class="oe_inline" attrs="{'invisible': [('action', '!=', 'auto_popup')]}"/>
                             <div class="oe_inline" attrs="{'invisible': [('action', '!=', 'auto_popup')]}">
                                 <field name="auto_popup_timer" class="oe_inline"/> seconds
diff --git a/addons/rating/i18n/rating.pot b/addons/rating/i18n/rating.pot
index bd2b0520103..66586d05f01 100644
--- a/addons/rating/i18n/rating.pot
+++ b/addons/rating/i18n/rating.pot
@@ -231,7 +231,8 @@ msgstr ""
 
 #. module: rating
 #: model:ir.model.fields,field_description:rating.field_rating_rating__rated_partner_id
-msgid "Rated person"
+#: model_terms:ir.ui.view,arch_db:rating.rating_rating_view_search
+msgid "Rated Operator"
 msgstr ""
 
 #. module: rating
diff --git a/addons/rating/models/rating.py b/addons/rating/models/rating.py
index bdaf8dbe3d9..1c86c6acc25 100644
--- a/addons/rating/models/rating.py
+++ b/addons/rating/models/rating.py
@@ -50,7 +50,7 @@ class Rating(models.Model):
     parent_ref = fields.Reference(
         string='Parent Ref', selection='_selection_target_model',
         compute='_compute_parent_ref', readonly=True)
-    rated_partner_id = fields.Many2one('res.partner', string="Rated person", help="Owner of the rated resource")
+    rated_partner_id = fields.Many2one('res.partner', string="Rated Operator", help="Owner of the rated resource")
     partner_id = fields.Many2one('res.partner', string='Customer', help="Author of the rating")
     rating = fields.Float(string="Rating Value", group_operator="avg", default=0, help="Rating value: 0=Unhappy, 5=Happy")
     rating_image = fields.Binary('Image', compute='_compute_rating_image')
diff --git a/addons/rating/views/rating_rating_views.xml b/addons/rating/views/rating_rating_views.xml
index 5476049f26f..58c5510868b 100644
--- a/addons/rating/views/rating_rating_views.xml
+++ b/addons/rating/views/rating_rating_views.xml
@@ -145,7 +145,7 @@
                     <separator/>
                     <filter name="filter_create_date" date="create_date"/>
                     <group expand="0" string="Group By">
-                        <filter string="Rated User" name="responsible" context="{'group_by':'rated_partner_id'}"/>
+                        <filter string="Rated Operator" name="responsible" context="{'group_by':'rated_partner_id'}"/>
                         <filter string="Customer" name="customer" context="{'group_by':'partner_id'}"/>
                         <filter string="Rating" name="rating_text" context="{'group_by':'rating_text'}"/>
                         <filter string="Resource" name="resource" context="{'group_by':'res_name'}"/>
diff --git a/addons/website_links/i18n/website_links.pot b/addons/website_links/i18n/website_links.pot
index 62aa5215c77..9604e45c995 100644
--- a/addons/website_links/i18n/website_links.pot
+++ b/addons/website_links/i18n/website_links.pot
@@ -332,7 +332,7 @@ msgstr ""
 
 #. module: website_links
 #: model_terms:ir.ui.view,arch_db:website_links.create_shorten_url
-msgid "e.g. https://www.odoo.com/page/contactus"
+msgid "e.g. https://www.odoo.com/contactus"
 msgstr ""
 
 #. module: website_links
diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml
index 56eb0fbeaf4..3f7a95eefd9 100644
--- a/addons/website_links/views/website_links_template.xml
+++ b/addons/website_links/views/website_links_template.xml
@@ -45,7 +45,7 @@
                                     <label class="col-md-3 col-form-label text-left">URL</label>
 
                                     <div class="col-md-9">
-                                        <input type="text" id="url" class="form-control required-form-control"  required="True" placeholder="e.g. https://www.odoo.com/page/contactus" t-att-value="u"/>
+                                        <input type="text" id="url" class="form-control required-form-control"  required="True" placeholder="e.g. https://www.odoo.com/contactus" t-att-value="u"/>
                                     </div>
                                 </div>