diff options
| -rw-r--r-- | addons/survey/static/src/scss/survey_form.scss | 16 | ||||
| -rw-r--r-- | addons/survey/views/survey_templates.xml | 10 | ||||
| -rw-r--r-- | addons/survey/views/survey_templates_management.xml | 2 | ||||
| -rw-r--r-- | addons/website_livechat/views/website_livechat.xml | 2 |
4 files changed, 22 insertions, 8 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..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> @@ -10,14 +14,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"> 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()"/> |