Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EZEE-3324: Form Builder: missing design for checkbox field in the Form preview #1629

Merged
merged 2 commits into from
Oct 30, 2020
Merged

EZEE-3324: Form Builder: missing design for checkbox field in the Form preview #1629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a57e16
[Composer] Set metarepo branch for tests and requirements for master …
mnocon Oct 29, 2020
31957c7
EZEE-3324: Form Builder: missing design for checkbox field in the For…
lucasOsti Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"symfony/asset": "^5.0",
"symfony/yaml": "^5.0",
"jms/translation-bundle": "^1.5",
"ezsystems/ezplatform-kernel": "~1.2.0@dev",
"ezsystems/ezplatform-kernel": "^1.3@dev",
"ezsystems/ezplatform-content-forms": "^1.0@dev",
"ezsystems/ezplatform-design-engine": "^3.0@dev",
"ezsystems/ezplatform-user": "^2.0@dev",
Expand All @@ -58,10 +58,10 @@
"fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating"
},
"extra": {
"_ezplatform_branch_for_behat_tests": "3.2",
"_ezplatform_branch_for_behat_tests": "master",
"branch-alias": {
"dev-tmp_ci_branch": "2.2.x-dev",
"dev-master": "2.2.x-dev"
"dev-tmp_ci_branch": "2.3.x-dev",
"dev-master": "2.3.x-dev"
}
}
}
5 changes: 5 additions & 0 deletions src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@
{%- endfor -%}
{%- endblock -%}

{%- block checkbox_widget -%}
{%- set attr = attr|merge({class: 'ez-input ez-input--checkbox'}) -%}
{{ parent() }}
{%- endblock -%}

{%- block trash_item_checkbox_widget -%}
<input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
{%- endblock -%}
Expand Down