Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-09 16:24:59 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch '422-password-recover-layout' into 'master'

Browse Source 
Resolve "Fix layout of password recover pages"

Closes #422

See merge request Chill-Projet/chill-bundles!869
This commit is contained in:
Julien Fastré
2025-09-02 08:29:27 +00:00
parent f32a9dc7bc 82c02f442b
commit d204df0316
9 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/unreleased/Fixed-20250821-161902.yaml Normal file
View File

@@ -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

13
src/Bundle/ChillMainBundle/Resources/views/Layout/_header_logo_only.html.twig Normal file
View File

@@ -0,0 +1,13 @@
<header>
<nav class="navbar navbar-dark bg-primary navbar-expand-md">
<div class="container-xxl">
<div class="col-12">
<a class="navbar-brand" href="{{ path('chill_main_homepage') }}">
{{ include('@ChillMain/Layout/_header-logo.html.twig') }}
</a>
</div>
</div>
</nav>
</header>

11
src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig
View File

@@ -26,11 +26,12 @@
{{ 'Welcome' | trans }}<br/> {{ 'Welcome' | trans }}<br/>
<b> {% if app.user %}
{{ app.user.username }} <b>
{{ render(controller('Chill\\MainBundle\\Controller\\UIController::showNotificationUserCounterAction')) }} {{ app.user.username }}
</b> {{ render(controller('Chill\\MainBundle\\Controller\\UIController::showNotificationUserCounterAction')) }}
</b>
{% endif %}
{% if is_granted('IS_IMPERSONATOR') %} {% if is_granted('IS_IMPERSONATOR') %}
<i class="fa fa-wrench fa-lg" title="Impersonate mode"></i> <i class="fa fa-wrench fa-lg" title="Impersonate mode"></i>
{% endif %} {% endif %}

37
src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig
View File

@@ -16,29 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
#} #}
<!DOCTYPE html> {% extends "@ChillMain/layout.html.twig" %}
<html>
<head>
<meta charset="UTF-8" />
<title>
{{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}
</title>
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
{{ encore_entry_link_tags('chill') }}
</head>
<body>
<header class="navigation container-fluid">
<div class="col-4 d-md-none parent">
<div class="col-10 col-md-12 offset-2 logo-container">
<a href="{{ path('chill_main_homepage') }}">
<img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
</a>
</div>
</div>
</header>
<div id="content"> {% set header_logo_only = 1 %}
{% block content %}{% endblock %}
</div> {% block title %}{{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}{% endblock %}
</body>
</html> {% block content %}
<div id="content">
{% block password_content %}{% endblock %}
</div>
{% endblock %}

2
src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_changed.html.twig
View File

@@ -2,7 +2,7 @@
{% block title %}{{ "New password set"|trans }}{% endblock %} {% block title %}{{ "New password set"|trans }}{% endblock %}
{% block content %} {% block password_content %}
<div class="col-10 centered"> <div class="col-10 centered">
<h1>{{ "New password set"|trans }}</h1> <h1>{{ "New password set"|trans }}</h1>

2
src/Bundle/ChillMainBundle/Resources/views/Password/recover_password_form.html.twig
View File

@@ -4,7 +4,7 @@
{% block title %}{{ title }}{% endblock %} {% block title %}{{ title }}{% endblock %}
{% block content %} {% block password_content %}
<div class="col-10 centered"> <div class="col-10 centered">
<h1>{{ title }}</h1> <h1>{{ title }}</h1>

2
src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password.html.twig
View File

@@ -22,7 +22,7 @@
{% block title %}{{"Recover password"|trans}}{% endblock %} {% block title %}{{"Recover password"|trans}}{% endblock %}
{% block content %} {% block password_content %}
<div class="col-10 centered"> <div class="col-10 centered">
<h1>{{ 'Recover password'|trans }}</h1> <h1>{{ 'Recover password'|trans }}</h1>

2
src/Bundle/ChillMainBundle/Resources/views/Password/request_recover_password_confirm.html.twig
View File

@@ -2,7 +2,7 @@
{% block title "Check your email"|trans %} {% block title "Check your email"|trans %}
{% block content %} {% block password_content %}
<div class="col-10 centered"> <div class="col-10 centered">

6
src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
View File

@@ -30,7 +30,11 @@
{{ include('@ChillMain/Layout/_debug.html.twig') }} {{ include('@ChillMain/Layout/_debug.html.twig') }}
{% endif %} {% 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 %}{# {% block top_banner %}{#
To use if you want to add a banner below the header (ie the menu) To use if you want to add a banner below the header (ie the menu)