From 732cb7c254508a25e78c0f544e4057d4c059c3d5 Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Tue, 11 Feb 2020 15:17:54 +0000
Subject: [PATCH 1/2] [IMP] survey: remove header and footer for all survey
 mode.

Purpose
=======

Lighten the survey layout. it should be free of website footer and header.

Specifications
==============

Survey Layout inherits from web.frontend_layout, mainly to be able to use all
the styles rules defined in it and keep consistency between other frontend
pages and survey.

Instead of inheriting another layout, this PR sets no_footer and no_header to
True for all survey layout. The idea is to show only the survey itself without
having other web/website object in the layout.

Links
=====

Task ID: 2195185
PR #45112
---
 addons/survey/static/src/scss/survey_form.scss   | 16 ++++++++++++++--
 addons/survey/views/survey_templates.xml         |  6 +++---
 .../survey/views/survey_templates_management.xml |  2 --
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/addons/survey/static/src/scss/survey_form.scss b/addons/survey/static/src/scss/survey_form.scss
index f9f98c9ea03..ef026c664d2 100644
--- a/addons/survey/static/src/scss/survey_form.scss
+++ b/addons/survey/static/src/scss/survey_form.scss
@@ -1,10 +1,22 @@
-.o_survey_wrap {
-    min-height: 100%;
+/**********************************************************
+  Remove website navbar : Should be done in website survey
+       but we won't do a bridge module only for this.
+  TODO: SmartPeople Fixme - cleaner solution? be my guest!
+ **********************************************************/
+body.o_connected_user {
+    padding-top: 0px !important;
+}
+
+nav#oe_main_menu_navbar {
+    display: none;
 }
 
 /**********************************************************
                         Common Style
  **********************************************************/
+.o_survey_wrap {
+    min-height: 100%;
+}
 
 .o_survey_form, .o_survey_print, .o_survey_session_manage, .o_survey_quick_access {
     .o_survey_question_error {
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 4458946bd9d..268aad6c9d2 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -10,14 +10,14 @@
             <t t-call-assets="survey.survey_assets" lazy_load="True"/>
         </xpath>
         <xpath expr="//header" position="before">
-            <t t-set="no_header" t-value="no_header or (survey and survey.certification) or (answer and answer.is_session_answer)"/>
-            <t t-set="no_footer" t-value="no_footer or not survey or survey.certification or (answer and answer.is_session_answer)"/>
+            <t t-set="no_header" t-value="True"/>
+            <t t-set="no_footer" t-value="True"/>
         </xpath>
         <xpath expr="//header" position="after">
             <div id="wrap" class="oe_structure oe_empty"/>
         </xpath>
         <xpath expr="//footer" position="after">
-            <div t-if="no_footer" class="py-3">
+            <div class="py-3">
                 <div class="float-right px-5 py-2 bg-white rounded-left">
                     <t t-call="web.brand_promotion_message">
                         <t t-set="_message"></t>
diff --git a/addons/survey/views/survey_templates_management.xml b/addons/survey/views/survey_templates_management.xml
index ba26f785fe6..c8af8b020af 100644
--- a/addons/survey/views/survey_templates_management.xml
+++ b/addons/survey/views/survey_templates_management.xml
@@ -105,8 +105,6 @@
     Mainly used in 'session mode' to give an easy access to the survey through the '/s' route. -->
     <template id="survey_access_code" name="Survey: Access Code page">
         <t t-call="survey.layout">
-            <t t-set="no_header" t-value="True" />
-            <t t-set="no_footer" t-value="True" />
             <div class="wrap o_survey_wrap pb16 d-flex">
                 <div class="container o_survey_quick_access d-flex flex-column">
                     <div class="d-flex flex-grow-1 align-items-center">

From f9d34ec7114b42978dbccb7341d263e3d97e4907 Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Tue, 11 Feb 2020 15:32:53 +0000
Subject: [PATCH 2/2] [IMP] survey, website_livechat: hide livechat in survey
 layout

Purpose
=======

Lighten the survey layout. Livechat button should not appear on survey pages.

Specifications
==============

Survey Layout inherits from web.frontend_layout, mainly to be able to use all
the styles rules defined in it and keep consistency between other frontend
pages and survey.

To avoid having the livechat button displayed on survey layout, 'no_livechat'
template variable has been introduced. The livechat button will be displayed
on all layout inheriting from frontend_layout (that is extended in
website_livechat to add that livechat button) only if 'no_livechat'
is False. By default, this variable is not set so will be considered as False.
In survey layout, no_livechat is set to True.

Links
=====

Task ID: 2195185
PR #45112
---
 addons/survey/views/survey_templates.xml           | 4 ++++
 addons/website_livechat/views/website_livechat.xml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 268aad6c9d2..7c7815b354c 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -3,6 +3,10 @@
 <data>
     <!-- Main survey layout -->
     <template id="survey.layout" name="Survey Layout" inherit_id="web.frontend_layout" primary="True">
+        <xpath expr="//div[@id='wrapwrap']" position="before">
+            <!--TODO DBE Fix me : If one day, there is a survey_livechat bridge module, put this in that module-->
+            <t t-set="no_livechat" t-value="True"/>
+        </xpath>
         <xpath expr="//div[@id='wrapwrap']" position="attributes">
             <attribute name="t-att-style" add="('height: 100%; overflow: auto; background: url(' + '/survey/get_background_image/%s/%s' % (survey.access_token, answer.access_token) + ') no-repeat fixed center; box-shadow: inset 0 0 0 10000px rgba(255,255,255,.7); background-size: cover;') if survey and survey.background_image and answer else 'height: 100%; overflow: auto;'"/>
         </xpath>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index 20c5c08c861..28860638f79 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -53,7 +53,7 @@
 
         <template id="loader" inherit_id="website.layout" name="Livechat : include loader on Website">
             <xpath expr="//div[@id='wrapwrap']" position="after">
-                <t t-if="website and website.channel_id">
+                <t t-if="website and website.channel_id and not no_livechat">
                     <script>
                         <t t-call="im_livechat.loader">
                             <t t-set="info" t-value="website.get_livechat_channel_info()"/>