From 57f83783d08d4138b8584ef1901a3bc586314338 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Wed, 25 Feb 2026 16:03:07 +0100
Subject: [PATCH 1/9] [T3022] REFACTOR: theme 2025 survey override

- REFACTOR: changed survey route intercept from my to my2
- FEAT: survey_template now overrides default survey with 2025 theme components
- CHORE: added theme_compassion_2025 to my_compassion_segmentation dependencies
- REFACTOR: overriding default odoo survey styling
- FEAT: added optional type and value to themed button
---
 my_compassion_segmentation/__manifest__.py    |   1 +
 .../controllers/my_account.py                 |   2 +-
 .../templates/survey_templates.xml            | 101 +++++++++++++++++-
 .../src/scss/components/_survey_form.scss     |  79 ++++++++++++++
 .../components/buttons/ThemedButton.xml       |   4 +
 theme_compassion_2025/views/assets.xml        |   5 +
 6 files changed, 188 insertions(+), 4 deletions(-)
 create mode 100644 theme_compassion_2025/static/src/scss/components/_survey_form.scss

diff --git a/my_compassion_segmentation/__manifest__.py b/my_compassion_segmentation/__manifest__.py
index d0f42036c..246e145f5 100644
--- a/my_compassion_segmentation/__manifest__.py
+++ b/my_compassion_segmentation/__manifest__.py
@@ -39,6 +39,7 @@
     ],
     "depends": [
         "my_compassion",
+        "theme_compassion_2025",
         "partner_segmentation",
     ],
     "demo": [],
diff --git a/my_compassion_segmentation/controllers/my_account.py b/my_compassion_segmentation/controllers/my_account.py
index 09e3a4a07..8a10a47b6 100644
--- a/my_compassion_segmentation/controllers/my_account.py
+++ b/my_compassion_segmentation/controllers/my_account.py
@@ -12,7 +12,7 @@
 
 
 class MyAccountControllerSurvey(CustomerPortal):
-    @route(["/my", "/my/home"], type="http", auth="user", website=True)
+    @route(["/my2", "/my2/home"], type="http", auth="user", website=True)
     def home(self, redirect=None, **post):
         partner = request.env.user.partner_id
         if not partner.has_segment:
diff --git a/my_compassion_segmentation/templates/survey_templates.xml b/my_compassion_segmentation/templates/survey_templates.xml
index f7f847cea..88462fa7b 100644
--- a/my_compassion_segmentation/templates/survey_templates.xml
+++ b/my_compassion_segmentation/templates/survey_templates.xml
@@ -1,10 +1,105 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+    <template id="custom_survey_page_fill" inherit_id="survey.survey_page_fill">
+        <!-- Add padding to the survey start page -->
+        <xpath expr="//div[@class='wrap o_survey_wrap d-flex']" position="attributes">
+            <attribute name="class" add="p-4 p-md-5" separator=" "/>
+        </xpath>
+    </template>
+    <!-- Apply 2025 theme to the title -->
+    <template id="custom_survey_fill_header" inherit_id="survey.survey_fill_header">
+        <xpath expr="//h1[hasclass('o_survey_main_title')]" position="attributes">
+            <attribute name="class" add="d-none" separator=" "/>
+        </xpath>
+        <xpath expr="//div[hasclass('col-lg-10')]" position="attributes">
+            <attribute name="class">col-12</attribute>
+        </xpath>
+        <xpath expr="//div[hasclass('o_survey_timer')]" position="attributes">
+            <attribute name="class" add="d-none" separator=" "/>
+        </xpath>
+        <xpath expr="//h1[hasclass('o_survey_main_title')]" position="after">
+            <t t-call="theme_compassion_2025.TitleComponent">
+                <t t-set="title_size" t-value="'lg'"/>
+                <t t-set="title_content" t-value="survey.title"/>
+                <t t-set="color" t-value="'core-blue'"/>
+            </t>
+        </xpath>
+    </template>
     <template id="custom_survey_layout" inherit_id="survey.survey_fill_form_start">
