mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-19 15:22:17 +02:00
N°6948 - Upgrade "symfony/twig-bridge" to v5.4.31
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Copyright (c) 2017 ZURB, inc. -- MIT License
|
||||
*
|
||||
* https://raw.githubusercontent.com/foundation/foundation-emails/v2.2.1/dist/foundation-emails.css
|
||||
* https://github.com/foundation/foundation-emails/blob/v2.2.1/dist/foundation-emails.css
|
||||
*/
|
||||
|
||||
.wrapper {
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
{% if markdown %}
|
||||
{{ include('@email/zurb_2/notification/content_markdown.html.twig') }}
|
||||
{% else %}
|
||||
{{ (raw ? content|raw : content)|nl2br }}
|
||||
{{ raw ? content|raw : content|nl2br }}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@@ -90,6 +90,10 @@
|
||||
{%- if required -%}
|
||||
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
|
||||
{%- endif -%}
|
||||
{%- if parent_label_class is defined -%}
|
||||
{% set embed_label_classes = parent_label_class|split(' ')|filter(class => class in ['checkbox-inline', 'radio-inline']) %}
|
||||
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ embed_label_classes|join(' '))|trim}) -%}
|
||||
{% endif %}
|
||||
{%- if label is not same as(false) and label is empty -%}
|
||||
{%- if label_format is not empty -%}
|
||||
{%- set label = label_format|replace({
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
{%- set prepend = not (money_pattern starts with '{{') -%}
|
||||
{%- set append = not (money_pattern ends with '}}') -%}
|
||||
{%- if prepend or append -%}
|
||||
<div class="input-group{{ group_class|default('') }}">
|
||||
<div class="input-group {{ group_class|default('') }}">
|
||||
{%- if prepend -%}
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
|
||||
@@ -283,6 +283,10 @@
|
||||
{%- if required -%}
|
||||
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) -%}
|
||||
{%- endif -%}
|
||||
{%- if parent_label_class is defined -%}
|
||||
{% set embed_label_classes = parent_label_class|split(' ')|filter(class => class in ['checkbox-inline', 'radio-inline']) %}
|
||||
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ embed_label_classes|join(' '))|trim}) -%}
|
||||
{% endif %}
|
||||
{%- if label is not same as(false) and label is empty -%}
|
||||
{%- if label_format is not empty -%}
|
||||
{%- set label = label_format|replace({
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
{%- set prepend = not (money_pattern starts with '{{') -%}
|
||||
{%- set append = not (money_pattern ends with '}}') -%}
|
||||
{%- if prepend or append -%}
|
||||
<div class="input-group{{ group_class|default('') }}">
|
||||
<div class="input-group {{ group_class|default('') }}">
|
||||
{%- if prepend -%}
|
||||
<span class="input-group-text">{{ money_pattern|form_encode_currency }}</span>
|
||||
{%- endif -%}
|
||||
@@ -213,10 +213,10 @@
|
||||
{%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
|
||||
{%- set row_class = 'form-check' -%}
|
||||
{%- if 'checkbox-inline' in parent_label_class %}
|
||||
{% set row_class = row_class ~ ' form-check-inline' %}
|
||||
{%- set row_class = row_class ~ ' form-check-inline' -%}
|
||||
{% endif -%}
|
||||
{%- if 'checkbox-switch' in parent_label_class %}
|
||||
{% set row_class = row_class ~ ' form-switch' %}
|
||||
{%- set row_class = row_class ~ ' form-switch' -%}
|
||||
{% endif -%}
|
||||
<div class="{{ row_class }}">
|
||||
{{- form_label(form, null, { widget: parent() }) -}}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
{% set prepend = not (money_pattern starts with '{{') %}
|
||||
{% set append = not (money_pattern ends with '}}') %}
|
||||
{% if prepend or append %}
|
||||
<div class="input-group{{ group_class|default('') }}">
|
||||
<div class="input-group {{ group_class|default('') }}">
|
||||
{% if prepend %}
|
||||
<span class="input-group-addon">{{ money_pattern|form_encode_currency }}</span>
|
||||
{% endif %}
|
||||
|
||||
@@ -253,6 +253,10 @@
|
||||
{% if errors|length > 0 -%}
|
||||
{% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' error')|trim}) %}
|
||||
{% endif %}
|
||||
{%- if parent_label_class is defined -%}
|
||||
{% set embed_label_classes = parent_label_class|split(' ')|filter(class => class in ['checkbox-inline', 'radio-inline']) %}
|
||||
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' ' ~ embed_label_classes|join(' '))|trim}) -%}
|
||||
{% endif %}
|
||||
{% if label is empty %}
|
||||
{%- if label_format is not empty -%}
|
||||
{% set label = label_format|replace({
|
||||
|
||||
Reference in New Issue
Block a user