Skip to content

Commit ed9dc8f

Browse files
WojdylakWojdylak
committed
[AdminUser][Customer] Improve Twig hook structure by adding left and right sections
1 parent d3293b3 commit ed9dc8f

12 files changed

Lines changed: 97 additions & 58 deletions

File tree

‎UPGRADE-2.0.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# UPGRADE FROM `2.0.2` TO `2.0.3`
2+
3+
1. New `left` and `right` sections have been added to the following Twig hooks to improve customization:
4+
- `sylius_admin.admin_user.create.content.form.sections`
5+
- `sylius_admin.admin_user.update.content.form.sections`
6+
- `sylius_admin.customer.create.content.form.sections`
7+
- `sylius_admin.customer.update.content.form.sections`
8+
9+
Hooks previously attached to the `sections` hook are now divided into `left` and `right` sections. This change doesn't affect to the original hook names.
10+
11+
For example, the `account` hook previously attached to `sylius_admin.admin_user.create.content.form.sections` is now located in `sylius_admin.admin_user.create.content.form.sections#left`,
12+
but its name remains `sylius_admin.admin_user.create.content.form.sections.account`.
13+
114
# UPGRADE FROM `2.0.0` TO `2.0.1`
215

316
### Frontend

‎src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/admin_user/create.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ sylius_twig_hooks:
1919
'sylius_admin.admin_user.create.content.form.sections':
2020
general:
2121
enabled: false
22+
23+
'sylius_admin.admin_user.create.content.form.sections#left':
2224
account:
2325
template: '@SyliusAdmin/admin_user/form/sections/account.html.twig'
24-
priority: 100
26+
priority: 0
27+
28+
'sylius_admin.admin_user.create.content.form.sections#right':
2529
personal_information:
2630
template: '@SyliusAdmin/admin_user/form/sections/personal_information.html.twig'
2731
priority: 0

‎src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/admin_user/update.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ sylius_twig_hooks:
1919
'sylius_admin.admin_user.update.content.form.sections':
2020
general:
2121
enabled: false
22+
23+
'sylius_admin.admin_user.update.content.form.sections#left':
2224
account:
2325
template: '@SyliusAdmin/admin_user/form/sections/account.html.twig'
24-
priority: 100
26+
priority: 0
27+
28+
'sylius_admin.admin_user.update.content.form.sections#right':
2529
personal_information:
2630
template: '@SyliusAdmin/admin_user/form/sections/personal_information.html.twig'
2731
priority: 0

‎src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/customer/create.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,22 @@ sylius_twig_hooks:
1717
priority: 0
1818

1919
'sylius_admin.customer.create.content.form.sections':
20+
general:
21+
enabled: false
22+
23+
'sylius_admin.customer.create.content.form.sections#left':
2024
general:
2125
template: '@SyliusAdmin/customer/form/sections/general.html.twig'
22-
priority: 200
23-
extra_information:
24-
template: '@SyliusAdmin/customer/form/sections/extra_information.html.twig'
2526
priority: 100
2627
account_credentials:
2728
template: '@SyliusAdmin/customer/form/sections/account_credentials.html.twig'
2829
priority: 0
2930

31+
'sylius_admin.customer.create.content.form.sections#right':
32+
extra_information:
33+
template: '@SyliusAdmin/customer/form/sections/extra_information.html.twig'
34+
priority: 0
35+
3036
'sylius_admin.customer.create.content.form.sections.general':
3137
default:
3238
enabled: false

‎src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/customer/update.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,22 @@ sylius_twig_hooks:
2424
priority: 0
2525

2626
'sylius_admin.customer.update.content.form.sections':
27+
general:
28+
enabled: false
29+
30+
'sylius_admin.customer.update.content.form.sections#left':
2731
general:
2832
template: '@SyliusAdmin/customer/form/sections/general.html.twig'
29-
priority: 200
30-
extra_information:
31-
template: '@SyliusAdmin/customer/form/sections/extra_information.html.twig'
3233
priority: 100
3334
account_credentials:
3435
template: '@SyliusAdmin/customer/form/sections/account_credentials.html.twig'
3536
priority: 0
3637