-        <xpath expr="//div[@class='wrap o_survey_start']/div">
-            <t t-if="survey == survey.env.ref('partner_segmentation.partner_segmentation_survey')">
-                <a role="button" class="btn btn-light btn-lg" href="/my/children">Ask me again later</a>
+        <!-- Replace buttons with 2025 theme buttons -->
+        <xpath expr="//button[hasclass('btn')]" position="attributes">
+            <attribute name="class" add="d-none" separator=" "/>
+        </xpath>
+        <xpath expr="//button[hasclass('btn')]" position="after">
+            <div class="d-flex flex-column flex-sm-row mt-4 justify-content-around align-items-center">
+                <t t-call="theme_compassion_2025.ThemedButtonComponent">
+                    <t t-set="label">Start Survey </t>
+                    <t t-set="variant" t-value="'impact'"/>
+                    <t t-set="variation" t-value="'filled'"/>
+                    <t t-set="color" t-value="'core-blue'"/>
+                    <t t-set="text_color" t-value="'pure-white'"/>
+                    <t t-set="type" t-value="'submit'" />
+                </t>
+                <!-- Add an 'Ask me again later' button to the survey start page -->
+                <t t-if="survey == survey.env.ref('partner_segmentation.partner_segmentation_survey')">
+                    <t t-call="theme_compassion_2025.ThemedButtonComponent">
+                        <t t-set="label">Ask me again later </t>
+                        <t t-set="variant" t-value="'impact'"/>
+                        <t t-set="variation" t-value="'filled'"/>
+                        <t t-set="color" t-value="'light-grey'"/>
+                        <t t-set="text_color" t-value="'off-black'"/>
+                        <t t-set="href" t-value="'/my2/dashboard'"/>
+                    </t>
+                </t>
+            </div>
+        </xpath>
+        <!-- Hide 'or press Enter' -->
+        <xpath expr="//span[hasclass('o_survey_enter')]" position="attributes">
+            <attribute name="class" add="d-none" separator=" "/>
+        </xpath>
+    </template>
+    <!-- Replace 'continue' button with themed version -->
+    <template id="custom_survey_fill_form_in_progress" inherit_id="survey.survey_fill_form_in_progress">
+        <xpath expr="(//button[@type='submit'])[3]" position="attributes">
+            <attribute name="class" add="d-none" separator=" "/>
+        </xpath>
+        <!-- Hide 'or press Enter' -->
+        <xpath expr="(//button[@type='submit'])[3]/following-sibling::span[contains(text(), 'or press Enter')]" position="attributes">
+            <attribute name="class">d-none</attribute>
+        </xpath>
+        <xpath expr="(//button[@type='submit'])[3]" position="after">
+            <div class="d-flex justify-content-end">
+                <t t-call="theme_compassion_2025.ThemedButtonComponent">
+                    <t t-set="label" t-value="'Submit' if survey.questions_layout == 'one_page' or survey_last else 'Continue'"/>
+                    <t t-set="variant" t-value="'impact'"/>
+                    <t t-set="variation" t-value="'filled'"/>
+                    <t t-set="color" t-value="'core-blue'"/>
+                    <t t-set="text_color" t-value="'pure-white'"/>
+                    <t t-set="type" t-value="'submit'" />
+                    <t t-set="value" t-value="'finish' if survey.questions_layout == 'one_page' or survey_last else 'next'"/>
+                </t>
+            </div>
+        </xpath>
+    </template>
+    <!-- Thank you page -->
+    <template id="custom_survey_fill_form_done" inherit_id="survey.survey_fill_form_done">
+        <xpath expr="//div[hasclass('o_survey_finished')]" position="attributes">
+            <attribute name="class" add="d-none" separator=" "/>
+        </xpath>
+
+        <xpath expr="//div[hasclass('o_survey_finished')]" position="after">
+            <t t-call="theme_compassion_2025.TitleComponent">
+                <t t-set="title_content" t-value="'Thank you!'"/>
+                <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="description" t-value="False"/>
+                    <div class="title-description text-low-black">
+                        <t t-raw="survey.description_done"/>
+                    </div>
             </t>
+
         </xpath>
     </template>
 </odoo>
diff --git a/theme_compassion_2025/static/src/scss/components/_survey_form.scss b/theme_compassion_2025/static/src/scss/components/_survey_form.scss
new file mode 100644
index 000000000..ff895e290
--- /dev/null
+++ b/theme_compassion_2025/static/src/scss/components/_survey_form.scss
@@ -0,0 +1,79 @@
+.o_survey_form .o_survey_question_text_box, .o_survey_form .o_survey_question_date, .o_survey_form .o_survey_question_datetime, .o_survey_form .o_survey_question_numerical_box, .o_survey_print .o_survey_question_text_box, .o_survey_print .o_survey_question_date, .o_survey_print .o_survey_question_datetime, .o_survey_print .o_survey_question_numerical_box, .o_survey_session_manage .o_survey_question_text_box, .o_survey_session_manage .o_survey_question_date, .o_survey_session_manage .o_survey_question_datetime, .o_survey_session_manage .o_survey_question_numerical_box, .o_survey_quick_access .o_survey_question_text_box, .o_survey_quick_access .o_survey_question_date, .o_survey_quick_access .o_survey_question_datetime, .o_survey_quick_access .o_survey_question_numerical_box {
+    border-bottom: 1px solid var(--mid-blue)!important;
+}
+
+.o_survey_form .o_survey_choice_btn, .o_survey_print .o_survey_choice_btn, .o_survey_session_manage .o_survey_choice_btn, .o_survey_quick_access .o_survey_choice_btn {
+    color: var(--mid-blue)!important;
+}
+
+.o_survey_form .o_survey_question_matrix th, .o_survey_session_manage .o_survey_question_matrix th {
+    background-color: var(--mid-blue)!important;
+}
+
+.o_survey_form .o_survey_question_matrix td, .o_survey_session_manage .o_survey_question_matrix td {
+    background-color: var(--high-blue)!important;
+}
+
+.o_survey_form .o_survey_question_matrix td:hover {
+    background-color: var(--high-blue)!important;
+}
+
+.o_survey_matrix_btn.text-primary {
+  color: var(--low-blue)!important;
+}
+
+td.o_survey_matrix_btn {
+    vertical-align: middle !important;
+    text-align: center !important;
+    padding: 0 !important;
+
+    i {
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+        position: relative;
+        top: 0;
+        left: 0;
+        transform: none;
+    }
+
+    .fa-check-circle {
+        margin-top: -1.2em;
+    }
+}
+
+label.o_survey_choice_btn {
+    border-radius: 25px !important;
+    padding: 10px 15px !important;
+    background-color: var(--light-grey) !important;
+    box-shadow: #000000 0 0 0 0 !important;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    & div {
+        display: none !important;
+    }
+
+    & i {
+        display: none !important;
+    }
+
+    & span {
+        color: var(--off-black) !important;
+        display: flex;
+        text-align: center;
+    }
+}
+
+label.o_survey_choice_btn:hover {
+    background-color: var(--high-blue) !important;
+}
+
+label.o_survey_choice_btn.o_survey_selected {
+    background-color: var(--mid-blue) !important;
+
+    & span {
+        color: var(--pure-white) !important;
+    }
+}
\ No newline at end of file
diff --git a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
index fbe7a4a59..40f177c7c 100644
--- a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
+++ b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
@@ -32,6 +32,8 @@
     - 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"`
