From 023d59b6506b55613d8a8f459b6c107b6339676b Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Tue, 27 Jan 2026 17:19:22 +0100
Subject: [PATCH 01/12] [T2932] FEATURE: new contact page design

- FEATURE: added new contact page based on figma mockup
- FEATURE: added contact page to __manifest__.py
---
 my_compassion/__manifest__.py                 |   1 +
 .../templates/pages/my2_contact_us.xml        | 151 ++++++++++++++++++
 2 files changed, 152 insertions(+)
 create mode 100644 my_compassion/templates/pages/my2_contact_us.xml

diff --git a/my_compassion/__manifest__.py b/my_compassion/__manifest__.py
index 115ad51c1..20f510d21 100644
--- a/my_compassion/__manifest__.py
+++ b/my_compassion/__manifest__.py
@@ -79,6 +79,7 @@
         "templates/pages/my2_gifts_thank_you.xml",
         "templates/pages/my2_add_a_gift.xml",
         "templates/http_error_custom.xml",
+        "templates/pages/my2_contact_us.xml",
         # My Compassion 2 components
         "templates/components/my2_children_card.xml",
         "templates/components/my2_letter_card.xml",
diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
new file mode 100644
index 000000000..e945e38f6
--- /dev/null
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Page My Compassion 2 Contact us page
+
+    Description:
+    This page is the contact us page which users can land on when they
+    click on the link "contact us" on the login page.
+
+    Used in route:
+    -/contactus
+-->
+<odoo>
+    <template id="my2_contactus_page" inherit_id="website.contactus" name="My Compassion 2 Contact us page">
+        <xpath expr="//div[@id='wrap']" position="replace">
+            <div id="wrap" class="oe_structure">
+                <div class="container">
+                    <div class="single-column pt-3">
+                        <t t-call="theme_compassion_2025.TitleComponent">
+                            <t t-set="title_content">Contact us</t>
+                            <t t-set="title_size" t-value="'md'"/>
+                            <t t-set="color" t-value="'core-blue'"/>
+                            <t t-set="show_underline" t-value="True"/>
+                            <t t-set="underline_color" t-value="'low-yellow'"/>
+                            <p>
+                                We'd love to hear from you!
+                            </p>
+                        </t>
+                    </div>
+                </div>
+            </div>
+            <div id="contactus_form_top" class="bg-core-blue text-center py-5">
+                <div class="single-column mx-3 mx-md-auto">
+                    <t t-call="theme_compassion_2025.TitleComponent">
+                        <t t-set="title_content">Get in touch</t>
+                        <t t-set="title_size" t-value="'md'"/>
+                        <t t-set="color" t-value="'pure-white'"/>
+                        <t t-set="show_underline" t-value="False"/>
+                        <t t-set="description">
+                            Have a question or want to learn more about our
+                            work? Fill out the form below, and we'll get back to
+                            you as soon as possible.
+                        </t>
+                        <t t-set="description_color" t-value="'pure-white'"/>
+                    </t>
+                    <form class="contactus-form" role="form">
+                        <div class="row text-left">
+                            <!-- Title Mr. or Mrs -->
+                            <t t-call="theme_compassion_2025.FormFieldComponent">
+                                <t t-set="top_class" t-value="'col-12 mb-3'"/>
+                                <div class="form-check form-check-inline">
+                                    <input class="form-check-input" type="radio"
+                                           name="title" id="mrs" value="Mrs."/>
+                                    <label class="form-check-label text-pure-white"
+                                           for="mrs">
+                                        Mrs.
+                                    </label>
+                                </div>
+                                <div class="form-check form-check-inline">
+                                    <input class="form-check-input" type="radio"
+                                           name="title" id="mr" value="Mr."/>
+                                    <label class="form-check-label text-pure-white"
+                                           for="mr">
+                                        Mr.
+                                    </label>
+                                </div>
+                            </t>
+                            <!-- First Name and Last Name -->
+                            <t t-call="theme_compassion_2025.FormFieldComponent">
+                                <t t-set="label">First Name</t>
+                                <t t-set="label_color" t-value="'pure-white'"/>
+                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3'"/>
+                                <t t-set="input_id" t-value="contactus_form_firstname"/>
+                                <input d="contactus_form_firstname" type="text"
+                                       name="firstname" class="form-control"
+                                       placeholder="First Name" required="required"
+                                />
+                            </t>
+                            <t t-call="theme_compassion_2025.FormFieldComponent">
+                                <t t-set="label">Last Name</t>
+                                <t t-set="label_color" t-value="'pure-white'"/>
+                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3'"/>
+                                <t t-set="input_id" t-value="contactus_form_lastname"/>
+                                <input id="contactus_form_lastname" type="text"
+                                       name="lastname" class="form-control"
+                                       placeholder="Last Name" required="required"
+                                />
+                            </t>
+                            <!-- Phone number and E-mail -->
+                            <t t-call="theme_compassion_2025.FormFieldComponent">
+                                <t t-set="label">Phone number</t>
+                                <t t-set="label_color" t-value="'pure-white'"/>
+                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3'"/>
+                                <t t-set="input_id" t-value="contactus_form_phone_number"/>
+                                <input id="contactus_form_phone_number"
+                                       type="text" name="phone_number"
+                                       class="form-control" placeholder="0041244342124"
+                                       required="required"
+                                />
+                            </t>
+                            <t t-call="theme_compassion_2025.FormFieldComponent">
+                                <t t-set="label">E-mail</t>
+                                <t t-set="label_color" t-value="'pure-white'"/>
+                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3'"/>
+                                <t t-set="input_id" t-value="contactus_form_email"/>
+                                <input id="contactus_form_email" type="email"
+                                       name="email" class="form-control"
+                                       placeholder="info@compassion.ch"
+                                       required="required"
+                                />
+                            </t>
+                        <!-- Subject -->
+                            <t t-call="theme_compassion_2025.FormFieldComponent">
+                                <t t-set="label">Subject</t>
+                                <t t-set="label_color" t-value="'pure-white'"/>
+                                <t t-set="top_class" t-value="'col-12'"/>
+                                <t t-set="input_id" t-value="contactus_subject"/>
+                                <input id="contactus_subject"
+                                       type="text" name="subject"
+                                       class="form-control" placeholder="Hi"
+                                       required="required"
+                                />
+                            </t>
+                            <!-- Message -->
+                            <t t-call="theme_compassion_2025.FormFieldComponent">
+                                <t t-set="label">Message</t>
+                                <t t-set="label_color" t-value="'pure-white'"/>
+                                <t t-set="top_class" t-value="'col-12 mb-3'"/>
+                                <t t-set="input_id" t-value="contactus_message"/>
+                                <textarea id="contactus_message" name="message"
+                                       class="form-control"
+                                       required="required"
+                                       rows="4"
+                                />
+                            </t>
+                            <!-- Contact us button -->
+                            <div class="w-100 mt-3 d-flex justify-content-center">
+                            <t t-call="theme_compassion_2025.ThemedButtonComponent">
+                                <t t-set="variant" t-value="'compact'"/>
+                                <t t-set="variation" t-value="'filled'"/>
+                                <t t-set="label">Send the message</t>
+                                <t t-set="color" t-value="'pure-white'"/>
+                                <t t-set="text_color" t-value="'core-blue'"/>
+                            </t>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file

From 15453a3b3621ebb67909a52bc1f48bc8e44e8b10 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Wed, 28 Jan 2026 07:32:17 +0100
Subject: [PATCH 02/12] [T2932] REFACTOR: Removed double title

- REFACTOR: Removed second title component and changed the text of the first one
---
 .../templates/pages/my2_contact_us.xml        | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index e945e38f6..1b780a421 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -16,13 +16,15 @@ Page My Compassion 2 Contact us page
                 <div class="container">
                     <div class="single-column pt-3">
                         <t t-call="theme_compassion_2025.TitleComponent">
-                            <t t-set="title_content">Contact us</t>
+                            <t t-set="title_content">Get in touch</t>
                             <t t-set="title_size" t-value="'md'"/>
                             <t t-set="color" t-value="'core-blue'"/>
                             <t t-set="show_underline" t-value="True"/>
                             <t t-set="underline_color" t-value="'low-yellow'"/>
                             <p>
-                                We'd love to hear from you!
+                                Have a question or want to learn more about our
+                                work? Fill out the form below, and we'll get back to
+                                you as soon as possible.
                             </p>
                         </t>
                     </div>
@@ -30,18 +32,6 @@ Page My Compassion 2 Contact us page
             </div>
             <div id="contactus_form_top" class="bg-core-blue text-center py-5">
                 <div class="single-column mx-3 mx-md-auto">
