Skip to content

IBX-12120: Fix account pages issues #1975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tischsoic wants to merge 1 commit into
base: ds-development
Choose a base branch
from
Open

IBX-12120: Fix account pages issues #1975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/bundle/Resources/public/scss/_login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,12 @@
font-size: $text-font-size-s;
}

&__reset-password-alert {
a {

@OstafinL OstafinL Jul 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We try not to use tag selectors.

color: inherit;
}
}

&__success-toast {
margin-top: calculateRem(4px);

Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/translations/messages.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 1 addition & 0 deletions src/bundle/Resources/views/themes/admin/account/forgot_password/confirmation_page.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<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 %}

<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') }}
Expand Down
30 changes: 25 additions & 5 deletions src/bundle/Resources/views/themes/admin/account/reset_password/confirmation_page.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',

@OstafinL OstafinL Jul 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you avoid using built-in BS classes for margins?

} 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 -%}
Loading