38+
'sylius_admin.customer.update.content.form.sections#right':
39+
extra_information:
40+
template: '@SyliusAdmin/customer/form/sections/extra_information.html.twig'
41+
priority: 0
42+
3743
'sylius_admin.customer.update.content.form.sections.general':
3844
default:
3945
enabled: false

‎src/Sylius/Bundle/AdminBundle/templates/admin_user/form/sections.html.twig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
<div class="row">
22
{% hook 'sections' %}
3+
<div class="row">
4+
<div class="col-12 col-md-6">
5+
{% hook 'sections#left' %}
6+
</div>
7+
<div class="col-12 col-md-6">
8+
{% hook 'sections#right' %}
9+
</div>
10+
</div>
311
</div>

‎src/Sylius/Bundle/AdminBundle/templates/admin_user/form/sections/account.html.twig‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
<div class="col-12 col-md-6">
2-
<div class="card">
3-
<div class="card-header">
4-
<div class="card-title">
5-
{{ 'sylius.ui.account'|trans }}
6-
</div>
7-
</div>
8-
<div class="card-body">
9-
{% hook 'account' %}
1+
<div class="card mb-3">
2+
<div class="card-header">
3+
<div class="card-title">
4+
{{ 'sylius.ui.account'|trans }}
105
</div>
116
</div>
7+
<div class="card-body">
8+
{% hook 'account' %}
9+
</div>
1210
</div>

‎src/Sylius/Bundle/AdminBundle/templates/admin_user/form/sections/personal_information.html.twig‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
<div class="col-12 col-md-6">
2-
<div class="card">
3-
<div class="card-header">
4-
<div class="card-title">
5-
{{ 'sylius.ui.personal_information'|trans }}
6-
</div>
7-
</div>
8-
<div class="card-body">
9-
{% hook 'personal_information' %}
1+
<div class="card mb-3">
2+
<div class="card-header">
3+
<div class="card-title">
4+
{{ 'sylius.ui.personal_information'|trans }}
105
</div>
116
</div>
7+
<div class="card-body">
8+
{% hook 'personal_information' %}
9+
</div>
1210
</div>

‎src/Sylius/Bundle/AdminBundle/templates/customer/form/sections.html.twig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
<div class="row">
22
{% hook 'sections' %}
3+
<div class="row">
4+
<div class="col-12 col-md-6">
5+
{% hook 'sections#left' %}
6+
</div>
7+
<div class="col-12 col-md-6">
8+
{% hook 'sections#right' %}
9+
</div>
10+
</div>
311
</div>

‎src/Sylius/Bundle/AdminBundle/templates/customer/form/sections/account_credentials.html.twig‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
<div class="col-12 col-md-6 mt-2">
2-
<div class="card">
3-
<div class="card-header">
4-
<div class="card-title">
5-
{{ 'sylius.ui.account_credentials'|trans }}
6-
</div>
1+
<div class="card mb-3">
2+
<div class="card-header">
3+
<div class="card-title">
4+
{{ 'sylius.ui.account_credentials'|trans }}
75
</div>
8-
<div class="card-body">
9-
{% if (hookable_metadata.context.resource.user.id|default(null) is null) %}
10-
<div class="alert alert-info">
11-
{{ 'sylius.ui.account_credentials_details'|trans }}
12-
</div>
13-
{% endif %}
6+
</div>
7+
<div class="card-body">
8+
{% if (hookable_metadata.context.resource.user.id|default(null) is null) %}
9+
<div class="alert alert-info">
10+
{{ 'sylius.ui.account_credentials_details'|trans }}
11+
</div>
12+
{% endif %}
1413

15-
{% hook 'account_credentials' %}
16-
</div>
14+
{% hook 'account_credentials' %}
1715
</div>
1816
</div>

0 commit comments

Comments
 (0)