Skip to content

Commit

Permalink
fix: description positionning in question design
Browse files Browse the repository at this point in the history
  • Loading branch information
@btry
btry committed Mar 17, 2022
1 parent e13bb3e commit a9352fd
Show file tree
Hide file tree
Showing 24 changed files with 465 additions and 115 deletions.
19 changes: 15 additions & 4 deletions templates/field/actorfield.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,34 @@

{% block questionFields %}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.dropdownYesNo(
'required',
item.fields['required'],
__('Required', 'formcreator'),
{
'add_field_class': 'plugin_formcreator_required'
'add_field_class': 'plugin_formcreator_required',
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{# May be empty has no meaning as required makes mandatory to have at lease 1 checkbox ticked #}
{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.textareaField(
'default_values',
item.fields['default_values'],
__('Default values')
__('Default values'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}
{% endblock %}
25 changes: 20 additions & 5 deletions templates/field/checkboxesfield.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,43 @@
{% import '@formcreator/components/form/fields_macros.html.twig' as formcreatorFields %}

{% block questionFields %}
{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.dropdownYesNo(
'required',
item.fields['required'],
__('Required', 'formcreator'),
__('Required', 'formcreator'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{# May be empty has no meaning as required makes mandatory to have at lease 1 checkbox ticked #}
{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{% import 'components/form/fields_macros.html.twig' as fields %}
{{ fields.textareaField(
'default_values',
item.fields['default_values'],
__('Default values'),
__('Default values'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.textareaField(
'values',
item.fields['values'],
__('Values'),
__('Values'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}
{% endblock %}

Expand Down
25 changes: 19 additions & 6 deletions templates/field/datefield.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,40 @@
{% import '@formcreator/components/form/fields_macros.html.twig' as formcreatorFields %}

{% block questionFields %}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.dropdownYesNo(
'required',
item.fields['required'],
__('Required', 'formcreator'),
{
'add_field_class': 'plugin_formcreator_required'
'add_field_class': 'plugin_formcreator_required',
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{# May be empty has no meaning as required makes mandatory to have at lease 1 checkbox ticked #}
{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.dateField(
'default_values',
item.fields['default_values'],
__('Default values'),
__('Default values'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{% endblock %}
25 changes: 19 additions & 6 deletions templates/field/datetimefield.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,40 @@
{% import '@formcreator/components/form/fields_macros.html.twig' as formcreatorFields %}

{% block questionFields %}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.dropdownYesNo(
'required',
item.fields['required'],
__('Required', 'formcreator'),
{
'add_field_class': 'plugin_formcreator_required'
'add_field_class': 'plugin_formcreator_required',
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{# May be empty has no meaning as required makes mandatory to have at lease 1 checkbox ticked #}
{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.dateTimeField(
'default_values',
item.fields['default_values'],
__('Default values'),
__('Default values'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{% endblock %}
70 changes: 57 additions & 13 deletions templates/field/dropdownfield.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,42 +36,67 @@
'itemtype',
item.fields['itemtype'],
_n('Dropdown', 'Dropdowns', 1),
{ on_change: 'plugin_formcreator.changeQuestionType(this)' }
{
on_change: 'plugin_formcreator.changeQuestionType(this)',
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.dropdownYesNo(
'required',
item.fields['required'],
__('Required', 'formcreator')
__('Required', 'formcreator'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.dropdownYesNo(
'show_empty',
item.fields['show_empty'],
__('Show empty', 'formcreator')
__('Show empty', 'formcreator'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{% if item.fields['itemtype'] is defined and item.fields['itemtype'] != '0' %}
{{ fields.dropdownField(
item.fields['itemtype'],
'default_values',
item.fields['default_values'],
__('Default values'),
__('Default values'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}
{% else %}
{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}
{% endif %}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{% if item.fields['itemtype'] is defined and item.fields['itemtype'] == 'ITILCategory' %}
{{ formcreatorFields.dropdownItilCategoryFilter(
'show_ticket_categories',
item.fields['_show_ticket_categories'],
__('Show ticket categories', 'formcreator')
__('Show ticket categories', 'formcreator'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}
{% endif %}

{# _is_tree is set in the showForm method, and helps to find if the itemtype is a tree #}
Expand All @@ -81,31 +106,50 @@
item.fields['itemtype'],
'show_tree_root',
item.fields['_tree_root'],
__('Subtree root', 'formcreator'),
__('Subtree root', 'formcreator'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.numberField(
'show_tree_depth',
item.fields['_show_tree_depth'],
__('Limit subtree depth', 'formcreator'),
__('Limit subtree depth', 'formcreator'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.dropdownYesNo(
'selectable_tree_root',
item.fields['_tree_root_selectable'],
__('Selectable root', 'formcreator')
__('Selectable root', 'formcreator'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}
{% endif %}

{% if item.fields['itemtype'] is defined and item.fields['_is_entity_restrict'] == '1' %}
{{ formcreatorFields.dropdownEntityRestrict(
'entity_restrict',
item.fields['_entity_restrict'],
__('Entity restriction', 'formcreator'),
{
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}
{% endif %}
{% endblock %}
20 changes: 16 additions & 4 deletions templates/field/emailfield.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,32 @@
{% import '@formcreator/components/form/fields_macros.html.twig' as formcreatorFields %}

{% block questionFields %}
{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.dropdownYesNo(
'required',
item.fields['required'],
__('Required', 'formcreator')
__('Required', 'formcreator'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.textField(
'default_values',
item.fields['default_values'],
__('Default values'),
__('Default values'), {
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}

{% endblock %}
9 changes: 7 additions & 2 deletions templates/field/filefield.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,19 @@

{% block questionFields %}

{{ fields.nullField() }}
{{ fields.nullField({
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}) }}

{{ fields.dropdownYesNo(
'required',
item.fields['required'],
__('Required', 'formcreator'),
{
'add_field_class': 'plugin_formcreator_required'
'add_field_class': 'plugin_formcreator_required',
label_class: 'col-xxl-4',
input_class: 'col-xxl-8',
}
) }}
{% endblock %}
Loading

0 comments on commit a9352fd

Please sign in to comment.