-                    <t t-call="theme_compassion_2025.TitleComponent">
-                        <t t-set="title_content">Get in touch</t>
-                        <t t-set="title_size" t-value="'md'"/>
-                        <t t-set="color" t-value="'pure-white'"/>
-                        <t t-set="show_underline" t-value="False"/>
-                        <t t-set="description">
-                            Have a question or want to learn more about our
-                            work? Fill out the form below, and we'll get back to
-                            you as soon as possible.
-                        </t>
-                        <t t-set="description_color" t-value="'pure-white'"/>
-                    </t>
                     <form class="contactus-form" role="form">
                         <div class="row text-left">
                             <!-- Title Mr. or Mrs -->
@@ -116,7 +106,7 @@ Page My Compassion 2 Contact us page
                                 <t t-set="input_id" t-value="contactus_subject"/>
                                 <input id="contactus_subject"
                                        type="text" name="subject"
-                                       class="form-control" placeholder="Hi"
+                                       class="form-control" placeholder="Greetings"
                                        required="required"
                                 />
                             </t>

From 7f02f4c1dbeb2c244900ff9172ca7da329c244de Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 5 Feb 2026 15:15:41 +0100
Subject: [PATCH 03/12] [T2932] FEAT: New contact form works now

- FEAT: added s_website_xxx classes to input fields
- FEAT: added the csrf_token to the form
- FEAT: added an optional add_class to the ThemedButton
---
 .../templates/pages/my2_contact_us.xml        | 114 +++++++++++++-----
 .../components/buttons/ThemedButton.xml       |   5 +-
 2 files changed, 84 insertions(+), 35 deletions(-)

diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index 1b780a421..9fb8aed29 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -32,46 +32,83 @@ Page My Compassion 2 Contact us page
             </div>
             <div id="contactus_form_top" class="bg-core-blue text-center py-5">
                 <div class="single-column mx-3 mx-md-auto">
-                    <form class="contactus-form" role="form">
+                    <span
+                            class="hidden"
+                            data-for="contactus_form"
+                            t-att-data-values="{'email_to': res_company.email}"
+                    />
+                    <form
+
+                            id="contactus_form"
+                            action="/website_form/"
+                            method="post"
+                            enctype="multipart/form-data"
+                            class="o_mark_required contactus-form s_website_form"
+                            data-mark="*"
+                            data-model_name="crm.claim"
+                            data-success-mode="redirect"
+                            data-success-page="/contactus-thank-you"
+                            role="form">
                         <div class="row text-left">
+                            <input
+                                type="hidden"
+                                name="Your Name"
+                                id="contact_us_full_name"
+                                class="s_website_form_input"
+                                value=""
+                            />
                             <!-- Title Mr. or Mrs -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="top_class" t-value="'col-12 mb-3'"/>
-                                <div class="form-check form-check-inline">
-                                    <input class="form-check-input" type="radio"
-                                           name="title" id="mrs" value="Mrs."/>
-                                    <label class="form-check-label text-pure-white"
-                                           for="mrs">
-                                        Mrs.
-                                    </label>
-                                </div>
-                                <div class="form-check form-check-inline">
-                                    <input class="form-check-input" type="radio"
-                                           name="title" id="mr" value="Mr."/>
-                                    <label class="form-check-label text-pure-white"
-                                           for="mr">
-                                        Mr.
-                                    </label>
-                                </div>
+                                    <div class="form-check form-check-inline">
+                                        <input
+                                                class="form-check-input js_combine_name"
+                                                   type="radio"
+                                                   name="title" id="mrs" value="Mrs."
+                                        />
+                                        <label class="form-check-label text-pure-white"
+                                               for="mrs">
+                                            Mrs.
+                                        </label>
+                                    </div>
+                                    <div class="form-check form-check-inline">
+                                        <input
+                                                class="form-check-input js_combine_name"
+                                               type="radio"
+                                               name="title" id="mr" value="Mr."
+                                        />
+                                        <label class="form-check-label text-pure-white"
+                                               for="mr">
+                                            Mr.
+                                        </label>
+                                    </div>
                             </t>
                             <!-- First Name and Last Name -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">First Name</t>
                                 <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3'"/>
+                                <t
+                                        t-set="top_class"
+                                        t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
+                                />
                                 <t t-set="input_id" t-value="contactus_form_firstname"/>
-                                <input d="contactus_form_firstname" type="text"
-                                       name="firstname" class="form-control"
+                                <input id="contactus_form_firstname" type="text"
+                                       name="firstname"
+                                       class="form-control js_combine_name s_website_form_input"
                                        placeholder="First Name" required="required"
                                 />
                             </t>
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Last Name</t>
                                 <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3'"/>
+                                <t
+                                        t-set="top_class"
+                                        t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
+                                />
                                 <t t-set="input_id" t-value="contactus_form_lastname"/>
                                 <input id="contactus_form_lastname" type="text"
-                                       name="lastname" class="form-control"
+                                       name="lastname"
+                                       class="form-control js_combine_name s_website_form_input"
                                        placeholder="Last Name" required="required"
                                 />
                             </t>
@@ -79,21 +116,21 @@ Page My Compassion 2 Contact us page
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Phone number</t>
                                 <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3'"/>
+                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3 s_website_form_field'"/>
                                 <t t-set="input_id" t-value="contactus_form_phone_number"/>
                                 <input id="contactus_form_phone_number"
-                                       type="text" name="phone_number"
-                                       class="form-control" placeholder="0041244342124"
+                                       type="text" name="partner_phone"
+                                       class="form-control s_website_form_input" placeholder="0041244342124"
                                        required="required"
                                 />
                             </t>
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">E-mail</t>
                                 <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3'"/>
+                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3 s_website_form_field'"/>
                                 <t t-set="input_id" t-value="contactus_form_email"/>
                                 <input id="contactus_form_email" type="email"
-                                       name="email" class="form-control"
+                                       name="email_from" class="form-control s_website_form_input"
                                        placeholder="info@compassion.ch"
                                        required="required"
                                 />
@@ -102,11 +139,12 @@ Page My Compassion 2 Contact us page
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Subject</t>
                                 <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12'"/>
+                                <t t-set="top_class" t-value="'col-12 s_website_form_field'"/>
                                 <t t-set="input_id" t-value="contactus_subject"/>
                                 <input id="contactus_subject"
-                                       type="text" name="subject"
-                                       class="form-control" placeholder="Greetings"
+                                       type="text" name="name"
+                                       class="form-control s_website_form_input"
+                                       placeholder="Request subject"
                                        required="required"
                                 />
                             </t>
@@ -114,14 +152,23 @@ Page My Compassion 2 Contact us page
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Message</t>
                                 <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12 mb-3'"/>
+                                <t t-set="top_class" t-value="'col-12 mb-3 s_website_form_field'"/>
                                 <t t-set="input_id" t-value="contactus_message"/>
-                                <textarea id="contactus_message" name="message"
-                                       class="form-control"
+                                <textarea id="contactus_message" name="description"
+                                       class="form-control s_website_form_input"
                                        required="required"
                                        rows="4"
                                 />
                             </t>
+                            <!-- csrf token -->
+                            <input
+                                    type="hidden" 
+                                    name="csrf_token"
+                                    t-att-value="request.csrf_token()"
+                            />
+                            <div class="col-12 text-center">
+                                <div id="s_website_form_result"></div>
+                            </div>
                             <!-- Contact us button -->
                             <div class="w-100 mt-3 d-flex justify-content-center">
                             <t t-call="theme_compassion_2025.ThemedButtonComponent">
@@ -130,6 +177,7 @@ Page My Compassion 2 Contact us page
                                 <t t-set="label">Send the message</t>
                                 <t t-set="color" t-value="'pure-white'"/>
                                 <t t-set="text_color" t-value="'core-blue'"/>
+                                <t t-set="add_class" t-value="'s_website_form_send'"/>
                             </t>
                             </div>
                         </div>
diff --git a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
index fbe7a4a59..2c4537cc5 100644
--- a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
+++ b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
@@ -32,6 +32,7 @@
     - rel (string, optional): The rel attribute for the link (e.g., 'noopener noreferrer'
       for security).
     - data_toggle (char, optional): data-toggle attribute to be added to the button or link element, e.g., `data-toggle="dropdown"`
+    - add_class (string, optional): An optional class which will be added to the button
 -->
 <odoo>
     <template id="ThemedButtonComponent_Content" name="Button Content">
