Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-23 18:54:24 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix sf4 deprecated: rename twig spaceless tags

Browse Source
This commit is contained in:
Tchama 2020-07-22 16:28:21 +02:00
parent 977aa92c55
commit 9850bfba81
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Resources/views/Form/fields.html.twig
View File

@ -17,9 +17,9 @@
#} #}
{% block form_row %} {% block form_row %}
{% spaceless %} {% apply spaceless %}
<div class="container"> <div class="container">
<div class="{% spaceless %} <div class="{% apply spaceless %}
{% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %} {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %}
grid-12 grid-12
{% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %} {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
@ -27,12 +27,12 @@
{% else %} {% else %}
grid-4 clear grid-4 clear
{% endif %} {% endif %}
{% endspaceless %}"> {% endapply %}">
{% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %} {% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %}
{{ form_label(form) }} {{ form_label(form) }}
{% endif %} {% endif %}
</div> </div>
<div class="{% spaceless %} <div class="{% apply spaceless %}
{% if attr.class is defined and 'cf-title' in attr.class %} {% if attr.class is defined and 'cf-title' in attr.class %}
grid-12 grid-12
{% elseif attr.class is defined and 'cf-fields' in attr.class %} {% elseif attr.class is defined and 'cf-fields' in attr.class %}
@ -42,16 +42,16 @@
{% else %} {% else %}
grid-8 grid-8
{% endif %} {% endif %}
{% endspaceless %}"> {% endapply %}">
{{ form_widget(form) }} {{ form_widget(form) }}
{{ form_errors(form) }} {{ form_errors(form) }}
</div> </div>
</div> </div>
{% endspaceless %} {% endapply %}
{% endblock form_row %} {% endblock form_row %}
{% block choice_widget_expanded %} {% block choice_widget_expanded %}
{% spaceless %} {% apply spaceless %}
<div {{ block('widget_container_attributes') }} class="choice-widget-expanded"> <div {{ block('widget_container_attributes') }} class="choice-widget-expanded">
{% for child in form %} {% for child in form %}
<span class="inline-choice"> <span class="inline-choice">
@ -66,12 +66,12 @@
chill.checkNullValuesInChoices("{{ form.vars.full_name }}"); chill.checkNullValuesInChoices("{{ form.vars.full_name }}");
}); });
</script> </script>
{% endspaceless %} {% endapply %}
{% endblock choice_widget_expanded %} {% endblock choice_widget_expanded %}
{% block choice_with_other_widget %} {% block choice_with_other_widget %}
{% spaceless %} {% apply spaceless %}
{% for child in form._choices %} {% for child in form._choices %}
{%- if child.vars.value != '_other' -%} {%- if child.vars.value != '_other' -%}
<div class="inline-choice"> <div class="inline-choice">
@ -98,7 +98,7 @@
chill.checkNullValuesInChoices("{{ form._choices.vars.full_name }}"); chill.checkNullValuesInChoices("{{ form._choices.vars.full_name }}");
}); });
</script> </script>
{% endspaceless %} {% endapply %}
{% endblock choice_with_other_widget %} {% endblock choice_with_other_widget %}
{% block money_widget %} {% block money_widget %}
@ -110,7 +110,7 @@
{% block date_widget %} {% block date_widget %}
{% spaceless %} {% apply spaceless %}
{% if widget == 'single_text' %} {% if widget == 'single_text' %}
{% set attr = {'class' : 'input datepicker'} %} {% set attr = {'class' : 'input datepicker'} %}
{{ block('form_widget_simple') }} {{ block('form_widget_simple') }}
@ -123,7 +123,7 @@
})|raw }} })|raw }}
</div> </div>
{% endif %} {% endif %}
{% endspaceless %} {% endapply %}
{% endblock date_widget %} {% endblock date_widget %}
{%- block time_widget -%} {%- block time_widget -%}
@ -139,7 +139,7 @@
{%- endblock time_widget -%} {%- endblock time_widget -%}
{% block form_errors %} {% block form_errors %}
{% spaceless %} {% apply spaceless %}
{% if errors|length > 0 %} {% if errors|length > 0 %}
<ul class="errors chill-form__errors"> <ul class="errors chill-form__errors">
{% for error in errors %} {% for error in errors %}
@ -147,7 +147,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
{% endspaceless %} {% endapply %}
{% endblock form_errors %} {% endblock form_errors %}
{% block _formatter__aggregator_placement_csv_formatter_row %} {% block _formatter__aggregator_placement_csv_formatter_row %}

4
Resources/views/Menu/adminSection.html.twig
View File

@ -27,13 +27,13 @@
<div style="font-family: 'Open Sans'; font-weight:300; font-size: 0.75em; text-align:left; height: 46px; display:inline-block; width: calc(100% - 5em - 1px); vertical-align:top;"> <div style="font-family: 'Open Sans'; font-weight:300; font-size: 0.75em; text-align:left; height: 46px; display:inline-block; width: calc(100% - 5em - 1px); vertical-align:top;">
<a href="{{ menu.uri }}">{{ menu.label|trans }}</a> <a href="{{ menu.uri }}">{{ menu.label|trans }}</a>
</div> </div>
<div style="background-color: #333333; text-align:center;width: 2em; margin-left:-0.15em; font-size:1.5em; color:#FFF; height: 46px; display:inline-block; vertical-align:top;float:right">{% spaceless %} <div style="background-color: #333333; text-align:center;width: 2em; margin-left:-0.15em; font-size:1.5em; color:#FFF; height: 46px; display:inline-block; vertical-align:top;float:right">{% apply spaceless %}
{% if menu.extras.icons is defined %} {% if menu.extras.icons is defined %}
{% for icon in menu.extras.icons %} {% for icon in menu.extras.icons %}
<i class="fa fa-{{ icon }}"></i> <i class="fa fa-{{ icon }}"></i>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endspaceless %}</div> {% endapply %}</div>
</div> </div>
</li> </li>
{% endfor %} {% endfor %}