Merged branch '2.3' of ezsystems/ezplatform-admin-ui into 4.3

Co-authored-by: Michał Grabowski <GrabowskiM@users.noreply.github.com>
ibexa · Mar 1, 2023 · 917ba33 · 917ba33
2 parents b1cb62d + 4ba6fbb
commit 917ba33
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/src/bundle/Resources/public/scss/_login.scss b/src/bundle/Resources/public/scss/_login.scss
@@ -102,7 +102,8 @@
             align-items: center;
         }
 
-        &--reset-password {
+        &--reset-password,
+        &--change-password {
             margin-top: calculateRem(32px);
         }
     }

diff --git a/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig
@@ -1,21 +1,7 @@
 {# @todo move to view/user/preferences in the future #}
-{% extends '@ibexadesign/ui/form_fields.html.twig' %}
 
 {% trans_default_domain 'change_user_password' %}
 
-{%- block form_errors -%}
-    {%- if errors|length > 0 -%}
-        {%- for error in errors -%}
-            <em class="ibexa-field__error ibexa-form-error__row">
-                <svg class="ibexa-icon ibexa-icon--small ibexa-form-error__icon">
-                    <use xlink:href="{{ ibexa_icon_path('warning-triangle') }}"></use>
-                </svg>
-                {{ error.message }}
-            </em>
-        {%- endfor -%}
-    {%- endif -%}
-{%- endblock -%}
-
 {% block form_row -%}
     {% set widget_wrapper_attr = widget_wrapper_attr|default({})|merge({'class': (widget_wrapper_attr.class|default('') ~ ' ibexa-field__data')|trim}) %}
     {% set wrapper_class = 'ibexa-field form-group' %}

diff --git a/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig
@@ -1,6 +1,9 @@
 {% extends '@ibexadesign/ui/edit_base.html.twig' %}
 
-{% form_theme form_change_user_password '@ibexadesign/account/change_password/form_fields.html.twig'  %}
+{% form_theme form_change_user_password with [
+    '@ibexadesign/account/form_fields.html.twig',
+    '@ibexadesign/account/change_password/form_fields.html.twig'
+] %}
 
 {% trans_default_domain 'user_change_password' %}
 

diff --git a/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig
@@ -9,7 +9,7 @@
         <fieldset>
             {{ form_widget(form_reset_user_password.new_password) }}
         </fieldset>
-        {{ form_widget(form_reset_user_password.update, {'attr': {'class': 'btn ibexa-btn ibexa-btn--primary'}}) }}
+        {{ form_widget(form_reset_user_password.update, {'attr': {'class': 'btn ibexa-btn ibexa-btn--primary ibexa-login__btn--change-password'}}) }}
         {{ form_end(form_reset_user_password) }}
     {% endif %}