jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added section name for meta-fields positioning (#5747)

Browse Source
This commit is contained in:
Kevin Papst
2025-12-26 12:54:15 +01:00
committed by GitHub
parent 26361da873
commit 5a0c783a76
10 changed files with 101 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
templates/activity/edit.html.twig
View File

@@ -8,6 +8,7 @@
'back': path('admin_activity')
} %}
{% embed formEditTemplate with formOptions %}
{% import "macros/form_helper.html.twig" as form_helper %}
{% block form_body %}
<div class="row">
<div class="col-md-9">
@@ -49,6 +50,18 @@
</div>
</div>
{% endif %}
{{ form_helper.metafields(form, null) }}
{% embed '@theme/embeds/collapsible.html.twig' with {id: 'activity_invoice_settings'} %}
{% import "macros/widgets.html.twig" as widgets %}
{% import "macros/form_helper.html.twig" as form_helper %}
{% block title %}{{ 'invoices'|trans }}{% endblock %}
{% block body %}
{% if form.invoiceText is defined %}
{{ form_row(form.invoiceText) }}
{% endif %}
{{ form_helper.metafields(form, 'invoice') }}
{% endblock %}
{% endembed %}
<div class="row">
<div class="col-md-6">
{{ form_row(form.visible) }}
@@ -57,18 +70,6 @@
{{ form_row(form.billable) }}
</div>
</div>
{% if form.metaFields is defined and form.metaFields is not empty %}
{{ form_row(form.metaFields) }}
{% endif %}
{% embed '@theme/embeds/collapsible.html.twig' with {id: 'activity_invoice_settings'} %}
{% import "macros/widgets.html.twig" as widgets %}
{% block title %}{{ 'invoices'|trans }}{% endblock %}
{% block body %}
{% if form.invoiceText is defined %}
{{ form_row(form.invoiceText) }}
{% endif %}
{% endblock %}
{% endembed %}
{{ form_rest(form) }}
{% endblock %}
{% endembed %}

10
templates/customer/edit.html.twig
View File

@@ -8,6 +8,7 @@
'back': path('admin_customer')
} %}
{% embed formEditTemplate with formOptions %}
{% import "macros/form_helper.html.twig" as form_helper %}
{% block form_body %}
<div class="row">
<div class="col-md-9">
@@ -75,11 +76,10 @@
</div>
</div>
{% endif %}
{% if form.metaFields is defined and form.metaFields is not empty %}
{{ form_row(form.metaFields) }}
{% endif %}
{{ form_helper.metafields(form, null) }}
{% embed '@theme/embeds/collapsible.html.twig' with {id: 'customer_address_settings'} %}
{% import "macros/widgets.html.twig" as widgets %}
{% import "macros/form_helper.html.twig" as form_helper %}
{% block title %}{{ 'address'|trans }}{% endblock %}
{% block body %}
<div class="row">
@@ -125,11 +125,12 @@
{{ form_row(form.timezone) }}
</div>
</div>
{{ form_helper.metafields(form, 'address') }}
{% endblock %}
{% endembed %}
{% embed '@theme/embeds/collapsible.html.twig' with {id: 'customer_invoice_settings'} %}
{% import "macros/widgets.html.twig" as widgets %}
{% import "macros/form_helper.html.twig" as form_helper %}
{% block title %}{{ 'invoices'|trans }}{% endblock %}
{% block body %}
{% if form.buyerReference is defined %}
@@ -141,6 +142,7 @@
{% if form.invoiceText is defined %}
{{ form_row(form.invoiceText) }}
{% endif %}
{{ form_helper.metafields(form, 'invoice') }}
{% endblock %}
{% endembed %}
<div class="row">

4
templates/form/blocks.html.twig
View File

@@ -474,7 +474,9 @@
{%- block meta_fields_collection_widget -%}
{% for meta in form|sort((a, b) => a.vars.data.order <=> b.vars.data.order) %}
{{ form_row(meta.value, {'row_attr': {'class': 'mb-3 ' ~ form.parent.vars.name ~ '_row_' ~ form.vars.name ~ '_' ~ meta.vars.name}}) }}
{% if not meta.rendered %}
{{ form_row(meta.value, {'row_attr': {'class': 'mb-3 ' ~ form.parent.vars.name ~ '_row_' ~ form.vars.name ~ '_' ~ meta.vars.name}}) }}
{% endif %}
{% endfor %}
{%- endblock meta_fields_collection_widget %}

7
templates/macros/form_helper.html.twig Normal file
View File

@@ -0,0 +1,7 @@
{% macro metafields(form, section) %}
{% for meta in form.metaFields|sort((a, b) => a.vars.data.order <=> b.vars.data.order) %}
{% if meta.vars.data.section is same as (section) %}
{{ form_row(meta.value, {'row_attr': {'class': 'mb-3 ' ~ form.vars.name ~ '_row_' ~ form.metaFields.vars.name ~ '_' ~ meta.vars.name}}) }}
{% endif %}
{% endfor %}
{% endmacro %}

7
templates/project/edit.html.twig
View File

@@ -8,6 +8,7 @@
'back': path('admin_project')
} %}
{% embed formEditTemplate with formOptions %}
{% import "macros/form_helper.html.twig" as form_helper %}
{% block form_body %}
<div class="row">
<div class="col-md-9">
@@ -58,11 +59,10 @@
</div>
</div>
{% endif %}
{% if form.metaFields is defined and form.metaFields is not empty %}
{{ form_row(form.metaFields) }}
{% endif %}
{{ form_helper.metafields(form, null) }}
{% embed '@theme/embeds/collapsible.html.twig' with {id: 'project_invoice_settings'} %}
{% import "macros/widgets.html.twig" as widgets %}
{% import "macros/form_helper.html.twig" as form_helper %}
{% block title %}{{ 'invoices'|trans }}{% endblock %}
{% block body %}
<div class="row">
@@ -76,6 +76,7 @@
{% if form.invoiceText is defined %}
{{ form_row(form.invoiceText) }}
{% endif %}
{{ form_helper.metafields(form, 'invoice') }}
{% endblock %}
{% endembed %}
<div class="row">