From c0f922a70b5a7ec7b7a220004484b416062da545 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Wed, 22 Jul 2026 10:03:38 +0200
Subject: [PATCH] IBX-12120: Fix account pages issues

---
 src/bundle/Resources/public/scss/_login.scss  |  6 ++++
 .../Resources/translations/messages.en.xliff  |  4 +--
 .../confirmation_page.html.twig               |  1 +
 .../account/forgot_password/index.html.twig   |  4 +--
 .../confirmation_page.html.twig               | 30 +++++++++++++++----
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/bundle/Resources/public/scss/_login.scss b/src/bundle/Resources/public/scss/_login.scss
index 2e9a73414d..45631ffe83 100644
--- a/src/bundle/Resources/public/scss/_login.scss
+++ b/src/bundle/Resources/public/scss/_login.scss
@@ -186,6 +186,12 @@
         font-size: $text-font-size-s;
     }
 
+    &__reset-password-alert {
+        a {
+            color: inherit;
+        }
+    }
+
     &__success-toast {
         margin-top: calculateRem(4px);
 
diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff
index 43e00fac6f..ca85b42671 100644
--- a/src/bundle/Resources/translations/messages.en.xliff
+++ b/src/bundle/Resources/translations/messages.en.xliff
@@ -312,8 +312,8 @@
         <note>key: ezplatform.reset_user_password.link_is_not_valid</note>
       </trans-unit>
       <trans-unit id="5149c594d64197e519d38a1a2e7368140716bb81" resname="ezplatform.reset_user_password.success">
-        <source><![CDATA[Your password has been changed. You can <a href="%login%">log in</a> to Ibexa DXP.]]></source>
-        <target state="new"><![CDATA[Your password has been changed. You can <a href="%login%">log in</a> to Ibexa DXP.]]></target>
+        <source><![CDATA[Your password has been changed. You can <a href="%login%">log in</a> to Cohesivo.]]></source>
+        <target state="new"><![CDATA[Your password has been changed. You can <a href="%login%">log in</a> to Cohesivo.]]></target>
         <note>key: ezplatform.reset_user_password.success</note>
       </trans-unit>
       <trans-unit id="bd5ae6bdfe2b60c317c3b47f27c5bf5a264b71ba" resname="fieldview.toggler.hide">
diff --git a/src/bundle/Resources/views/themes/admin/account/forgot_password/confirmation_page.html.twig b/src/bundle/Resources/views/themes/admin/account/forgot_password/confirmation_page.html.twig
index 33d6af13b6..4b0f650455 100644
--- a/src/bundle/Resources/views/themes/admin/account/forgot_password/confirmation_page.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/forgot_password/confirmation_page.html.twig
@@ -21,6 +21,7 @@
             href="{{ path('login') }}"
             variant="button"
             type="primary"
+            class="ibexa-login__btn"
         >
             {{ 'authentication.reset_your_password.back_to_sign_in'|trans|desc('Back to sign in page') }}
         </twig:ibexa:link>
diff --git a/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig
index 011a8bf921..06d739b08d 100644
--- a/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig
@@ -12,7 +12,7 @@
         <fieldset>
             {{ form_row(form_forgot_user_password.email, {'attr': {'class': 'ibexa-login__input'}}) }}
         </fieldset>
-        {{ form_widget(form_forgot_user_password.reset, {'attr': {'class': 'ids-btn ids-btn--primary ids-btn--medium ibexa-login__btn--reset-password'}}) }}
+        {{ form_widget(form_forgot_user_password.reset, {'attr': {'class': 'ids-btn ids-btn--primary ids-btn--medium ibexa-login__btn ibexa-login__btn--reset-password'}}) }}
 
         {{ form_end(form_forgot_user_password) }}
     {% endif %}
@@ -20,7 +20,7 @@
     <twig:ibexa:link
         href="{{ path('login') }}"
         variant="button"
-        type="tertiary-alt"
+        type="tertiary"
         class="ibexa-login__btn"
     >
         {{ 'authentication.reset_your_password.back_to_sign_in'|trans|desc('Back to sign in page') }}
diff --git a/src/bundle/Resources/views/themes/admin/account/reset_password/confirmation_page.html.twig b/src/bundle/Resources/views/themes/admin/account/reset_password/confirmation_page.html.twig
index 7b71470d7f..73dac2e8d2 100644
--- a/src/bundle/Resources/views/themes/admin/account/reset_password/confirmation_page.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/reset_password/confirmation_page.html.twig
@@ -1,9 +1,29 @@
 {% extends '@ibexadesign/account/base.html.twig' %}
 
 {%- block content -%}
-    <h2 class="ibexa-login__actions-headline">{{ 'ezplatform.reset_user_password.change_password'|trans|desc('Set new password') }}</h2>
-    <p>
-        {{ 'ezplatform.reset_user_password.success'|trans({ '%login%': path('login') })
-        |desc('Your password has been changed. You can <a href="%login%">log in</a> to Ibexa DXP.')|raw }}
-    </p>
+    <h1 class="ibexa-login__actions-headline">{{ 'ezplatform.reset_user_password.change_password'|trans|desc('Set new password') }}</h1>
+    {% embed '@ibexadesign/ui/component/alert/alert.html.twig' with {
+        type: 'success',
+        icon_path: ibexa_icon_path('checkmark'),
+        class: 'ibexa-login__reset-password-alert mt-4',
+    } only %}
+        {% block content %}
+            <div class="ibexa-alert__content">
+                <span>
+                    {{ 'ezplatform.reset_user_password.success'|trans({ '%login%': path('login') })
+                    |desc('Your password has been changed. You can <a href="%login%">log in</a> to Cohesivo.')|raw }}
+                </span>
+            </div>
+        {% endblock %}
+    {% endembed %}
+    <div class="ibexa-login__actions">
+        <twig:ibexa:link
+            href="{{ path('login') }}"
+            variant="button"
+            type="primary"
+            class="ibexa-login__btn"
+        >
+            {{ 'authentication.reset_your_password.back_to_sign_in'|trans|desc('Back to sign in page') }}
+        </twig:ibexa:link>
+    </div>
 {%- endblock content -%}