From 001e26cd97e55cb563626c01c80d7fb33ecd398a Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Fri, 5 Jun 2020 07:37:28 +0000
Subject: [PATCH] [IMP] event : Update tour message, clean onboarding and some
 views

Change event onboarding rainbow message to something more relevant. Default
message is considered as less user friendly than the new one.

Before this commit the category_id for a tag had no label displayed. We choose
to wrap the category_id field inside a group so that field labels shows up.

In settings, wrap the tag_ids inside a div.o_setting_right_pane so we can have
the left border displayed correctly, like most fields in settings.

Finally remove "Online" template from the event_data since it acts like a
dummy type without pre-defined data.

Task 2257884

closes odoo/odoo#52472

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/event/data/event_data.xml               | 5 -----
 addons/event/data/event_demo.xml               | 2 +-
 addons/event/static/src/js/tours/event_tour.js | 1 +
 addons/event/views/event_tag_views.xml         | 4 +++-
 addons/event/views/event_views.xml             | 8 +++++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/event/data/event_data.xml b/addons/event/data/event_data.xml
index d274d70e8df..e08d0744b74 100644
--- a/addons/event/data/event_data.xml
+++ b/addons/event/data/event_data.xml
@@ -15,11 +15,6 @@
         </record>
 
         <!-- Event Categories -->
-        <record id="event_type_data_online" model="event.type">
-            <field name="name">Online</field>
-            <field name="auto_confirm" eval="True"/>
-            <field name="use_mail_schedule" eval="False"/>
-        </record>
         <record id="event_type_data_ticket" model="event.type">
             <field name="name">Ticketing</field>
             <field name="auto_confirm" eval="False"/>
diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml
index 9817ce15e2d..e29bfe99f37 100644
--- a/addons/event/data/event_demo.xml
+++ b/addons/event/data/event_demo.xml
@@ -166,7 +166,7 @@
         <field name="user_id" ref="base.user_admin"/>
         <field eval="(DateTime.today()+ timedelta(days=5)).strftime('%Y-%m-%d 07:00:00')" name="date_begin"/>
         <field eval="(DateTime.today()+ timedelta(days=5)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
-        <field name="event_type_id" ref="event_type_data_online"/>
+        <field name="event_type_id" ref="event_type_data_conference"/>
         <field name="address_id" ref="event.res_partner_location_2"/>
         <field name="seats_limited">True</field>
         <field name="seats_max">200</field>
diff --git a/addons/event/static/src/js/tours/event_tour.js b/addons/event/static/src/js/tours/event_tour.js
index fe87e81ebc1..0ab5bd475ab 100644
--- a/addons/event/static/src/js/tours/event_tour.js
+++ b/addons/event/static/src/js/tours/event_tour.js
@@ -26,6 +26,7 @@ var EventAdditionalTourSteps = require('event.event_steps');
 
 tour.register('event_tour', {
     url: '/web',
+    rainbowManMessage: _t("Great! Now all you have to do is wait for your attendees to show up!"),
 }, [tour.stepUtils.showAppsMenuItem(), {
     trigger: '.o_app[data-menu-xmlid="event.event_main_menu"]',
     content: _t("Ready to <b>organize events</b> in a few minutes? Let's get started!"),
diff --git a/addons/event/views/event_tag_views.xml b/addons/event/views/event_tag_views.xml
index 6d2ae530bb9..f5042a5d5f7 100644
--- a/addons/event/views/event_tag_views.xml
+++ b/addons/event/views/event_tag_views.xml
@@ -65,7 +65,9 @@
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
                         </div>
-                        <field name="category_id" widget="many2one"/>
+                        <group>
+                            <field name="category_id" widget="many2one" class="oe_inline"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 7cd61f4baea..4ce4a68b607 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -72,9 +72,11 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-12 col-lg-6 o_setting_box" >
-                                <label for="tag_ids" string="Tags"/>
-                                <field name="tag_ids" widget="many2many_tags" options="{'no_quick_create': True}"/>
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_right_pane">
+                                    <label for="tag_ids" string="Tags"/>
+                                    <field name="tag_ids" widget="many2many_tags" options="{'no_quick_create': True}"/>
+                                </div>
                             </div>
                         </div>
                         <h2>Attendees</h2>