+    - type (string, optional): The type attribute for the button element (e.g., 'submit', 'button', 'reset').
+    - value (string, optional): The value attribute for the button element.
 -->
 <odoo>
     <template id="ThemedButtonComponent_Content" name="Button Content">
@@ -97,11 +99,13 @@
         </t>
         <t t-else="">
             <button
+                t-att-type="type or 'button'"
                 t-att-id="id"
                 t-attf-class="btn #{btn_class} btn--radius-#{radius} #{style_class} text-#{text_color}"
                 t-att-data-custom="data_custom"
                 t-att-data-mode="mode"
                 t-att-data-toggle="data_toggle"
+                t-att-value="value or ''"
             >
                 <t t-call="theme_compassion_2025.ThemedButtonComponent_Content" />
             </button>
diff --git a/theme_compassion_2025/views/assets.xml b/theme_compassion_2025/views/assets.xml
index f982f031c..29c3f869f 100644
--- a/theme_compassion_2025/views/assets.xml
+++ b/theme_compassion_2025/views/assets.xml
@@ -94,6 +94,11 @@
                 type="text/scss"
                 href="/theme_compassion_2025/static/src/scss/components/_progress_bar.scss"
             />
+            <link
+                rel="stylesheet"
+                type="text/scss"
+                href="/theme_compassion_2025/static/src/scss/components/_survey_form.scss"
+            />
             <script type="text/javascript" src="/theme_compassion_2025/static/src/js/_password.js" />
             <script type="text/javascript" src="/theme_compassion_2025/static/src/js/_range_input.js" />
             <script type="text/javascript" src="/theme_compassion_2025/static/src/js/_event_banner.js" />

From 6bb2a7e642de8a64162af9b687733a1dfef4f4fc Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 26 Feb 2026 09:58:38 +0100
Subject: [PATCH 2/9] [T3022] REFACTOR: survey template override finishing
 touches

- REFACTOR: hide branding, override continue button, progress bar
- FEAT: added css rules for odoo progress bar override
- STYLE: commented custom survey scss selectors
- FIX: removed default 'button' type from themed button
---
 .../templates/survey_templates.xml            | 125 ++++++++++++------
 .../src/scss/components/_progress_bar.scss    |  18 ++-
 .../src/scss/components/_survey_form.scss     |  29 +++-
 .../components/buttons/ThemedButton.xml       |   2 +-
 4 files changed, 130 insertions(+), 44 deletions(-)

diff --git a/my_compassion_segmentation/templates/survey_templates.xml b/my_compassion_segmentation/templates/survey_templates.xml
index 88462fa7b..c1855cd50 100644
--- a/my_compassion_segmentation/templates/survey_templates.xml
+++ b/my_compassion_segmentation/templates/survey_templates.xml
@@ -1,82 +1,100 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+    <!-- Hide odoo branding -->
+    <template id="custom_survey_layout" inherit_id="survey.layout">
+        <xpath expr="//div[@t-call='web.brand_promotion_message']" position="attributes">
+            <attribute name="class" add="d-none" separator=" " />
+        </xpath>
+        <xpath expr="//div[hasclass('o_survey_brand_message')]" position="attributes">
+            <attribute name="class" add="d-none" separator=" " />
+        </xpath>
+    </template>
+    <!-- Add padding to the survey start page -->
     <template id="custom_survey_page_fill" inherit_id="survey.survey_page_fill">
-        <!-- Add padding to the survey start page -->
         <xpath expr="//div[@class='wrap o_survey_wrap d-flex']" position="attributes">
-            <attribute name="class" add="p-4 p-md-5" separator=" "/>
+            <attribute name="class" add="p-4 p-md-5" separator=" " />
         </xpath>
     </template>
     <!-- Apply 2025 theme to the title -->
     <template id="custom_survey_fill_header" inherit_id="survey.survey_fill_header">
         <xpath expr="//h1[hasclass('o_survey_main_title')]" position="attributes">
-            <attribute name="class" add="d-none" separator=" "/>
+            <attribute name="class" add="d-none" separator=" " />
         </xpath>
         <xpath expr="//div[hasclass('col-lg-10')]" position="attributes">
             <attribute name="class">col-12</attribute>
         </xpath>
         <xpath expr="//div[hasclass('o_survey_timer')]" position="attributes">
-            <attribute name="class" add="d-none" separator=" "/>
+            <attribute name="class" add="d-none" separator=" " />
         </xpath>
         <xpath expr="//h1[hasclass('o_survey_main_title')]" position="after">
             <t t-call="theme_compassion_2025.TitleComponent">
-                <t t-set="title_size" t-value="'lg'"/>
-                <t t-set="title_content" t-value="survey.title"/>
-                <t t-set="color" t-value="'core-blue'"/>
+                <t t-set="title_size" t-value="'lg'" />
+                <t t-set="title_content" t-value="survey.title" />
+                <t t-set="color" t-value="'core-blue'" />
             </t>
         </xpath>
     </template>
-    <template id="custom_survey_layout" inherit_id="survey.survey_fill_form_start">
+    <template id="custom_survey_fill_form_start" inherit_id="survey.survey_fill_form_start">
         <!-- Replace buttons with 2025 theme buttons -->
         <xpath expr="//button[hasclass('btn')]" position="attributes">
