Skip to content
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

Jump to bottom

Change channel form layout in admin panel #16391

Merged
merged 2 commits into from
Jun 18, 2024
Merged

Change channel form layout in admin panel #16391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
671580c
Change channel form layout in admin panel
bartek-sek Jun 12, 2024
40c08d8
Change channel update form layout in admin panel
bartek-sek Jun 13, 2024
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
20 changes: 10 additions & 10 deletions src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/channel/create.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ twig_hooks:
'sylius_admin.channel.create.content.form.sections':
general:
template: '@SyliusAdmin/channel/form/sections/general.html.twig'
money:
template: '@SyliusAdmin/channel/form/sections/money.html.twig'
shop_billing_data:
template: '@SyliusAdmin/channel/form/sections/shop_billing_data.html.twig'
money:
template: '@SyliusAdmin/channel/form/sections/money.html.twig'
omnibus:
template: '@SyliusAdmin/channel/form/sections/omnibus.html.twig'
look_and_feel:
Expand All @@ -26,12 +26,12 @@ twig_hooks:
'sylius_admin.channel.create.content.form.sections.general':
code:
template: '@SyliusAdmin/channel/form/sections/general/code.html.twig'
color:
template: '@SyliusAdmin/channel/form/sections/general/color.html.twig'
enabled:
template: '@SyliusAdmin/channel/form/sections/general/enabled.html.twig'
channel_name:
template: '@SyliusAdmin/channel/form/sections/general/name.html.twig'
color:
template: '@SyliusAdmin/channel/form/sections/general/color.html.twig'
hostname:
template: '@SyliusAdmin/channel/form/sections/general/hostname.html.twig'
contact_email:
Expand All @@ -52,14 +52,14 @@ twig_hooks:
template: '@SyliusAdmin/channel/form/sections/general/account_verification_required.html.twig'

'sylius_admin.channel.create.content.form.sections.money':
base_currency:
template: '@SyliusAdmin/channel/form/sections/money/base_currency.html.twig'
currencies:
template: '@SyliusAdmin/channel/form/sections/money/currencies.html.twig'
default_tax_zone:
template: '@SyliusAdmin/channel/form/sections/money/default_tax_zone.html.twig'
tax_calculation_strategy:
template: '@SyliusAdmin/channel/form/sections/money/tax_calculation_strategy.html.twig'
currencies:
template: '@SyliusAdmin/channel/form/sections/money/currencies.html.twig'
base_currency:
template: '@SyliusAdmin/channel/form/sections/money/base_currency.html.twig'

'sylius_admin.channel.create.content.form.sections.shop_billing_data':
company:
Expand Down Expand Up @@ -88,7 +88,7 @@ twig_hooks:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/theme.html.twig'
menu_taxon:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/menu_taxon.html.twig'
default_locale:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/default_locale.html.twig'
locales:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/locales.html.twig'
default_locale:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/default_locale.html.twig'
20 changes: 10 additions & 10 deletions src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/channel/update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ twig_hooks:
'sylius_admin.channel.update.content.form.sections':
general:
template: '@SyliusAdmin/channel/form/sections/general.html.twig'
money:
template: '@SyliusAdmin/channel/form/sections/money.html.twig'
shop_billing_data:
template: '@SyliusAdmin/channel/form/sections/shop_billing_data.html.twig'
money:
template: '@SyliusAdmin/channel/form/sections/money.html.twig'
omnibus:
template: '@SyliusAdmin/channel/form/sections/omnibus.html.twig'
look_and_feel:
Expand All @@ -28,12 +28,12 @@ twig_hooks:
'sylius_admin.channel.update.content.form.sections.general':
code:
template: '@SyliusAdmin/channel/form/sections/general/code.html.twig'
color:
template: '@SyliusAdmin/channel/form/sections/general/color.html.twig'
enabled:
template: '@SyliusAdmin/channel/form/sections/general/enabled.html.twig'
channel_name:
template: '@SyliusAdmin/channel/form/sections/general/name.html.twig'
color:
template: '@SyliusAdmin/channel/form/sections/general/color.html.twig'
hostname:
template: '@SyliusAdmin/channel/form/sections/general/hostname.html.twig'
contact_email:
Expand All @@ -54,14 +54,14 @@ twig_hooks:
template: '@SyliusAdmin/channel/form/sections/general/account_verification_required.html.twig'

