composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
lenaick.moreira
2026-03-02 10:56:31 +01:00
parent 52a1d8d626 fc967c06ce
commit ae633111c0
123 changed files with 2898 additions and 2149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/symfony/twig-bridge/Resources/views/Form/bootstrap_4_layout.html.twig
View File

@@ -235,7 +235,8 @@
{%- endif -%}
<{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}>
{{- block('form_label_content') -}}
{% block form_label_errors %}{{- form_errors(form) -}}{% endblock form_label_errors %}</{{ element|default('label') }}>
</{{ element|default('label') }}>
{% block form_label_errors %}{{- form_errors(form) -}}{% endblock form_label_errors %}
{%- else -%}
{%- if errors|length > 0 -%}
<div id="{{ id }}_errors" class="mb-2">
@@ -271,8 +272,8 @@
{%- if label is not same as(false) -%}
{{- block('form_label_content') -}}
{%- endif -%}
{{- form_errors(form) -}}
</label>
{{- form_errors(form) -}}
{%- endif -%}
{%- endblock checkbox_radio_label %}
@@ -297,7 +298,7 @@
{% block form_errors -%}
{%- if errors|length > 0 -%}
<span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block">
<span class="{% if form is not rootform %}invalid-feedback{% else %}alert alert-danger{% endif %} d-block mb-1">
{%- for error in errors -%}
<span class="d-block">
<span class="form-error-icon badge badge-danger text-uppercase">{{ 'Error'|trans({}, 'validators') }}</span> <span class="form-error-message">{{ error.message }}</span>