-            <attribute name="class" add="d-none" separator=" "/>
+            <attribute name="class" add="d-none" separator=" " />
         </xpath>
         <xpath expr="//button[hasclass('btn')]" position="after">
             <div class="d-flex flex-column flex-sm-row mt-4 justify-content-around align-items-center">
                 <t t-call="theme_compassion_2025.ThemedButtonComponent">
-                    <t t-set="label">Start Survey </t>
-                    <t t-set="variant" t-value="'impact'"/>
-                    <t t-set="variation" t-value="'filled'"/>
-                    <t t-set="color" t-value="'core-blue'"/>
-                    <t t-set="text_color" t-value="'pure-white'"/>
+                    <t t-set="label">Start Survey</t>
+                    <t t-set="variant" t-value="'impact'" />
+                    <t t-set="variation" t-value="'filled'" />
+                    <t t-set="color" t-value="'core-blue'" />
+                    <t t-set="text_color" t-value="'pure-white'" />
                     <t t-set="type" t-value="'submit'" />
                 </t>
                 <!-- Add an 'Ask me again later' button to the survey start page -->
                 <t t-if="survey == survey.env.ref('partner_segmentation.partner_segmentation_survey')">
                     <t t-call="theme_compassion_2025.ThemedButtonComponent">
-                        <t t-set="label">Ask me again later </t>
-                        <t t-set="variant" t-value="'impact'"/>
-                        <t t-set="variation" t-value="'filled'"/>
-                        <t t-set="color" t-value="'light-grey'"/>
-                        <t t-set="text_color" t-value="'off-black'"/>
-                        <t t-set="href" t-value="'/my2/dashboard'"/>
+                        <t t-set="label">Ask me again later</t>
+                        <t t-set="variant" t-value="'impact'" />
+                        <t t-set="variation" t-value="'filled'" />
+                        <t t-set="color" t-value="'light-grey'" />
+                        <t t-set="text_color" t-value="'off-black'" />
+                        <t t-set="href" t-value="'/my2/dashboard'" />
                     </t>
                 </t>
             </div>
         </xpath>
         <!-- Hide 'or press Enter' -->
         <xpath expr="//span[hasclass('o_survey_enter')]" position="attributes">
-            <attribute name="class" add="d-none" separator=" "/>
+            <attribute name="class" add="d-none" separator=" " />
         </xpath>
     </template>
     <!-- Replace 'continue' button with themed version -->
     <template id="custom_survey_fill_form_in_progress" inherit_id="survey.survey_fill_form_in_progress">
         <xpath expr="(//button[@type='submit'])[3]" position="attributes">
-            <attribute name="class" add="d-none" separator=" "/>
+            <attribute name="class" add="d-none" separator=" " />
         </xpath>
         <!-- Hide 'or press Enter' -->
-        <xpath expr="(//button[@type='submit'])[3]/following-sibling::span[contains(text(), 'or press Enter')]" position="attributes">
+        <xpath
+            expr="(//button[@type='submit'])[3]/following-sibling::span[contains(text(), 'or press Enter')]"
+            position="attributes"
+        >
             <attribute name="class">d-none</attribute>
         </xpath>
         <xpath expr="(//button[@type='submit'])[3]" position="after">
             <div class="d-flex justify-content-end">
                 <t t-call="theme_compassion_2025.ThemedButtonComponent">
-                    <t t-set="label" t-value="'Submit' if survey.questions_layout == 'one_page' or survey_last else 'Continue'"/>
-                    <t t-set="variant" t-value="'impact'"/>
-                    <t t-set="variation" t-value="'filled'"/>
-                    <t t-set="color" t-value="'core-blue'"/>
-                    <t t-set="text_color" t-value="'pure-white'"/>
+                    <t
+                        t-set="label"
+                        t-value="'Submit' if survey.questions_layout == 'one_page' or survey_last else 'Continue'"
+                    />
+                    <t t-set="variant" t-value="'impact'" />
+                    <t t-set="variation" t-value="'filled'" />
+                    <t t-set="color" t-value="'core-blue'" />
+                    <t t-set="text_color" t-value="'pure-white'" />
                     <t t-set="type" t-value="'submit'" />
-                    <t t-set="value" t-value="'finish' if survey.questions_layout == 'one_page' or survey_last else 'next'"/>
+                    <t
+                        t-set="value"
+                        t-value="'finish' if survey.questions_layout == 'one_page' or survey_last else 'next'"
+                    />
                 </t>
             </div>
         </xpath>
@@ -84,22 +102,47 @@
     <!-- Thank you page -->
     <template id="custom_survey_fill_form_done" inherit_id="survey.survey_fill_form_done">
         <xpath expr="//div[hasclass('o_survey_finished')]" position="attributes">
-            <attribute name="class" add="d-none" separator=" "/>
+            <attribute name="class" add="d-none" separator=" " />
         </xpath>
-
         <xpath expr="//div[hasclass('o_survey_finished')]" position="after">
+            <!-- Extract href and label from survey.description_done if the exist -->
+            <t
+                t-set="extracted_href"
+                t-value="survey.description_done.split('href=\&quot;')[1].split('\&quot;')[0] if 'href=\&quot;' in survey.description_done else '/my/home'"
+            />
+            <t
+                t-set="extracted_label"
+                t-value="survey.description_done.split('&lt;/a')[0].split('&gt;')[-1] if '&lt;/a' in survey.description_done else 'Continue'"
+            />
             <t t-call="theme_compassion_2025.TitleComponent">
