diff --git a/.changes/unreleased/Fixed-20250821-161902.yaml b/.changes/unreleased/Fixed-20250821-161902.yaml new file mode 100644 index 000000000..0cf43b782 --- /dev/null +++ b/.changes/unreleased/Fixed-20250821-161902.yaml @@ -0,0 +1,6 @@ +kind: Fixed +body: Fixed html layout of pages for recovering password +time: 2025-08-21T16:19:02.058348298+02:00 +custom: + Issue: "422" + SchemaChange: No schema change diff --git a/src/Bundle/ChillMainBundle/Resources/views/Layout/_header_logo_only.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Layout/_header_logo_only.html.twig new file mode 100644 index 000000000..78003c14b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Layout/_header_logo_only.html.twig @@ -0,0 +1,13 @@ +
+ +
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig index 52be8b50f..998a1b41a 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig @@ -26,11 +26,12 @@ {{ 'Welcome' | trans }}
- - {{ app.user.username }} - {{ render(controller('Chill\\MainBundle\\Controller\\UIController::showNotificationUserCounterAction')) }} - - + {% if app.user %} + + {{ app.user.username }} + {{ render(controller('Chill\\MainBundle\\Controller\\UIController::showNotificationUserCounterAction')) }} + + {% endif %} {% if is_granted('IS_IMPERSONATOR') %} {% endif %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig index 7c328b889..e51e7a007 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig @@ -16,29 +16,16 @@ * along with this program. If not, see . #} - - - - - - {{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }} - - - {{ encore_entry_link_tags('chill') }} - - -
-
-
- - - -
-
-
+{% extends "@ChillMain/layout.html.twig" %} -
- {% block content %}{% endblock %} -
- - +{% set header_logo_only = 1 %} + +{% block title %}{{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}{% endblock %} + +{% block content %} + +
+ {% block password_content %}{% endblock %} +
+ +{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig index 1af108bf1..c07a7b980 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig @@ -2,7 +2,7 @@ {% block title %}{{ "New password set"|trans }}{% endblock %} -{% block content %} +{% block password_content %}

{{ "New password set"|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig index 6e32cb0b4..32e5618d4 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig @@ -4,7 +4,7 @@ {% block title %}{{ title }}{% endblock %} -{% block content %} +{% block password_content %}

{{ title }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig index 43a2d4674..2ff32f2c1 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig @@ -22,7 +22,7 @@ {% block title %}{{"Recover password"|trans}}{% endblock %} -{% block content %} +{% block password_content %}

{{ 'Recover password'|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig index 4fb924077..8014179e5 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig @@ -2,7 +2,7 @@ {% block title "Check your email"|trans %} -{% block content %} +{% block password_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index 30f84c855..b6da857b2 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -30,7 +30,11 @@ {{ include('@ChillMain/Layout/_debug.html.twig') }} {% endif %} - {{ include('@ChillMain/Layout/_header.html.twig') }} + {% if header_logo_only is defined and header_logo_only == 1 %} + {{ include('@ChillMain/Layout/_header_logo_only.html.twig') }} + {% else %} + {{ include('@ChillMain/Layout/_header.html.twig') }} + {% endif %} {% block top_banner %}{# To use if you want to add a banner below the header (ie the menu)