@@ -86,7 +87,7 @@
             <a
                 t-att-href="href"
                 t-att-id="id"
-                t-attf-class="btn #{btn_class} btn--radius-#{radius} #{style_class} text-#{text_color}"
+                t-attf-class="btn #{btn_class} btn--radius-#{radius} #{style_class} text-#{text_color} #{add_class or ''}"
                 t-att-data-custom="data_custom"
                 t-att-target="target"
                 t-att-rel="computed_rel or None"
@@ -98,7 +99,7 @@
         <t t-else="">
             <button
                 t-att-id="id"
-                t-attf-class="btn #{btn_class} btn--radius-#{radius} #{style_class} text-#{text_color}"
+                t-attf-class="btn #{btn_class} btn--radius-#{radius} #{style_class} text-#{text_color} #{add_class or ''}"
                 t-att-data-custom="data_custom"
                 t-att-data-mode="mode"
                 t-att-data-toggle="data_toggle"

From fff310b90c4c6fc1f562ed10de49cb538afe52e6 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Fri, 6 Feb 2026 12:12:32 +0100
Subject: [PATCH 04/12] [T2932] REFACTOR: Contact us thank you page

- REFACTOR: Created a new contact us thank you page
- REFACTOR: Changed the data-success-page url in the contact us form
- FEAT: Added new translation terms to fr/de/it .po files
- STYLE: pre-commit indentation
---
 my_compassion/__manifest__.py                 |   1 +
 my_compassion/i18n/de.po                      |  84 +++++++
 my_compassion/i18n/fr_CH.po                   |  83 +++++++
 my_compassion/i18n/it.po                      |  84 +++++++
 .../templates/pages/my2_contact_us.xml        | 214 +++++++++---------
 .../pages/my2_contactus_thank_you.xml         |  56 +++++
 6 files changed, 420 insertions(+), 102 deletions(-)
 create mode 100644 my_compassion/templates/pages/my2_contactus_thank_you.xml

diff --git a/my_compassion/__manifest__.py b/my_compassion/__manifest__.py
index 20f510d21..f3b20edfc 100644
--- a/my_compassion/__manifest__.py
+++ b/my_compassion/__manifest__.py
@@ -80,6 +80,7 @@
         "templates/pages/my2_add_a_gift.xml",
         "templates/http_error_custom.xml",
         "templates/pages/my2_contact_us.xml",
+        "templates/pages/my2_contactus_thank_you.xml",
         # My Compassion 2 components
         "templates/components/my2_children_card.xml",
         "templates/components/my2_letter_card.xml",
diff --git a/my_compassion/i18n/de.po b/my_compassion/i18n/de.po
index de22ebd7d..52b840e41 100644
--- a/my_compassion/i18n/de.po
+++ b/my_compassion/i18n/de.po
@@ -1124,3 +1124,87 @@ msgstr "Klicke hier, um eine Patenschaft zu beginnen"
 
 #~ msgid "Your sponsor or child reference"
 #~ msgstr "Dein Pate oder dein Kind - Referenznummer"
+
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Get in touch"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid ""
+"Have a question or want to learn more about our\n"
+"                                work? Fill out the form below, and we'll get back to\n"
+"                                you as soon as possible."
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Mrs."
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Mr."
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "First Name"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Last Name"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_sponsorship_wizard_user_details
+msgid "E-mail"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Subject"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Request subject"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Message"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Send the message"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "<span>Your message has been sent successfully</span>"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "Back to home"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "Thank You!"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "We will get back to you shortly."
+msgstr ""
diff --git a/my_compassion/i18n/fr_CH.po b/my_compassion/i18n/fr_CH.po
index 80c912cdf..73df478bd 100644
--- a/my_compassion/i18n/fr_CH.po
+++ b/my_compassion/i18n/fr_CH.po
@@ -1106,3 +1106,86 @@ msgstr "en cliquant ici"
 
 #~ msgid "Your sponsor or child reference"
 #~ msgstr "Votre référence parrain ou enfant"
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Get in touch"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid ""
+"Have a question or want to learn more about our\n"
+"                                work? Fill out the form below, and we'll get back to\n"
+"                                you as soon as possible."
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Mrs."
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Mr."
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "First Name"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Last Name"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_sponsorship_wizard_user_details
+msgid "E-mail"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Subject"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Request subject"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Message"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Send the message"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "<span>Your message has been sent successfully</span>"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "Back to home"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "Thank You!"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "We will get back to you shortly."
+msgstr ""
diff --git a/my_compassion/i18n/it.po b/my_compassion/i18n/it.po
index b71759b25..a7cd81ab9 100644
--- a/my_compassion/i18n/it.po
+++ b/my_compassion/i18n/it.po
@@ -973,3 +973,87 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:my_compassion.sponsor_a_child
 msgid "this link"
 msgstr "questo link"
+
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Get in touch"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid ""
+"Have a question or want to learn more about our\n"
+"                                work? Fill out the form below, and we'll get back to\n"
+"                                you as soon as possible."
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Mrs."
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Mr."
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "First Name"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Last Name"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_sponsorship_wizard_user_details
+msgid "E-mail"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Subject"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Request subject"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Message"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
+msgid "Send the message"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "<span>Your message has been sent successfully</span>"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "Back to home"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "Thank You!"
+msgstr ""
+
+#. module: my_compassion
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
+#: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
+msgid "We will get back to you shortly."
+msgstr ""
diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index 9fb8aed29..870aa42ad 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -17,10 +17,10 @@ Page My Compassion 2 Contact us page
                     <div class="single-column pt-3">
                         <t t-call="theme_compassion_2025.TitleComponent">
                             <t t-set="title_content">Get in touch</t>
-                            <t t-set="title_size" t-value="'md'"/>
-                            <t t-set="color" t-value="'core-blue'"/>
-                            <t t-set="show_underline" t-value="True"/>
-                            <t t-set="underline_color" t-value="'low-yellow'"/>
+                            <t t-set="title_size" t-value="'md'" />
+                            <t t-set="color" t-value="'core-blue'" />
+                            <t t-set="show_underline" t-value="True" />
+                            <t t-set="underline_color" t-value="'low-yellow'" />
                             <p>
                                 Have a question or want to learn more about our
                                 work? Fill out the form below, and we'll get back to
@@ -33,22 +33,22 @@ Page My Compassion 2 Contact us page
             <div id="contactus_form_top" class="bg-core-blue text-center py-5">
                 <div class="single-column mx-3 mx-md-auto">
                     <span
-                            class="hidden"
-                            data-for="contactus_form"
-                            t-att-data-values="{'email_to': res_company.email}"
+                        class="hidden"
+                        data-for="contactus_form"
+                        t-att-data-values="{'email_to': res_company.email}"
                     />
                     <form
-
-                            id="contactus_form"
-                            action="/website_form/"
-                            method="post"
-                            enctype="multipart/form-data"
-                            class="o_mark_required contactus-form s_website_form"
-                            data-mark="*"
-                            data-model_name="crm.claim"
-                            data-success-mode="redirect"
-                            data-success-page="/contactus-thank-you"
-                            role="form">
+                        id="contactus_form"
+                        action="/website_form/"
+                        method="post"
+                        enctype="multipart/form-data"
+                        class="o_mark_required contactus-form s_website_form"
+                        data-mark="*"
+                        data-model_name="crm.claim"
+                        data-success-mode="redirect"
+                        data-success-page="/my2-contactus-thank-you"
+                        role="form"
+                    >
                         <div class="row text-left">
                             <input
                                 type="hidden"
@@ -59,126 +59,136 @@ Page My Compassion 2 Contact us page
                             />
                             <!-- Title Mr. or Mrs -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
-                                <t t-set="top_class" t-value="'col-12 mb-3'"/>
-                                    <div class="form-check form-check-inline">
-                                        <input
-                                                class="form-check-input js_combine_name"
-                                                   type="radio"
-                                                   name="title" id="mrs" value="Mrs."
-                                        />
-                                        <label class="form-check-label text-pure-white"
-                                               for="mrs">
-                                            Mrs.
-                                        </label>
-                                    </div>
-                                    <div class="form-check form-check-inline">
-                                        <input
-                                                class="form-check-input js_combine_name"
-                                               type="radio"
-                                               name="title" id="mr" value="Mr."
-                                        />
-                                        <label class="form-check-label text-pure-white"
-                                               for="mr">
-                                            Mr.
-                                        </label>
-                                    </div>
+                                <t t-set="top_class" t-value="'col-12 mb-3'" />
+                                <div class="form-check form-check-inline">
+                                    <input
+                                        class="form-check-input js_combine_name"
+                                        type="radio"
+                                        name="title"
+                                        id="mrs"
+                                        value="Mrs."
+                                    />
+                                    <label class="form-check-label text-pure-white" for="mrs">Mrs.</label>
+                                </div>
+                                <div class="form-check form-check-inline">
+                                    <input
+                                        class="form-check-input js_combine_name"
+                                        type="radio"
+                                        name="title"
+                                        id="mr"
+                                        value="Mr."
+                                    />
+                                    <label class="form-check-label text-pure-white" for="mr">Mr.</label>
+                                </div>
                             </t>
                             <!-- First Name and Last Name -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">First Name</t>