'sylius_admin.channel.update.content.form.sections.money':
base_currency:
template: '@SyliusAdmin/channel/form/sections/money/base_currency.html.twig'
currencies:
template: '@SyliusAdmin/channel/form/sections/money/currencies.html.twig'
default_tax_zone:
template: '@SyliusAdmin/channel/form/sections/money/default_tax_zone.html.twig'
tax_calculation_strategy:
template: '@SyliusAdmin/channel/form/sections/money/tax_calculation_strategy.html.twig'
currencies:
template: '@SyliusAdmin/channel/form/sections/money/currencies.html.twig'
base_currency:
template: '@SyliusAdmin/channel/form/sections/money/base_currency.html.twig'

'sylius_admin.channel.update.content.form.sections.shop_billing_data':
company:
Expand Down Expand Up @@ -90,7 +90,7 @@ twig_hooks:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/theme.html.twig'
menu_taxon:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/menu_taxon.html.twig'
default_locale:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/default_locale.html.twig'
locales:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/locales.html.twig'
default_locale:
template: '@SyliusAdmin/channel/form/sections/look_and_feel/default_locale.html.twig'
4 changes: 3 additions & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{% hook 'sections' %}
<div class="grid gap-4">
{% hook 'sections' %}
</div>
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/general.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="card mb-3">
<div class="g-col-12 g-col-xl-6 card" style="grid-row: 1 / 4;">
<div class="card-header">
Wojdylak marked this conversation as resolved.
Show resolved Hide resolved
<div class="card-title">{{ 'sylius.ui.general'|trans }}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/general/code.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="col-12 col-md-9">
<div class="col-12 col-md-6">
{{ form_row(hookable_metadata.context.form.code, sylius_test_form_attribute('code')) }}
</div>
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/general/color.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="col-12 col-md-3">
<div class="col-6 col-md-2">
{{ form_row(hookable_metadata.context.form.color, sylius_test_form_attribute('color')) }}
</div>
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/general/enabled.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="col-auto">
<div class="mb-5 mt-5">
<div class="col-3 d-flex align-items-end">
<div class="mb-3">
{{ form_row(hookable_metadata.context.form.enabled, sylius_test_form_attribute('enabled')|merge({ label_attr: { class: 'checkbox-switch' } })) }}
</div>
</div>
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/general/hostname.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="col-12">
<div class="col-12 col-md-6">
{{ form_row(hookable_metadata.context.form.hostname, sylius_test_form_attribute('hostname')) }}
</div>
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/general/name.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="col-12 col-md-9">
<div class="col-12 col-md-6">
{{ form_row(hookable_metadata.context.form.name, sylius_test_form_attribute('name')) }}
</div>
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/look_and_feel.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="card mb-3">
<div class="g-col-12 card mb-3">
<div class="card-header">
<div class="card-title">{{ 'sylius.ui.look_and_feel'|trans }}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/money.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="card mb-3">
<div class="card g-col-12 g-col-xl-6">
<div class="card-header">
<div class="card-title">{{ 'sylius.ui.money'|trans }}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/omnibus.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="card mb-3">
<div class="g-col-12 g-col-xl-6 g-start-xl-7 card">
<div class="card-header">
<div class="card-title">{{ 'sylius.ui.omnibus'|trans }}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/templates/channel/form/sections/shop_billing_data.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="card mb-3">
<div class="g-col-12 g-col-xl-6 g-start-xl-7 card">
<div class="card-header">
<div class="card-title">{{ 'sylius.form.channel.shop_billing_data'|trans }}</div>
</div>
Expand Down
Loading