Block definitions should be at the top level, not the included level

This commit is contained in:
2023-06-05 11:52:09 +01:00
parent 9b229fc6ee
commit 83bf9a7307
29 changed files with 99 additions and 93 deletions

View File

@@ -1,9 +1,7 @@
{% block input_group_description %}
{% include "forms/inputs/abstract/description.html.twig" with
{
"type" : "group",
"current_value" : group.description,
"col_width" : col_width
}
%}
{% endblock %}
%}

View File

@@ -1,4 +1,3 @@
{% block input_group_icon %}
{% include "forms/inputs/abstract/icon.html.twig" with
{
"type" : "group",
@@ -7,5 +6,4 @@
"placeholder" : translate('GROUP.ICON_EXPLAIN'),
"col_width" : col_width
}
%}
{% endblock %}
%}

View File

@@ -1,4 +1,3 @@
{% block input_group_name %}
{% include "forms/inputs/abstract/name.html.twig" with
{
"type" : "group",
@@ -7,5 +6,4 @@
"placeholder" : translate('GROUP.NAME_EXPLAIN'),
"col_width" : col_width
}
%}
{% endblock %}
%}

View File

@@ -1,9 +1,7 @@
{% block input_group_slug %}
{% include "forms/inputs/abstract/slug.html.twig" with
{
"type" : "group",
"current_value" : group.slug,
"col_width" : col_width
}
%}
{% endblock %}
%}

View File

@@ -1,4 +1,3 @@
{% block input_user_locale %}
{% if site.registration.captcha %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -13,5 +12,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_register_locale %}
{% if 'locale' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -13,5 +12,4 @@
<p class="help-block">{{translate("LOCALE.ACCOUNT")}}.</p>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_locale %}
{% if 'locale' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<label for="input-register-first_name">{{translate('NAME_AND_EMAIL')}}</label>
@@ -24,5 +23,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_password %}
{% if 'password' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -10,5 +9,4 @@
<input type="password" id="input-register-passwordc" name="passwordc" placeholder="{{translate('PASSWORD.CONFIRM')}}" class="form-control">
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_register_user_name %}
{% if 'user_name' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -7,5 +6,4 @@
<input type="text" id="input-register-username" name="user_name" placeholder="{{translate('USERNAME.CHOOSE')}}" class="form-control" autocomplete="off">
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,9 +1,7 @@
{% block input_role_description %}
{% include "forms/inputs/abstract/description.html.twig" with
{
"type" : "role",
"current_value" : role.description,
"col_width" : col_width
}
%}
{% endblock %}
%}

View File

@@ -1,4 +1,3 @@
{% block input_role_name %}
{% include "forms/inputs/abstract/name.html.twig" with
{
"type" : "role",
@@ -6,5 +5,4 @@
"placeholder" : translate('ROLE.NAME_EXPLAIN'),
"col_width" : col_width
}
%}
{% endblock %}
%}

View File

@@ -1,9 +1,7 @@
{% block input_role_slug %}
{% include "forms/inputs/abstract/slug.html.twig" with
{
"type" : "role",
"current_value" : role.slug,
"col_width" : col_width
}
%}
{% endblock %}
%}

View File

@@ -1,4 +1,3 @@
{% block input_user_current_password %}
{% if 'password' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -9,5 +8,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_email %}
{% if 'email' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -16,5 +15,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_first_name %}
{% if 'first_name' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -9,5 +8,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_group %}
{% if 'group' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -19,5 +18,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_last_name %}
{% if 'last_name' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -9,5 +8,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_locale %}
{% if 'locale' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -17,5 +16,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_name %}
{% if 'name' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="row">
@@ -6,5 +5,4 @@
{% include "forms/inputs/user-last_name.html.twig" with { 'col_width': 'col-sm-6' } %}
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_new_password %}
{% if 'password' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -16,5 +15,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_theme %}
{% if 'theme' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -17,5 +16,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}

View File

@@ -1,4 +1,3 @@
{% block input_user_user_name %}
{% if 'user_name' not in form.fields.hidden %}
{% if col_width %}<div class="{{col_width}}">{% endif %}
<div class="form-group">
@@ -9,5 +8,4 @@
</div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %}
{% endblock %}
{% endif %}