-                                <t t-set="label_color" t-value="'pure-white'"/>
+                                <t t-set="label_color" t-value="'pure-white'" />
                                 <t
-                                        t-set="top_class"
-                                        t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
+                                    t-set="top_class"
+                                    t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
                                 />
-                                <t t-set="input_id" t-value="contactus_form_firstname"/>
-                                <input id="contactus_form_firstname" type="text"
-                                       name="firstname"
-                                       class="form-control js_combine_name s_website_form_input"
-                                       placeholder="First Name" required="required"
+                                <t t-set="input_id" t-value="contactus_form_firstname" />
+                                <input
+                                    id="contactus_form_firstname"
+                                    type="text"
+                                    name="firstname"
+                                    class="form-control js_combine_name s_website_form_input"
+                                    placeholder="First Name"
+                                    required="required"
                                 />
                             </t>
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Last Name</t>
-                                <t t-set="label_color" t-value="'pure-white'"/>
+                                <t t-set="label_color" t-value="'pure-white'" />
                                 <t
-                                        t-set="top_class"
-                                        t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
+                                    t-set="top_class"
+                                    t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
                                 />
-                                <t t-set="input_id" t-value="contactus_form_lastname"/>
-                                <input id="contactus_form_lastname" type="text"
-                                       name="lastname"
-                                       class="form-control js_combine_name s_website_form_input"
-                                       placeholder="Last Name" required="required"
+                                <t t-set="input_id" t-value="contactus_form_lastname" />
+                                <input
+                                    id="contactus_form_lastname"
+                                    type="text"
+                                    name="lastname"
+                                    class="form-control js_combine_name s_website_form_input"
+                                    placeholder="Last Name"
+                                    required="required"
                                 />
                             </t>
                             <!-- Phone number and E-mail -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Phone number</t>
-                                <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3 s_website_form_field'"/>
-                                <t t-set="input_id" t-value="contactus_form_phone_number"/>
-                                <input id="contactus_form_phone_number"
-                                       type="text" name="partner_phone"
-                                       class="form-control s_website_form_input" placeholder="0041244342124"
-                                       required="required"
+                                <t t-set="label_color" t-value="'pure-white'" />
+                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3 s_website_form_field'" />
+                                <t t-set="input_id" t-value="contactus_form_phone_number" />
+                                <input
+                                    id="contactus_form_phone_number"
+                                    type="text"
+                                    name="partner_phone"
+                                    class="form-control s_website_form_input"
+                                    placeholder="0041244342124"
+                                    required="required"
                                 />
                             </t>
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">E-mail</t>
-                                <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3 s_website_form_field'"/>
-                                <t t-set="input_id" t-value="contactus_form_email"/>
-                                <input id="contactus_form_email" type="email"
-                                       name="email_from" class="form-control s_website_form_input"
-                                       placeholder="info@compassion.ch"
-                                       required="required"
+                                <t t-set="label_color" t-value="'pure-white'" />
+                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3 s_website_form_field'" />
+                                <t t-set="input_id" t-value="contactus_form_email" />
+                                <input
+                                    id="contactus_form_email"
+                                    type="email"
+                                    name="email_from"
+                                    class="form-control s_website_form_input"
+                                    placeholder="info@compassion.ch"
+                                    required="required"
                                 />
                             </t>
-                        <!-- Subject -->
+                            <!-- Subject -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Subject</t>
-                                <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12 s_website_form_field'"/>
-                                <t t-set="input_id" t-value="contactus_subject"/>
-                                <input id="contactus_subject"
-                                       type="text" name="name"
-                                       class="form-control s_website_form_input"
-                                       placeholder="Request subject"
-                                       required="required"
+                                <t t-set="label_color" t-value="'pure-white'" />
+                                <t t-set="top_class" t-value="'col-12 s_website_form_field'" />
+                                <t t-set="input_id" t-value="contactus_subject" />
+                                <input
+                                    id="contactus_subject"
+                                    type="text"
+                                    name="name"
+                                    class="form-control s_website_form_input"
+                                    placeholder="Request subject"
+                                    required="required"
                                 />
                             </t>
                             <!-- Message -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Message</t>
-                                <t t-set="label_color" t-value="'pure-white'"/>
-                                <t t-set="top_class" t-value="'col-12 mb-3 s_website_form_field'"/>
-                                <t t-set="input_id" t-value="contactus_message"/>
-                                <textarea id="contactus_message" name="description"
-                                       class="form-control s_website_form_input"
-                                       required="required"
-                                       rows="4"
+                                <t t-set="label_color" t-value="'pure-white'" />
+                                <t t-set="top_class" t-value="'col-12 mb-3 s_website_form_field'" />
+                                <t t-set="input_id" t-value="contactus_message" />
+                                <textarea
+                                    id="contactus_message"
+                                    name="description"
+                                    class="form-control s_website_form_input"
+                                    required="required"
+                                    rows="4"
                                 />
                             </t>
                             <!-- csrf token -->
-                            <input
-                                    type="hidden" 
-                                    name="csrf_token"
-                                    t-att-value="request.csrf_token()"
-                            />
+                            <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()" />
                             <div class="col-12 text-center">
-                                <div id="s_website_form_result"></div>
+                                <div id="s_website_form_result" />
                             </div>
                             <!-- Contact us button -->
                             <div class="w-100 mt-3 d-flex justify-content-center">
-                            <t t-call="theme_compassion_2025.ThemedButtonComponent">
-                                <t t-set="variant" t-value="'compact'"/>
-                                <t t-set="variation" t-value="'filled'"/>
-                                <t t-set="label">Send the message</t>
-                                <t t-set="color" t-value="'pure-white'"/>
-                                <t t-set="text_color" t-value="'core-blue'"/>
-                                <t t-set="add_class" t-value="'s_website_form_send'"/>
-                            </t>
+                                <t t-call="theme_compassion_2025.ThemedButtonComponent">
+                                    <t t-set="variant" t-value="'compact'" />
+                                    <t t-set="variation" t-value="'filled'" />
+                                    <t t-set="label">Send the message</t>
+                                    <t t-set="color" t-value="'pure-white'" />
+                                    <t t-set="text_color" t-value="'core-blue'" />
+                                    <t t-set="add_class" t-value="'s_website_form_send'" />
+                                </t>
                             </div>
                         </div>
                     </form>
@@ -186,4 +196,4 @@ Page My Compassion 2 Contact us page
             </div>
         </xpath>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/my_compassion/templates/pages/my2_contactus_thank_you.xml b/my_compassion/templates/pages/my2_contactus_thank_you.xml
new file mode 100644
index 000000000..1ebe658ce
--- /dev/null
+++ b/my_compassion/templates/pages/my2_contactus_thank_you.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Page My Compassion 2 Contact us  thank you page
+
+    Description:
+    This page is the thank you page which is displayed as soon as
+    users have submitted a message via the contact us page.
+
+    Used in route:
+    -/my2-contactus-thank-you
+-->
+<odoo>
+    <record id="my2_contactus_thanks" model="ir.ui.view">
+        <field name="name">My Custom Contact Thanks</field>
+        <field name="type">qweb</field>
+        <field name="key">my2_compassion.contact_us_thank_you</field>
+        <field name="arch" type="xml">
+            <t t-name="my_compassion.contact_us_thank_you">
+                <t t-call="website.layout">
+                    <div id="wrap" class="h-100 d-flex align-content-center">
+                        <div class="d-flex flex-column w-100 justify-content-center align-items-center">
+                            <t t-call="theme_compassion_2025.TitleComponent">
+                                <t t-set="title_content">Thank You!</t>
+                                <t t-set="title_size" t-value="'md'"/>
+                                <t t-set="color" t-value="'core-blue'"/>
+                                <t t-set="underline_color" t-value="'low-yellow'"/>
+                                <t t-set="show_underline" t-value="True"/>
+                                <h5 class="text-center">
+                                    <span>Your message has been sent successfully</span>
+                                </h5>
+                                <p class="text-center mb-5">We will get back to you shortly.</p>
+                            </t>
+                            <div id="spacer-div-contact-us-thank-you" class="m-3"/>
+                            <t t-call="theme_compassion_2025.ThemedButtonComponent">
+                                <t t-set="variation" t-value="'filled'"/>
+                                <t t-set="color" t-value="'low-blue'"/>
+                                <t t-set="text_color" t-value="'white'"/>
+                                <t t-set="variant" t-value="'default'"/>
+                                <t t-set="label">Back to home</t>
+                                <t t-set="href" t-value="'/'"/>
+                            </t>
+                        </div>
+                    </div>
+                </t>
+            </t>
+        </field>
+    </record>
+
+    <record id="my_custom_thanks_page" model="website.page">
+        <field name="name">My2 Contact Us Thank You</field>
+        <field name="url">/my2-contactus-thank-you</field>
+        <field name="view_id" ref="my2_contactus_thanks"/>
+        <field name="is_published">True</field>
+        <field name="website_indexed" eval="False"/>
+    </record>
+</odoo>
\ No newline at end of file