-                <t t-set="title_content" t-value="'Thank you!'"/>
-                <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="description" t-value="False"/>
-                    <div class="title-description text-low-black">
-                        <t t-raw="survey.description_done"/>
-                    </div>
+                <t t-set="title_content" t-value="'Thank you!'" />
+                <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="description" t-value="False" />
+                <div class="title-description text-low-black done-description">
+                    <t t-raw="survey.description_done" />
+                </div>
+                <div class="text-center mt-5">
+                    <!-- Add styled continue button -->
+                    <t t-call="theme_compassion_2025.ThemedButtonComponent">
+                        <t t-set="label" t-value="extracted_label" />
+                        <t t-set="href" t-value="extracted_href" />
+                        <t t-set="variant" t-value="'impact'" />
+                        <t t-set="variation" t-value="'filled'" />
+                    </t>
+                </div>
             </t>
-
+        </xpath>
+    </template>
+    <!-- Overwrite odoo progres bar -->
+    <template id="custom_survey_progression" inherit_id="survey.survey_progression">
+        <xpath expr="//div[hasclass('o_survey_progress')]" position="attributes">
+            <attribute name="class" add="progress-bar-container native-width" separator=" " />
+        </xpath>
+        <xpath expr="//div[hasclass('progress-bar')]" position="attributes">
+            <attribute name="class" remove="bg-primary" add="is-flowing density-low" separator=" " />
+            <attribute name="t-att-style">'width: ' + str(percentage) + '%; --flow-speed: 10s;'</attribute>
         </xpath>
     </template>
 </odoo>
diff --git a/theme_compassion_2025/static/src/scss/components/_progress_bar.scss b/theme_compassion_2025/static/src/scss/components/_progress_bar.scss
index 1e480bd17..86eba69bd 100644
--- a/theme_compassion_2025/static/src/scss/components/_progress_bar.scss
+++ b/theme_compassion_2025/static/src/scss/components/_progress_bar.scss
@@ -61,6 +61,22 @@ $num-colors: length($color-pattern);
         background-position: -200% 0%;
     }
     100% {
-        background-position: 0% 0%;
+        background-position: 0 0;
+    }
+}
+
+/* For native-width odoo progress bars */
+.o_survey_progress_wrapper {
+    min-width: calc(100vw - 3rem)!important;
+}
+.progress-bar-container.native-width {
+    height: 5px;
+
+    .progress-bar.is-flowing {
+        /* Use 100vw to anchor the gradient to the screen so it doesn't compress */
+        background-size: 100vw 100%;
+        transition: width 0.5s ease-out;
+
+        &.density-low { background-image: create-gradient(0); }
     }
 }
diff --git a/theme_compassion_2025/static/src/scss/components/_survey_form.scss b/theme_compassion_2025/static/src/scss/components/_survey_form.scss
index ff895e290..23f7b806b 100644
--- a/theme_compassion_2025/static/src/scss/components/_survey_form.scss
+++ b/theme_compassion_2025/static/src/scss/components/_survey_form.scss
@@ -1,27 +1,41 @@
+/* ============================================================================
+   MyCompassion 2025 Theme - Survey Overrides
+   ============================================================================
+   This file overrides the default Odoo 14 Survey module styling to match
+   the MyCompassion 2.0 design system.
+   ============================================================================ */
+
+/* Transforms standard boxed inputs into minimal "bottom-border only" inputs */
 .o_survey_form .o_survey_question_text_box, .o_survey_form .o_survey_question_date, .o_survey_form .o_survey_question_datetime, .o_survey_form .o_survey_question_numerical_box, .o_survey_print .o_survey_question_text_box, .o_survey_print .o_survey_question_date, .o_survey_print .o_survey_question_datetime, .o_survey_print .o_survey_question_numerical_box, .o_survey_session_manage .o_survey_question_text_box, .o_survey_session_manage .o_survey_question_date, .o_survey_session_manage .o_survey_question_datetime, .o_survey_session_manage .o_survey_question_numerical_box, .o_survey_quick_access .o_survey_question_text_box, .o_survey_quick_access .o_survey_question_date, .o_survey_quick_access .o_survey_question_datetime, .o_survey_quick_access .o_survey_question_numerical_box {
     border-bottom: 1px solid var(--mid-blue)!important;
 }
 
+/* Sets the default text color for standard survey choice options. */
 .o_survey_form .o_survey_choice_btn, .o_survey_print .o_survey_choice_btn, .o_survey_session_manage .o_survey_choice_btn, .o_survey_quick_access .o_survey_choice_btn {
     color: var(--mid-blue)!important;
 }
 
+/* Applies the primary theme color to the top row and left column headers. */
 .o_survey_form .o_survey_question_matrix th, .o_survey_session_manage .o_survey_question_matrix th {
     background-color: var(--mid-blue)!important;
 }
 
+/* Sets the default background color for the clickable matrix cells. */
 .o_survey_form .o_survey_question_matrix td, .o_survey_session_manage .o_survey_question_matrix td {
     background-color: var(--high-blue)!important;
 }
 
+/* Overrides table row hover effect. */
 .o_survey_form .o_survey_question_matrix td:hover {
     background-color: var(--high-blue)!important;
 }
 
+/* Forces the active/selected radio icon to use the theme's low-blue. */
 .o_survey_matrix_btn.text-primary {
   color: var(--low-blue)!important;
 }
 
+/* Centers the radio icons within the matrix cells and adjusts the checkmark position. */
 td.o_survey_matrix_btn {
     vertical-align: middle !important;
     text-align: center !important;
@@ -42,6 +56,7 @@ td.o_survey_matrix_btn {
     }
 }
 
