From 639968d260b53bfa4eb10efb78271ed892e1196f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20FRAN=C3=87OIS?= <remi.fr1105@gmail.com>
Date: Thu, 26 Mar 2020 01:47:44 +0100
Subject: [PATCH] [ADD] survey_description in survey_input_template_custom
 dependencies

---
 survey_description/i18n/fr.po                      | 11 +++++++++--
 survey_description/i18n/survey_description.pot     |  5 +++++
 survey_description/views/survey_survey.xml         | 14 +++++++++++---
 survey_input_template_custom/__manifest__.py       |  2 +-
 .../views/survey_survey.xml                        |  6 ++++--
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/survey_description/i18n/fr.po b/survey_description/i18n/fr.po
index 6002e21..ca2eff9 100644
--- a/survey_description/i18n/fr.po
+++ b/survey_description/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-25 11:43+0000\n"
-"PO-Revision-Date: 2020-03-25 11:43+0000\n"
+"POT-Creation-Date: 2020-03-26 00:37+0000\n"
+"PO-Revision-Date: 2020-03-26 00:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -29,3 +29,10 @@ msgstr "Sondage"
 #: model_terms:ir.ui.view,arch_db:survey_description.survey_survey_form
 msgid "Thank you page"
 msgstr "Page de fin"
+
+#. module: survey_description
+#: model_terms:ir.ui.view,arch_db:survey_description.survey_survey_form
+msgid "This content will be displayed between the title of the survey and the \"Start\" button, on the answer homepage.<br/>\n"
+"              You can also add a custom content on each page of the survey through the \"Description\" field."
+msgstr "Ce contenu sera affiché entre le titre du sondage et le bouton \"Commencer\", sur la page d'accueil des réponses aux sondages.<br/>\n"
+"              Vous pouvez également ajouter du contenu spécifique sur chacune des pages du sondage via le champ \"Description\"."
diff --git a/survey_description/i18n/survey_description.pot b/survey_description/i18n/survey_description.pot
index 046f831..22e1437 100644
--- a/survey_description/i18n/survey_description.pot
+++ b/survey_description/i18n/survey_description.pot
@@ -30,3 +30,8 @@ msgstr ""
 msgid "Thank you page"
 msgstr ""
 
+#. module: survey_description
+#: model_terms:ir.ui.view,arch_db:survey_description.survey_survey_form
+msgid "This content will be displayed between the title of the survey and the \"Start\" button, on the answer homepage.<br/>\n"
+"              You can also add a custom content on each page of the survey through the \"Description\" field."
+msgstr ""
diff --git a/survey_description/views/survey_survey.xml b/survey_description/views/survey_survey.xml
index ac966ce..4685684 100644
--- a/survey_description/views/survey_survey.xml
+++ b/survey_description/views/survey_survey.xml
@@ -7,12 +7,20 @@
     <field name="inherit_id" ref="survey.survey_form"/>
     <field name="priority">20</field>
     <field name="arch" type="xml">
-      <xpath expr="//notebook/page[1]" position="after">
+      <xpath expr="//notebook/page[descendant::field[@name='page_ids']]" position="after">
         <page name="description" string="Description">
-          <field name="description" nolabel="1" colspan="2"/>
+          <group>
+            <p colspan="2" class="text-muted oe_edit_only">
+              This content will be displayed between the title of the survey and the "Start" button, on the answer homepage.<br/>
+              You can also add a custom content on each page of the survey through the "Description" field.
+            </p>
+            <field name="description" nolabel="1" colspan="2"/>
+          </group>
         </page>
         <page name="thank_you" string="Thank you page">
-          <field name="thank_you_message" nolabel="1" colspan="2"/>
+          <group class="o_label_nowrap">
+            <field name="thank_you_message" colspan="2"/>
+          </group>
         </page>
       </xpath>
     </field>
diff --git a/survey_input_template_custom/__manifest__.py b/survey_input_template_custom/__manifest__.py
index 58eab70..ec2b8ff 100644
--- a/survey_input_template_custom/__manifest__.py
+++ b/survey_input_template_custom/__manifest__.py
@@ -12,7 +12,7 @@
     'license': 'AGPL-3',
     'category': 'Marketing',
     'depends': [
-        'survey',
+        'survey_description',
     ],
     'data': [
         'templates/page.xml',
diff --git a/survey_input_template_custom/views/survey_survey.xml b/survey_input_template_custom/views/survey_survey.xml
index d132065..aa84a96 100644
--- a/survey_input_template_custom/views/survey_survey.xml
+++ b/survey_input_template_custom/views/survey_survey.xml
@@ -7,10 +7,12 @@
     <field name="inherit_id" ref="survey.survey_form"/>
     <field name="priority">21</field>
     <field name="arch" type="xml">
-      <xpath expr="//notebook/page[last()]" position="inside">
+      <field name="thank_you_message" position="before">
+        <field name="thank_you_title" string="Titre de la page"/>
+      </field>
+      <xpath expr="//notebook/page[descendant::field[@name='users_can_go_back']]" position="inside">
         <group col="4">
           <field name="start_btn_label"/>
-          <field name="thank_you_title"/>
           <field name="submit_btn_label"/>
         </group>
       </xpath>