From 783d4cad7b03bbb86a0351b7822bb03a33bf9b3d Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Fri, 6 Feb 2026 12:29:53 +0100
Subject: [PATCH 05/12] [T2932] STYLE: GCA suggestions and formatting

---
 .../templates/pages/my2_contact_us.xml        | 35 ++++++++-----------
 .../pages/my2_contactus_thank_you.xml         | 29 ++++++++-------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index 870aa42ad..c713383a0 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -61,23 +61,11 @@ Page My Compassion 2 Contact us page
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="top_class" t-value="'col-12 mb-3'" />
                                 <div class="form-check form-check-inline">
-                                    <input
-                                        class="form-check-input js_combine_name"
-                                        type="radio"
-                                        name="title"
-                                        id="mrs"
-                                        value="Mrs."
-                                    />
+                                    <input class="form-check-input" type="radio" name="title" id="mrs" value="Mrs." />
                                     <label class="form-check-label text-pure-white" for="mrs">Mrs.</label>
                                 </div>
                                 <div class="form-check form-check-inline">
-                                    <input
-                                        class="form-check-input js_combine_name"
-                                        type="radio"
-                                        name="title"
-                                        id="mr"
-                                        value="Mr."
-                                    />
+                                    <input class="form-check-input" type="radio" name="title" id="mr" value="Mr." />
                                     <label class="form-check-label text-pure-white" for="mr">Mr.</label>
                                 </div>
                             </t>
@@ -94,7 +82,7 @@ Page My Compassion 2 Contact us page
                                     id="contactus_form_firstname"
                                     type="text"
                                     name="firstname"
-                                    class="form-control js_combine_name s_website_form_input"
+                                    class="form-control s_website_form_input"
                                     placeholder="First Name"
                                     required="required"
                                 />
@@ -111,7 +99,7 @@ Page My Compassion 2 Contact us page
                                     id="contactus_form_lastname"
                                     type="text"
                                     name="lastname"
-                                    class="form-control js_combine_name s_website_form_input"
+                                    class="form-control s_website_form_input"
                                     placeholder="Last Name"
                                     required="required"
                                 />
@@ -124,17 +112,19 @@ Page My Compassion 2 Contact us page
                                 <t t-set="input_id" t-value="contactus_form_phone_number" />
                                 <input
                                     id="contactus_form_phone_number"
-                                    type="text"
+                                    type="tel"
                                     name="partner_phone"
                                     class="form-control s_website_form_input"
                                     placeholder="0041244342124"
-                                    required="required"
                                 />
                             </t>
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">E-mail</t>
                                 <t t-set="label_color" t-value="'pure-white'" />
-                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3 s_website_form_field'" />
+                                <t
+                                    t-set="top_class"
+                                    t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
+                                />
                                 <t t-set="input_id" t-value="contactus_form_email" />
                                 <input
                                     id="contactus_form_email"
@@ -149,7 +139,7 @@ Page My Compassion 2 Contact us page
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Subject</t>
                                 <t t-set="label_color" t-value="'pure-white'" />
-                                <t t-set="top_class" t-value="'col-12 s_website_form_field'" />
+                                <t t-set="top_class" t-value="'col-12 s_website_form_field s_website_form_required'" />
                                 <t t-set="input_id" t-value="contactus_subject" />
                                 <input
                                     id="contactus_subject"
@@ -164,7 +154,10 @@ Page My Compassion 2 Contact us page
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Message</t>
                                 <t t-set="label_color" t-value="'pure-white'" />
-                                <t t-set="top_class" t-value="'col-12 mb-3 s_website_form_field'" />
+                                <t
+                                    t-set="top_class"
+                                    t-value="'col-12 mb-3 s_website_form_field s_website_form_required'"
+                                />
                                 <t t-set="input_id" t-value="contactus_message" />
                                 <textarea
                                     id="contactus_message"
diff --git a/my_compassion/templates/pages/my2_contactus_thank_you.xml b/my_compassion/templates/pages/my2_contactus_thank_you.xml
index 1ebe658ce..f535e53bd 100644
--- a/my_compassion/templates/pages/my2_contactus_thank_you.xml
+++ b/my_compassion/templates/pages/my2_contactus_thank_you.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
 Page My Compassion 2 Contact us  thank you page
 
@@ -21,23 +21,23 @@ Page My Compassion 2 Contact us  thank you page
                         <div class="d-flex flex-column w-100 justify-content-center align-items-center">
                             <t t-call="theme_compassion_2025.TitleComponent">
                                 <t t-set="title_content">Thank You!</t>
-                                <t t-set="title_size" t-value="'md'"/>
-                                <t t-set="color" t-value="'core-blue'"/>
-                                <t t-set="underline_color" t-value="'low-yellow'"/>
-                                <t t-set="show_underline" t-value="True"/>
+                                <t t-set="title_size" t-value="'md'" />
+                                <t t-set="color" t-value="'core-blue'" />
+                                <t t-set="underline_color" t-value="'low-yellow'" />
+                                <t t-set="show_underline" t-value="True" />
                                 <h5 class="text-center">
                                     <span>Your message has been sent successfully</span>
                                 </h5>
                                 <p class="text-center mb-5">We will get back to you shortly.</p>
                             </t>
-                            <div id="spacer-div-contact-us-thank-you" class="m-3"/>
+                            <div id="spacer-div-contact-us-thank-you" class="m-3" />
                             <t t-call="theme_compassion_2025.ThemedButtonComponent">
-                                <t t-set="variation" t-value="'filled'"/>
-                                <t t-set="color" t-value="'low-blue'"/>
-                                <t t-set="text_color" t-value="'white'"/>
-                                <t t-set="variant" t-value="'default'"/>
+                                <t t-set="variation" t-value="'filled'" />
+                                <t t-set="color" t-value="'low-blue'" />
+                                <t t-set="text_color" t-value="'white'" />
+                                <t t-set="variant" t-value="'default'" />
                                 <t t-set="label">Back to home</t>
-                                <t t-set="href" t-value="'/'"/>
+                                <t t-set="href" t-value="'/'" />
                             </t>
                         </div>
                     </div>
@@ -45,12 +45,11 @@ Page My Compassion 2 Contact us  thank you page
             </t>
         </field>
     </record>
-
     <record id="my_custom_thanks_page" model="website.page">
         <field name="name">My2 Contact Us Thank You</field>
         <field name="url">/my2-contactus-thank-you</field>
-        <field name="view_id" ref="my2_contactus_thanks"/>
+        <field name="view_id" ref="my2_contactus_thanks" />
         <field name="is_published">True</field>
-        <field name="website_indexed" eval="False"/>
+        <field name="website_indexed" eval="False" />
     </record>
-</odoo>
\ No newline at end of file
+</odoo>

From 3f8643188265b77df21b56883925860d8f1575d2 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Fri, 6 Feb 2026 14:02:50 +0100
Subject: [PATCH 06/12] [T2932] STYLE: pre-commit and merge conflict fixes

---
 my_compassion/i18n/de.po                         | 10 ++--------
 my_compassion/i18n/fr_CH.po                      |  9 ++-------
 my_compassion/i18n/it.po                         |  6 +-----
 my_compassion/templates/pages/my2_contact_us.xml |  7 +++++--
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/my_compassion/i18n/de.po b/my_compassion/i18n/de.po
index 13495b3c9..01d4eeb29 100644
--- a/my_compassion/i18n/de.po
+++ b/my_compassion/i18n/de.po
@@ -1695,11 +1695,6 @@ msgstr ""
 msgid "Download your tax receipt"
 msgstr "Steuerbescheinigung herunterladen"
 