+/* Transforms the standard survey choice buttons into pill-shaped options with centered text. */
 label.o_survey_choice_btn {
     border-radius: 25px !important;
     padding: 10px 15px !important;
@@ -51,14 +66,17 @@ label.o_survey_choice_btn {
     justify-content: center;
     align-items: center;
 
+    /* Hides the Odoo selection key letters (A, B, C...) */
     & div {
         display: none !important;
     }
 
+    /* Hides the FontAwesome radio/checkbox icons */
     & i {
         display: none !important;
     }
 
+    /* Centers and styles the actual answer text */
     & span {
         color: var(--off-black) !important;
         display: flex;
@@ -66,14 +84,23 @@ label.o_survey_choice_btn {
     }
 }
 
+/* Adds a subtle visual highlight when a user mouses over an unselected option. */
 label.o_survey_choice_btn:hover {
     background-color: var(--high-blue) !important;
 }
 
+/* Highlights the chosen answer(s) with a solid theme color and white text. */
 label.o_survey_choice_btn.o_survey_selected {
     background-color: var(--mid-blue) !important;
 
     & span {
         color: var(--pure-white) !important;
     }
-}
\ No newline at end of file
+}
+
+/* Hide default done button */
+.done-description {
+    a.btn, .mt-4 {
+        display: none!important
+    }
+}
diff --git a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
index 40f177c7c..3180201ae 100644
--- a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
+++ b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
@@ -99,7 +99,7 @@
         </t>
         <t t-else="">
             <button
-                t-att-type="type or 'button'"
+                t-att-type="type or ''"
                 t-att-id="id"
                 t-attf-class="btn #{btn_class} btn--radius-#{radius} #{style_class} text-#{text_color}"
                 t-att-data-custom="data_custom"

From ff63eed15666d9c29df640e04f29cb6405f1cb41 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 26 Feb 2026 10:00:02 +0100
Subject: [PATCH 3/9] [T3022] FIX: re-added /my routes to be safe

---
 my_compassion_segmentation/controllers/my_account.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/my_compassion_segmentation/controllers/my_account.py b/my_compassion_segmentation/controllers/my_account.py
index 8a10a47b6..c3539b1ab 100644
--- a/my_compassion_segmentation/controllers/my_account.py
+++ b/my_compassion_segmentation/controllers/my_account.py
@@ -12,7 +12,9 @@
 
 
 class MyAccountControllerSurvey(CustomerPortal):
-    @route(["/my2", "/my2/home"], type="http", auth="user", website=True)
+    @route(
+        ["/my", "/my2", "/my/home", "/my2/home"], type="http", auth="user", website=True
+    )
     def home(self, redirect=None, **post):
         partner = request.env.user.partner_id
         if not partner.has_segment:

From e4d61a740fb93d2bbfff7d1d9546393f6ae92b55 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 26 Feb 2026 10:39:41 +0100
Subject: [PATCH 4/9] [T3022] FIX: pre-commit complained again

---
 my_compassion_segmentation/templates/survey_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/my_compassion_segmentation/templates/survey_templates.xml b/my_compassion_segmentation/templates/survey_templates.xml
index c1855cd50..105c3025e 100644
--- a/my_compassion_segmentation/templates/survey_templates.xml
+++ b/my_compassion_segmentation/templates/survey_templates.xml
@@ -74,7 +74,7 @@
         </xpath>
         <!-- Hide 'or press Enter' -->
         <xpath
-            expr="(//button[@type='submit'])[3]/following-sibling::span[contains(text(), 'or press Enter')]"
+            expr="(//button[@type='submit'])[3]/following-sibling::span[hasclass('text-muted')]"
             position="attributes"
         >
             <attribute name="class">d-none</attribute>

From 346ff38c5573c6ff46d0328f9bc13f21e9cbddf0 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 26 Feb 2026 15:24:32 +0100
Subject: [PATCH 5/9] [T3022] FEAT: added useful links to footer

- FEAT: new override template for dynamic inserting of the useful links of a partner
- FEAT: added new footer_links template to manifest
- FEAT: added footer hook to provide the ability to insert dynamic content into the footer
---
 my_compassion/__manifest__.py          |  1 +
 my_compassion/views/footer_links.xml   | 40 ++++++++++++++++++++++++++
 theme_compassion_2025/views/footer.xml |  9 ++++++
 3 files changed, 50 insertions(+)
 create mode 100644 my_compassion/views/footer_links.xml

diff --git a/my_compassion/__manifest__.py b/my_compassion/__manifest__.py
index e4bbef984..95f5b0872 100644
--- a/my_compassion/__manifest__.py
+++ b/my_compassion/__manifest__.py
@@ -52,6 +52,7 @@
         "templates/login_template.xml",
         "templates/signup.xml",
         "templates/my2_change_password.xml",
+        "views/footer_links.xml",
         "views/correspondence_template_view.xml",
         "views/my2_event_banner_views.xml",
         "views/partner_compassion_view.xml",
diff --git a/my_compassion/views/footer_links.xml b/my_compassion/views/footer_links.xml
new file mode 100644
index 000000000..3e354a0c8
--- /dev/null
+++ b/my_compassion/views/footer_links.xml
@@ -0,0 +1,40 @@
+<odoo>
+    <template
+        id="my2_compassion_footer_links"
+        inherit_id="theme_compassion_2025.compassion_footer_hook"
+        name="My Compassion Footer Links"
+    >
+        <xpath expr="//div[@id='compassion_dynamic_footer_links']" position="inside">
+            <t t-set="partner" t-value="request.env.user.partner_id" />
+            <t t-if="partner">
+                <section class="footer-my-compassion-links pt48">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-12 d-flex flex-column justify-content-center align-items-center">
+                                <div
+                                    id="personal-links-container"
+                                    class="w-100 d-flex flex-row flex-wrap justify-content-center"
+                                >
+                                    <t t-foreach="partner.primary_segment_id.link_ids" t-as="segment_link">
+                                        <t
+                                            t-if="not segment_link.language_id or segment_link.language_id.code == request.env.lang or segment_link.language_id.code == 'en_US'"
+                                        >
+                                            <a t-att-href="segment_link.url" class="text-pure-white mx-3 mb-2 mb-md-0">
+                                                <t t-esc="segment_link.label" />
+                                            </a>
+                                        </t>
+                                    </t>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div
+                        id="links-separator"
+                        class="mt48 mb24 ml-auto mr-auto border-bottom border-white"
+                        style="width: 100px;"
+                    />
+                </section>
+            </t>
+        </xpath>
+    </template>
+</odoo>
diff --git a/theme_compassion_2025/views/footer.xml b/theme_compassion_2025/views/footer.xml
index 122418f89..8245024b8 100644
--- a/theme_compassion_2025/views/footer.xml
+++ b/theme_compassion_2025/views/footer.xml
@@ -1,5 +1,13 @@
 <!-- oca-hooks:disable=xml-dangerous-qweb-replace-low-priority -->
 <odoo>
+    <record id="compassion_footer_hook" model="ir.ui.view">
+        <field name="name">Compassion Generic Footer Hook</field>
+        <field name="type">qweb</field>
+        <field name="key">theme_compassion_2025.compassion_footer_hook</field>
+        <field name="arch" type="xml">
+            <div id="compassion_dynamic_footer_links" class="w-100" />
+        </field>
+    </record>
     <template id="footer_2025" inherit_id="website.layout">
         <!-- oca-hooks:disable=xml-dangerous-qweb-replace-low-priority -->
         <xpath expr="//div[@id='footer']" position="replace">
@@ -12,6 +20,7 @@
                         <div class="h-100 w-25 bg-low-green" />
                     </div>
                 </section>
+                <t t-call="theme_compassion_2025.compassion_footer_hook" />
                 <section class="pt24">
                     <div class="container">
                         <div class="row justify-content-center">

From 065dc31bda80036a580d2d5d2ebebbc33ccb635e Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 26 Feb 2026 16:08:44 +0100
Subject: [PATCH 6/9] [T3022] FIX: added minimal margin to themed button

- FIX: this fix should make sure that buttons in close proximity don't touch each other. a lot cleaner and better solution.
---
 .../templates/components/buttons/ThemedButton.xml             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
index 3180201ae..7f1537cf6 100644
--- a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
+++ b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
@@ -88,7 +88,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} m-1"
                 t-att-data-custom="data_custom"
                 t-att-target="target"
                 t-att-rel="computed_rel or None"