-#. module: my_compassion
-#: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_sponsorship_wizard_user_details
-msgid "E-mail"
-msgstr "E-Mail"
-
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gift_package_content
 msgid "Edit Details"
@@ -4589,7 +4584,7 @@ msgstr "Schwestern"
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.sponsor_a_child
 msgid "this link"
-msgstr "Klicke hier, um eine Patenschaft zu beginnen"
+msgstr "dieser Link"
 
 #~ msgid "No sponsor found with this reference. Please try again."
 #~ msgstr ""
@@ -4648,7 +4643,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_sponsorship_wizard_user_details
 msgid "E-mail"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
@@ -4693,7 +4688,6 @@ msgstr ""
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "We will get back to you shortly."
 msgstr ""
-msgstr "dieser Link"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_timeline_page
diff --git a/my_compassion/i18n/fr_CH.po b/my_compassion/i18n/fr_CH.po
index 69c6476e8..cfac9b16f 100644
--- a/my_compassion/i18n/fr_CH.po
+++ b/my_compassion/i18n/fr_CH.po
@@ -1655,10 +1655,6 @@ msgstr ""
 msgid "Download your tax receipt"
 msgstr "Télécharger votre attestation fiscale"
 
-#. module: my_compassion
-#: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_sponsorship_wizard_user_details
-msgid "E-mail"
-msgstr "E-mail"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gift_package_content
@@ -4537,7 +4533,7 @@ msgstr "sœurs"
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.sponsor_a_child
 msgid "this link"
-msgstr "en cliquant ici"
+msgstr "ce lien"
 
 #~ msgid "No sponsor found with this reference. Please try again."
 #~ msgstr ""
@@ -4595,7 +4591,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_sponsorship_wizard_user_details
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
@@ -4640,7 +4636,6 @@ msgstr ""
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "We will get back to you shortly."
 msgstr ""
-msgstr "ce lien"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_timeline_page
diff --git a/my_compassion/i18n/it.po b/my_compassion/i18n/it.po
index ca64932d5..28925b168 100644
--- a/my_compassion/i18n/it.po
+++ b/my_compassion/i18n/it.po
@@ -1714,10 +1714,6 @@ msgstr ""
 msgid "Download your tax receipt"
 msgstr "Scarica la tua ricevuta fiscale"
 
-#. module: my_compassion
-#: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_sponsorship_wizard_user_details
-msgid "E-mail"
-msgstr "E-mail"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gift_package_content
@@ -4642,7 +4638,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_sponsorship_wizard_user_details
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index c713383a0..3c4ffd72e 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -11,8 +11,11 @@ Page My Compassion 2 Contact us page
 -->
 <odoo>
     <template id="my2_contactus_page" inherit_id="website.contactus" name="My Compassion 2 Contact us page">
-        <xpath expr="//div[@id='wrap']" position="replace">
-            <div id="wrap" class="oe_structure">
+        <xpath expr="//div[@id='wrap']" position="attributes">
+            <attribute name="class" add="d-none" separator=" " />
+        </xpath>
+        <xpath expr="//div[@id='wrap']" position="after">
+            <div id="wrap_custom" class="oe_structure">
                 <div class="container">
                     <div class="single-column pt-3">
                         <t t-call="theme_compassion_2025.TitleComponent">

From cace5bc280e5a2fc2104b4b516caea77b07411a6 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Fri, 6 Feb 2026 14:12:10 +0100
Subject: [PATCH 07/12] [T2932] REFACTOR: GCA suggestions

- REFACTOR: removed unused hidden contact us full name input
---
 my_compassion/templates/pages/my2_contact_us.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index 3c4ffd72e..4292d7a75 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -53,13 +53,6 @@ Page My Compassion 2 Contact us page
                         role="form"
                     >
                         <div class="row text-left">
-                            <input
-                                type="hidden"
-                                name="Your Name"
-                                id="contact_us_full_name"
-                                class="s_website_form_input"
-                                value=""
-                            />
                             <!-- Title Mr. or Mrs -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="top_class" t-value="'col-12 mb-3'" />

From 8fac4804e508a68f6b1c322feae050586397f235 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Mon, 9 Feb 2026 16:08:55 +0100
Subject: [PATCH 08/12] [T2932] FIX: removed placeholder for email in contact
 form

---
 my_compassion/templates/pages/my2_contact_us.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index 4292d7a75..37bdcec1d 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -127,7 +127,6 @@ Page My Compassion 2 Contact us page
                                     type="email"
                                     name="email_from"
                                     class="form-control s_website_form_input"
-                                    placeholder="info@compassion.ch"
                                     required="required"
                                 />
                             </t>

From cc27e15d5b568160192b9890279e90fa9af41c48 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Tue, 10 Feb 2026 07:17:15 +0100
Subject: [PATCH 09/12] [T2932] STYLE: removed commented out .po translations

---
 my_compassion/i18n/de.po    | 19 -------------------
 my_compassion/i18n/fr_CH.po | 19 -------------------
 2 files changed, 38 deletions(-)

diff --git a/my_compassion/i18n/de.po b/my_compassion/i18n/de.po
index 01d4eeb29..85147d2d6 100644
--- a/my_compassion/i18n/de.po
+++ b/my_compassion/i18n/de.po
@@ -4586,25 +4586,6 @@ msgstr "Schwestern"
 msgid "this link"
 msgstr "dieser Link"
 
-#~ msgid "No sponsor found with this reference. Please try again."
-#~ msgstr ""
-#~ "Für diese Referenz wurde kein Sponsor gefunden. Bitte versuche es erneut."
-
-#~ msgid "Put any known reference here for matching with your account..."
-#~ msgstr ""
-#~ "Gib hier alle bekannten Referenzen ein, um sie mit deinem Konto "
-#~ "abzugleichen..."
-
-#~ msgid ""
-#~ "The email address you entered is not the same as the one in the system. "
-#~ "Please try again."
-#~ msgstr ""
-#~ "Die E-Mail-Adresse, die du eingegeben hast, stimmt nicht mit der im "
-#~ "System überein. Bitte versuche es erneut."
-
-#~ msgid "Your sponsor or child reference"
-#~ msgstr "Dein Pate oder dein Kind - Referenznummer"
-
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
diff --git a/my_compassion/i18n/fr_CH.po b/my_compassion/i18n/fr_CH.po
index cfac9b16f..3f7ead8b4 100644
--- a/my_compassion/i18n/fr_CH.po
+++ b/my_compassion/i18n/fr_CH.po
@@ -4535,25 +4535,6 @@ msgstr "sœurs"
 msgid "this link"
 msgstr "ce lien"
 
-#~ msgid "No sponsor found with this reference. Please try again."
-#~ msgstr ""
-#~ "Aucun parrain n'a été trouvé pour cette référence. Veuillez réessayer."
-
-#~ msgid "Put any known reference here for matching with your account..."
-#~ msgstr ""
-#~ "Mettez ici toute référence connue pour qu'elle corresponde à votre "
-#~ "compte..."
-
-#~ msgid ""
-#~ "The email address you entered is not the same as the one in the system. "
-#~ "Please try again."
-#~ msgstr ""
-#~ "L'adresse électronique que vous avez saisie n'est pas la même que celle "
-#~ "qui figure dans le système. Veuillez réessayer."
-
-#~ msgid "Your sponsor or child reference"
-#~ msgstr "Votre référence parrain ou enfant"
-
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Get in touch"

From 77eaa75240cb1adf727626385c6d0a9422bb832c Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Wed, 11 Feb 2026 12:16:17 +0100
Subject: [PATCH 10/12] [T2932] REFACTOR: added support to new global form
 field validation

- REFACTOR: added dark-bg to input fields and data-validate-type attributes
- FIX: name/email/phone fields now shift down if their counterpart has an error fixing the uneven display problem
---
 .../templates/pages/my2_contact_us.xml        | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index 37bdcec1d..2426429f9 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -71,16 +71,17 @@ Page My Compassion 2 Contact us page
                                 <t t-set="label_color" t-value="'pure-white'" />
                                 <t
                                     t-set="top_class"
-                                    t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
+                                    t-value="' d-flex flex-column col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
                                 />
                                 <t t-set="input_id" t-value="contactus_form_firstname" />
                                 <input
                                     id="contactus_form_firstname"
                                     type="text"
                                     name="firstname"