@@ -101,7 +101,7 @@
             <button
                 t-att-type="type or ''"
                 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} m-1"
                 t-att-data-custom="data_custom"
                 t-att-data-mode="mode"
                 t-att-data-toggle="data_toggle"

From 4974b76fc6b02d676f78efee2e43cd29c9cbffe6 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Mon, 2 Mar 2026 15:51:12 +0100
Subject: [PATCH 7/9] [T3022] REFACTOR: moved footer from views to templates

- REFACTOR: the footer_links.xml it now located in the templates folder
---
 my_compassion/__manifest__.py                       | 2 +-
 my_compassion/{views => templates}/footer_links.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename my_compassion/{views => templates}/footer_links.xml (96%)

diff --git a/my_compassion/__manifest__.py b/my_compassion/__manifest__.py
index 95f5b0872..7af146fbf 100644
--- a/my_compassion/__manifest__.py
+++ b/my_compassion/__manifest__.py
@@ -52,7 +52,7 @@
         "templates/login_template.xml",
         "templates/signup.xml",
         "templates/my2_change_password.xml",
-        "views/footer_links.xml",
+        "templates/footer_links.xml",
         "views/correspondence_template_view.xml",
         "views/my2_event_banner_views.xml",
         "views/partner_compassion_view.xml",
diff --git a/my_compassion/views/footer_links.xml b/my_compassion/templates/footer_links.xml
similarity index 96%
rename from my_compassion/views/footer_links.xml
rename to my_compassion/templates/footer_links.xml
index 3e354a0c8..e9b940ffd 100644
--- a/my_compassion/views/footer_links.xml
+++ b/my_compassion/templates/footer_links.xml
@@ -6,7 +6,7 @@
     >
         <xpath expr="//div[@id='compassion_dynamic_footer_links']" position="inside">
             <t t-set="partner" t-value="request.env.user.partner_id" />
-            <t t-if="partner">
+            <t t-if="partner and partner.primary_segment_id.link_ids">
                 <section class="footer-my-compassion-links pt48">
                     <div class="container">
                         <div class="row">

From 6368226936d44b340fe112f69881c78555724468 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 5 Mar 2026 12:35:58 +0100
Subject: [PATCH 8/9] [T3022] FIX: removed dynamic footer links from manifest

- This should enable us to merge until the partner links and segmentation topics are decided
---
 my_compassion/__manifest__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/my_compassion/__manifest__.py b/my_compassion/__manifest__.py
index 7af146fbf..e4bbef984 100644
--- a/my_compassion/__manifest__.py
+++ b/my_compassion/__manifest__.py
@@ -52,7 +52,6 @@
         "templates/login_template.xml",
         "templates/signup.xml",
         "templates/my2_change_password.xml",
-        "templates/footer_links.xml",
         "views/correspondence_template_view.xml",
         "views/my2_event_banner_views.xml",
         "views/partner_compassion_view.xml",

From 34e7442a21dd8a681d1ebc43c64876d48de867d5 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Mon, 9 Mar 2026 16:09:13 +0100
Subject: [PATCH 9/9] [T3022] FIX: requested changes

---
 my_compassion_segmentation/controllers/my_account.py  |  4 +---
 .../templates/survey_templates.xml                    |  2 +-
 .../static/src/scss/components/_survey_form.scss      |  2 +-
 .../templates/components/buttons/ThemedButton.xml     |  2 +-
 theme_compassion_2025/views/footer.xml                | 11 +++--------
 theme_compassion_2025/views/template_header.xml       |  2 --
 6 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/my_compassion_segmentation/controllers/my_account.py b/my_compassion_segmentation/controllers/my_account.py
index c3539b1ab..a85e25493 100644
--- a/my_compassion_segmentation/controllers/my_account.py
+++ b/my_compassion_segmentation/controllers/my_account.py
@@ -12,9 +12,7 @@
 
 
 class MyAccountControllerSurvey(CustomerPortal):
-    @route(
-        ["/my", "/my2", "/my/home", "/my2/home"], type="http", auth="user", website=True
-    )
+    @route(["/my", "/my2", "/my/home"], type="http", auth="user", website=True)
     def home(self, redirect=None, **post):
         partner = request.env.user.partner_id
         if not partner.has_segment:
diff --git a/my_compassion_segmentation/templates/survey_templates.xml b/my_compassion_segmentation/templates/survey_templates.xml
index 105c3025e..b432e18bc 100644
--- a/my_compassion_segmentation/templates/survey_templates.xml
+++ b/my_compassion_segmentation/templates/survey_templates.xml
@@ -112,7 +112,7 @@
             />
             <t
                 t-set="extracted_label"
-                t-value="survey.description_done.split('&lt;/a')[0].split('&gt;')[-1] if '&lt;/a' in survey.description_done else 'Continue'"
+                t-value="survey.description_done.split('&lt;/a')[0].split('&gt;')[-1] if survey.description_done and '&lt;/a' in survey.description_done else 'Continue'"
             />
             <t t-call="theme_compassion_2025.TitleComponent">
                 <t t-set="title_content" t-value="'Thank you!'" />
diff --git a/theme_compassion_2025/static/src/scss/components/_survey_form.scss b/theme_compassion_2025/static/src/scss/components/_survey_form.scss
index 23f7b806b..edf184f7b 100644
--- a/theme_compassion_2025/static/src/scss/components/_survey_form.scss
+++ b/theme_compassion_2025/static/src/scss/components/_survey_form.scss
@@ -101,6 +101,6 @@ label.o_survey_choice_btn.o_survey_selected {
 /* Hide default done button */
 .done-description {
     a.btn, .mt-4 {
-        display: none!important
+        display: none!important;
     }
 }
diff --git a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
index eeef1c3d6..5a475ffaa 100644
--- a/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
+++ b/theme_compassion_2025/templates/components/buttons/ThemedButton.xml
@@ -100,7 +100,7 @@
         </t>
         <t t-else="">
             <button
-                t-att-type="type or ''"
+                t-att-type="type or None"
                 t-att-id="id"
                 t-attf-class="btn #{btn_class} btn--radius-#{radius} #{style_class} text-#{text_color} #{add_class or ''} m-1"
                 t-att-data-custom="data_custom"
diff --git a/theme_compassion_2025/views/footer.xml b/theme_compassion_2025/views/footer.xml
index 8245024b8..f5bd7283c 100644
--- a/theme_compassion_2025/views/footer.xml
+++ b/theme_compassion_2025/views/footer.xml
@@ -1,13 +1,8 @@
 <!-- oca-hooks:disable=xml-dangerous-qweb-replace-low-priority -->
 <odoo>
-    <record id="compassion_footer_hook" model="ir.ui.view">
-        <field name="name">Compassion Generic Footer Hook</field>
-        <field name="type">qweb</field>
-        <field name="key">theme_compassion_2025.compassion_footer_hook</field>
-        <field name="arch" type="xml">
-            <div id="compassion_dynamic_footer_links" class="w-100" />
-        </field>
-    </record>
+    <template id="compassion_footer_hook" name="Compassion Generic Footer Hook">
+        <div id="compassion_dynamic_footer_links" class="w-100" />
+    </template>
     <template id="footer_2025" inherit_id="website.layout">
         <!-- oca-hooks:disable=xml-dangerous-qweb-replace-low-priority -->
         <xpath expr="//div[@id='footer']" position="replace">
diff --git a/theme_compassion_2025/views/template_header.xml b/theme_compassion_2025/views/template_header.xml
index e9da89d27..5b2fbb2df 100644
--- a/theme_compassion_2025/views/template_header.xml
+++ b/theme_compassion_2025/views/template_header.xml
@@ -52,11 +52,9 @@
         <xpath expr="//div[hasclass('dropdown-menu')]" position="attributes">
             <attribute name="class" add="shadow-sm animation-drop language-selector__dropdown-menu" separator=" " />
         </xpath>
-
         <xpath expr="//button[hasclass('dropdown-toggle')]" position="attributes">
             <attribute name="class" separator=" " add="d-none" />
         </xpath>
-
         <xpath expr="//button[hasclass('dropdown-toggle')]" position="after">
             <t t-call="theme_compassion_2025.LanguageSelector">
                 <t t-set="variant" t-value="'compact'" />