-                                    class="form-control s_website_form_input"
+                                    class="form-control s_website_form_input dark-bg mt-auto"
                                     placeholder="First Name"
-                                    required="required"
+                                    data-validate-type="name"
+                                    required=""
                                 />
                             </t>
                             <t t-call="theme_compassion_2025.FormFieldComponent">
@@ -88,30 +89,35 @@ Page My Compassion 2 Contact us page
                                 <t t-set="label_color" t-value="'pure-white'" />
                                 <t
                                     t-set="top_class"
-                                    t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
+                                    t-value="'d-flex flex-column col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
                                 />
                                 <t t-set="input_id" t-value="contactus_form_lastname" />
                                 <input
                                     id="contactus_form_lastname"
                                     type="text"
                                     name="lastname"
-                                    class="form-control s_website_form_input"
+                                    class="form-control s_website_form_input dark-bg mt-auto"
                                     placeholder="Last Name"
-                                    required="required"
+                                    data-validate-type="name"
+                                    required=""
                                 />
                             </t>
                             <!-- Phone number and E-mail -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Phone number</t>
                                 <t t-set="label_color" t-value="'pure-white'" />
-                                <t t-set="top_class" t-value="'col-12 col-md-6 mb-3 s_website_form_field'" />
+                                <t
+                                    t-set="top_class"
+                                    t-value="'d-flex flex-column col-12 col-md-6 mb-3 s_website_form_field'"
+                                />
                                 <t t-set="input_id" t-value="contactus_form_phone_number" />
                                 <input
                                     id="contactus_form_phone_number"
                                     type="tel"
                                     name="partner_phone"
-                                    class="form-control s_website_form_input"
+                                    class="form-control s_website_form_input dark-bg mt-auto"
                                     placeholder="0041244342124"
+                                    data-validate-type="phone"
                                 />
                             </t>
                             <t t-call="theme_compassion_2025.FormFieldComponent">
@@ -119,15 +125,16 @@ Page My Compassion 2 Contact us page
                                 <t t-set="label_color" t-value="'pure-white'" />
                                 <t
                                     t-set="top_class"
-                                    t-value="'col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
+                                    t-value="'d-flex flex-column col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
                                 />
                                 <t t-set="input_id" t-value="contactus_form_email" />
                                 <input
                                     id="contactus_form_email"
                                     type="email"
                                     name="email_from"
-                                    class="form-control s_website_form_input"
-                                    required="required"
+                                    class="form-control s_website_form_input dark-bg mt-auto"
+                                    data-validate-type="email"
+                                    required=""
                                 />
                             </t>
                             <!-- Subject -->
@@ -140,9 +147,9 @@ Page My Compassion 2 Contact us page
                                     id="contactus_subject"
                                     type="text"
                                     name="name"
-                                    class="form-control s_website_form_input"
+                                    class="form-control s_website_form_input dark-bg"
                                     placeholder="Request subject"
-                                    required="required"
+                                    required=""
                                 />
                             </t>
                             <!-- Message -->
@@ -157,8 +164,8 @@ Page My Compassion 2 Contact us page
                                 <textarea
                                     id="contactus_message"
                                     name="description"
-                                    class="form-control s_website_form_input"
-                                    required="required"
+                                    class="form-control s_website_form_input dark-bg"
+                                    required=""
                                     rows="4"
                                 />
                             </t>

From 2141d42f5615e0023ef19ccd2d2e3168f15af29f Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Wed, 11 Feb 2026 13:55:57 +0100
Subject: [PATCH 11/12] [T2932] FIX: GCA suggestions & translations

- FIX: contact us form label ids are now correctly set
- FIX: contact us thank you form has correct key
- FEAT: contact us translations updated
---
 my_compassion/i18n/de.po                      | 31 +++++++++++--------
 my_compassion/i18n/fr_CH.po                   | 29 +++++++++--------
 my_compassion/i18n/it.po                      | 30 ++++++++++--------
 .../templates/pages/my2_contact_us.xml        | 15 +++++----
 .../pages/my2_contactus_thank_you.xml         |  2 +-
 5 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/my_compassion/i18n/de.po b/my_compassion/i18n/de.po
index 85147d2d6..12b6e6189 100644
--- a/my_compassion/i18n/de.po
+++ b/my_compassion/i18n/de.po
@@ -4590,7 +4590,7 @@ msgstr "dieser Link"
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Get in touch"
-msgstr ""
+msgstr "Kontaktiere uns"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
@@ -4599,26 +4599,31 @@ msgid ""
 "                                work? Fill out the form below, and we'll get back to\n"
 "                                you as soon as possible."
 msgstr ""
+"Haben Sie eine Frage oder möchten Sie mehr über\n"
+"                                unsere Arbeit erfahren? Füllen Sie das\n"
+"                                untenstehende Formular aus und wir melden uns\n"
+"                                so schnell wie möglich bei Ihnen."
+
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Mrs."
-msgstr ""
+msgstr "Frau"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Mr."
-msgstr ""
+msgstr "Herr"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "First Name"
-msgstr ""
+msgstr "Vorname"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Last Name"
-msgstr ""
+msgstr "Nachname"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
@@ -4629,46 +4634,46 @@ msgstr "E-Mail"
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Subject"
-msgstr ""
+msgstr "Betreff"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Request subject"
-msgstr ""
+msgstr "Anfragebetreff"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Message"
-msgstr ""
+msgstr "Nachricht"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Send the message"
-msgstr ""
+msgstr "Nachricht senden"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "<span>Your message has been sent successfully</span>"
-msgstr ""
+msgstr "<span>Deine Nachricht wurde erfolgreich gesendet</span>"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "Back to home"
-msgstr ""
+msgstr "Zurück zur Startseite"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "Thank You!"
-msgstr ""
+msgstr "Vielen Dank!"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "We will get back to you shortly."
-msgstr ""
+msgstr "Wir werden uns in Kürze bei dir melden."
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_timeline_page
diff --git a/my_compassion/i18n/fr_CH.po b/my_compassion/i18n/fr_CH.po
index 3f7ead8b4..abc26d7c6 100644
--- a/my_compassion/i18n/fr_CH.po
+++ b/my_compassion/i18n/fr_CH.po
@@ -4538,7 +4538,7 @@ msgstr "ce lien"
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Get in touch"
-msgstr ""
+msgstr "Contactez-nous"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
@@ -4547,26 +4547,29 @@ msgid ""
 "                                work? Fill out the form below, and we'll get back to\n"
 "                                you as soon as possible."
 msgstr ""
+"Avez-vous une question ou souhaitez-vous en savoir plus sur notre\n"
+ "                               travail ? Remplissez le formulaire ci-dessous,\n"
+ "                               et nous vous répondrons dès que possible."
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Mrs."
-msgstr ""
+msgstr "Madame"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Mr."
-msgstr ""
+msgstr "Monsieur"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "First Name"
-msgstr ""
+msgstr "Prénom"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Last Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
@@ -4577,46 +4580,46 @@ msgstr "E-mail"
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Subject"
-msgstr ""
+msgstr "Objet"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Request subject"
-msgstr ""
+msgstr "Objet de la demande"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Message"
-msgstr ""
+msgstr "Message"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Send the message"
-msgstr ""
+msgstr "Envoyer le message"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "<span>Your message has been sent successfully</span>"
-msgstr ""
+msgstr "<span>Votre message a été envoyé avec succès</span>"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "Back to home"
-msgstr ""
+msgstr "Retour à l'accueil"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "Thank You!"
-msgstr ""
+msgstr "Merci!"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "We will get back to you shortly."
-msgstr ""
+msgstr "Nous vous répondrons dans les plus brefs délais."
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_timeline_page
diff --git a/my_compassion/i18n/it.po b/my_compassion/i18n/it.po
index 28925b168..340ccf394 100644
--- a/my_compassion/i18n/it.po
+++ b/my_compassion/i18n/it.po
@@ -4604,7 +4604,7 @@ msgstr "questo link"
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Get in touch"
-msgstr ""
+msgstr "Contattaci"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
@@ -4613,26 +4613,29 @@ msgid ""
 "                                work? Fill out the form below, and we'll get back to\n"
 "                                you as soon as possible."
 msgstr ""
+"Hai una domanda o desideri saperne di più sul nostro lavoro?\n"
+"                                Compila il modulo sottostante e ti risponderemo\n"
+"                                il prima possibile."
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Mrs."
-msgstr ""
+msgstr "Signora"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Mr."
-msgstr ""
+msgstr "Signore"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "First Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Last Name"
-msgstr ""
+msgstr "Cognome"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
@@ -4643,46 +4646,47 @@ msgstr "E-mail"
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Subject"
-msgstr ""
+msgstr "Oggetto"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Request subject"
-msgstr ""
+msgstr "Oggetto della richiesta"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Message"
-msgstr ""
+msgstr "Messaggio"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_page
 msgid "Send the message"
-msgstr ""
+msgstr "Invia il messaggio"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "<span>Your message has been sent successfully</span>"
-msgstr ""
+msgstr "<span>Il tuo messaggio è stato inviato con successo</span>"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "Back to home"
-msgstr ""
+msgstr "Pagina iniziale"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "Thank You!"
-msgstr ""
+msgstr "Grazie!"
 
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_contactus_thanks
 #: model_terms:website.page,arch_db:my_compassion.my_custom_thanks_page
 msgid "We will get back to you shortly."
-msgstr ""
+msgstr "Ti ricontatteremo al più presto."
+
 #. module: my_compassion
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_timeline_page
 msgid "with"
diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index 2426429f9..b5fae49cb 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -73,7 +73,7 @@ Page My Compassion 2 Contact us page
                                     t-set="top_class"
                                     t-value="' d-flex flex-column col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
                                 />
-                                <t t-set="input_id" t-value="contactus_form_firstname" />
+                                <t t-set="input_id" t-value="'contactus_form_firstname'" />
                                 <input
                                     id="contactus_form_firstname"
                                     type="text"
@@ -91,7 +91,7 @@ Page My Compassion 2 Contact us page
                                     t-set="top_class"
                                     t-value="'d-flex flex-column col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
                                 />
-                                <t t-set="input_id" t-value="contactus_form_lastname" />
+                                <t t-set="input_id" t-value="'contactus_form_lastname'" />
                                 <input
                                     id="contactus_form_lastname"
                                     type="text"
@@ -110,7 +110,7 @@ Page My Compassion 2 Contact us page
                                     t-set="top_class"
                                     t-value="'d-flex flex-column col-12 col-md-6 mb-3 s_website_form_field'"
                                 />
-                                <t t-set="input_id" t-value="contactus_form_phone_number" />
+                                <t t-set="input_id" t-value="'contactus_form_phone_number'" />
                                 <input
                                     id="contactus_form_phone_number"
                                     type="tel"
@@ -127,7 +127,7 @@ Page My Compassion 2 Contact us page
                                     t-set="top_class"
                                     t-value="'d-flex flex-column col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
                                 />
-                                <t t-set="input_id" t-value="contactus_form_email" />
+                                <t t-set="input_id" t-value="'contactus_form_email'" />
                                 <input
                                     id="contactus_form_email"
                                     type="email"
@@ -141,7 +141,10 @@ Page My Compassion 2 Contact us page
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">Subject</t>
                                 <t t-set="label_color" t-value="'pure-white'" />
-                                <t t-set="top_class" t-value="'col-12 s_website_form_field s_website_form_required'" />
+                                <t
+                                    t-set="top_class"
+                                    t-value="'col-12 s_website_form_field mb-3 s_website_form_required'"
+                                />
                                 <t t-set="input_id" t-value="contactus_subject" />
                                 <input
                                     id="contactus_subject"
@@ -160,7 +163,7 @@ Page My Compassion 2 Contact us page
                                     t-set="top_class"
                                     t-value="'col-12 mb-3 s_website_form_field s_website_form_required'"
                                 />
-                                <t t-set="input_id" t-value="contactus_message" />
+                                <t t-set="input_id" t-value="'contactus_message'" />
                                 <textarea
                                     id="contactus_message"
                                     name="description"
diff --git a/my_compassion/templates/pages/my2_contactus_thank_you.xml b/my_compassion/templates/pages/my2_contactus_thank_you.xml
index f535e53bd..5eaeb1bed 100644
--- a/my_compassion/templates/pages/my2_contactus_thank_you.xml
+++ b/my_compassion/templates/pages/my2_contactus_thank_you.xml
@@ -13,7 +13,7 @@ Page My Compassion 2 Contact us  thank you page
     <record id="my2_contactus_thanks" model="ir.ui.view">
         <field name="name">My Custom Contact Thanks</field>
         <field name="type">qweb</field>
-        <field name="key">my2_compassion.contact_us_thank_you</field>
+        <field name="key">my_compassion.contact_us_thank_you</field>
         <field name="arch" type="xml">
             <t t-name="my_compassion.contact_us_thank_you">
                 <t t-call="website.layout">

From 6b741e6161ca438982ef2c4fe814f11f1db14443 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Wed, 11 Feb 2026 18:05:10 +0100
Subject: [PATCH 12/12] [T2932] REFACTOR: added dynamic title field to contact
 us form

- REFACTOR: created contact us controller to fetch and inject titles from the db
- REFACTOR: replaced hard coded mrs/mr input selectors to a dynamic dropdown
---
 my_compassion/controllers/__init__.py         |  1 +
 my_compassion/controllers/my2_contact_us.py   | 13 +++++++
 .../templates/pages/my2_contact_us.xml        | 36 +++++++++++++------
 3 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 my_compassion/controllers/my2_contact_us.py

diff --git a/my_compassion/controllers/__init__.py b/my_compassion/controllers/__init__.py
index 15e24156f..286371488 100644
--- a/my_compassion/controllers/__init__.py
+++ b/my_compassion/controllers/__init__.py
@@ -24,4 +24,5 @@
     my2_event_banner,
     my2_home_redirect,
     my2_portal,
+    my2_contact_us,
 )
diff --git a/my_compassion/controllers/my2_contact_us.py b/my_compassion/controllers/my2_contact_us.py
new file mode 100644
index 000000000..ad8b6802f
--- /dev/null
+++ b/my_compassion/controllers/my2_contact_us.py
@@ -0,0 +1,13 @@
+from odoo import http
+from odoo.http import request
+
+
+class ContactUsPageController(http.Controller):
+    @http.route("/contactus", type="http", auth="public", website=True, sitemap=True)
+    def contactus(self, **kwargs):
+        titles = (
+            request.env["res.partner.title"]
+            .sudo()
+            .search([("is_published", "=", True)], order="shortcut asc")
+        )
+        return request.render("website.contactus", {"titles": titles})
diff --git a/my_compassion/templates/pages/my2_contact_us.xml b/my_compassion/templates/pages/my2_contact_us.xml
index b5fae49cb..37520d36c 100644
--- a/my_compassion/templates/pages/my2_contact_us.xml
+++ b/my_compassion/templates/pages/my2_contact_us.xml
@@ -54,17 +54,31 @@ Page My Compassion 2 Contact us page
                     >
                         <div class="row text-left">
                             <!-- Title Mr. or Mrs -->
-                            <t t-call="theme_compassion_2025.FormFieldComponent">
-                                <t t-set="top_class" t-value="'col-12 mb-3'" />
-                                <div class="form-check form-check-inline">
-                                    <input class="form-check-input" type="radio" name="title" id="mrs" value="Mrs." />
-                                    <label class="form-check-label text-pure-white" for="mrs">Mrs.</label>
-                                </div>
-                                <div class="form-check form-check-inline">
-                                    <input class="form-check-input" type="radio" name="title" id="mr" value="Mr." />
-                                    <label class="form-check-label text-pure-white" for="mr">Mr.</label>
-                                </div>
-                            </t>
+                            <div class="w-100">
+                                <t t-call="theme_compassion_2025.FormFieldComponent">
+                                    <t t-set="label">Title</t>
+                                    <t t-set="label_color" t-value="'pure-white'" />
+                                    <t
+                                        t-set="top_class"
+                                        t-value="' d-flex flex-column col-12 col-md-6 mb-3 s_website_form_field s_website_form_required'"
+                                    />
+                                    <t t-set="input_id" t-value="'contactus_form_firstname'" />
+                                    <t t-call="theme_compassion_2025.SelectComponent">
+                                        <t t-set="id" t-value="'title'" />
+                                        <t t-set="name" t-value="'title'" />
+                                        <t t-set="select_class" t-value="'bg-white'" />
+                                        <t t-set="required" t-value="True" />
+                                        <option value="" disabled="disabled" selected="selected" hidden="true">
+                                            Please Select
+                                        </option>
+                                        <t t-foreach="titles" t-as="t">
+                                            <option t-att-value="t.id">
+                                                <t t-esc="t.name" />
+                                            </option>
+                                        </t>
+                                    </t>
+                                </t>
+                            </div>
                             <!-- First Name and Last Name -->
                             <t t-call="theme_compassion_2025.FormFieldComponent">
                                 <t t-set="label">First Name</t>