8000 [Twig] daisyUI form layout by Oviglo · Pull Request #60334 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Twig] daisyUI form layout #60334

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

Open
wants to merge 6 commits into
base: 7.4
Choose a base branch
from
Open

[Twig] daisyUI form layout #60334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b719c3
layout draft
Oviglo Apr 29, 2025
cb326bb
format input fields
Oviglo May 2, 2025
6704788
wrong file
Oviglo May 2, 2025
557fba4
more fields + fix checkbox
Oviglo May 10, 2025
0e1b099
file input + errors
Oviglo May 14, 2025
f8182b1
fix choices expanded options labels
Oviglo May 19, 2025
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
Prev Previous commit
Next Next commit
wrong file
  • Loading branch information
@Oviglo
Oviglo committed May 2, 2025
commit 6704788105d154fc1c5dcf7ec53c6e1b8e8da5f2
40 changes: 32 additions & 8 deletions src/Symfony/Bridge/Twig/Resources/views/Form/daisyui_5_layout.html.twig
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
{% use 'tailwind_2_layout.html.twig' %}

{%- block form_row -%}
{%- set row_attr = row_attr|merge({ class: row_attr.class|default(row_class|default('flex flex-col mb-6')) }) -%}
{{- parent() -}}
{%- endblock form_row -%}

{%- block form_errors -%}
{%- set attr = attr|merge({class: (attr.class|default('text-error'))|trim}) -%}
{{- parent() -}}
{%- endblock form_errors -%}

{%- block form_help -%}
{%- set attr = attr|merge({class: (attr.class|default('text-sm text-neutral'))|trim}) -%}
{{- parent() -}}
{%- endblock form_help -%}

{%- block form_label -%}
{%- set label_attr = label_attr|merge({ class: label_attr.class|default(label_class|default('label mb-2')) }) -%}
{{- parent() -}}
{%- endblock form_label -%}

{%- block button_widget -%}
{%- set attr = attr|merge({class: (attr.class|default('btn-neutral') ~ ' btn')|trim}) -%}
{{- parent() -}}
Expand All @@ -8,20 +30,20 @@
{{- parent() -}}
{%- endblock submit_widget %}

{% block checkbox_widget -%}
{%- set attr_class = attr_class|default(attr.class|default('')) -%}
{%- set attr_class = attr_class ~ ' checkbox' -%}
{%- endblock checkbox_widget %}
{%- block checkbox_widget -%}
{%- set widget_class = widget_class|default('checkbox mr-2') -%}
{{- parent() -}}
{%- endblock checkbox_widget -%}

{% block radio_widget -%}
{%- set attr_class = attr_class|default(attr.class|default('')) -%}
{%- set attr_class = attr_class ~ ' radio' -%}
{%- endblock radio_widget %}

{% block select_widget -%}
{%- set attr_class = attr_class|default(attr.class|default('')) -%}
{%- set attr_class = attr_class ~ ' select' -%}
{%- endblock select_widget %}
{%- block choice_widget_collapsed -%}
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' select')|trim}) -%}
{{- parent() -}}
{%- endblock choice_widget_collapsed -%}

{% block textarea_widget -%}
{% set attr = attr|merge({class: (attr.class|default('') ~ ' textarea')|trim}) %}
Expand All @@ -31,6 +53,8 @@
{% block form_widget_simple -%}
{%- if type is not defined or type != 'hidden' %}
{%- set widget_class = ' input' %}
{%- set attr = attr|merge({class: (attr.class|default('') ~ widget_class)|trim}) -%}
{% endif -%}

{{- parent() -}}
{%- endblock form_widget_simple %}
91 changes: 50 additions & 41 deletions src/Symfony/Bridge/Twig/Resources/views/Form/tailwind_2_layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,69 @@
{% use 'tailwind_2_layout.html.twig' %}
{% use 'form_div_layout.html.twig' %}

{%- block form_row -%}
{%- set row_attr = row_attr|merge({ class: row_attr.class|default(row_class|default('flex flex-col mb-6')) }) -%}
{%- set row_attr = row_attr|merge({ class: row_attr.class|default(row_class|default('mb-6')) }) -%}
{{- parent() -}}
{%- endblock form_row -%}

{%- block form_errors -%}
{%- set attr = attr|merge({class: (attr.class|default('text-error'))|trim}) -%}
{{- parent() -}}
{%- endblock form_errors -%}

{%- block form_help -%}
{%- set attr = attr|merge({class: (attr.class|default('text-sm text-neutral'))|trim}) -%}
{%- block widget_attributes -%}
{%- set attr = attr|merge({ class: attr.class|default(widget_class|default('mt-1 w-full')) ~ (disabled ? ' ' ~ widget_disabled_class|default('border-gray-300 text-gray-500')) ~ (errors|length ? ' ' ~ widget_errors_class|default('border-red-700')) }) -%}
8000 {{- parent() -}}
{%- endblock form_help -%}
{%- endblock widget_attributes -%}

{%- block form_label -%}
{%- set label_attr = label_attr|merge({ class: label_attr.class|default(label_class|default('label mb-2')) }) -%}
{%- set label_attr = label_attr|merge({ class: label_attr.class|default(label_class|default('block text-gray-800')) }) -%}
{{- parent() -}}
{%- endblock form_label -%}

{%- block button_widget -%}
{%- set attr = attr|merge({class: (attr.class|default('btn-neutral') ~ ' btn')|trim}) -%}
{{- parent() -}}
{%- endblock button_widget %}

{%- block submit_widget -%}
{%- set attr = attr|merge({class: (attr.class|default('btn-primary'))|trim}) -%}
{%- block form_help -%}
{%- set help_attr = help_attr|merge({ class: help_attr.class|default(help_class|default('mt-1 text-gray-600')) }) -%}
{{- parent() -}}
{%- endblock submit_widget %}
{%- endblock form_help -%}

{%- block checkbox_widget -%}
{%- set widget_class = widget_class|default('checkbox mr-2') -%}
{{- parent() -}}
{%- endblock checkbox_widget -%}
{%- block form_errors -%}
{%- if errors|length > 0 -%}
<ul>
{%- for error in errors -%}
<li class="{{ error_item_class|default('text-red-700') }}">{{ error.message }}</li>
{%- endfor -%}
</ul>
{%- endif -%}
{%- endblock form_errors -%}

{% block radio_widget -%}
{%- set attr_class = attr_class|default(attr.class|default('')) -%}
{%- set attr_class = attr_class ~ ' radio' -%}
{%- endblock radio_widget %}
{%- block choice_widget_expanded -%}
{%- set attr = attr|merge({ class: attr.class|default('mt-2') }) -%}
<div {{ block('widget_container_attributes') }}>
{%- for child in form %}
<div class="flex items-center">
{{- form_widget(child) -}}
{{- form_label(child, null, { translation_domain: choice_translation_domain }) -}}
</div>
{% endfor -%}
</div>
{%- endblock choice_widget_expanded -%}

{%- block choice_widget_collapsed -%}
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' select')|trim}) -%}
{{- parent() -}}
{%- endblock choice_widget_collapsed -%}
{%- block checkbox_row -%}
{%- set row_attr = row_attr|merge({ class: row_attr.class|default(row_class|default('mb-6')) }) -%}
{%- set widget_attr = {} -%}
{%- if help is not empty -%}
{%- set widget_attr = {attr: {'aria-describedby': id ~"_help"}} -%}
{%- endif -%}
<div{% with {attr: row_attr} %}{{ block('attributes') }}{% endwith %}>
{{- form_errors(form) -}}
<div class="inline-flex items-center">
{{- form_widget(form, widget_attr) -}}
{{- form_label(form) -}}
</div>
{{- form_help(form) -}}
</div>
{%- endblock checkbox_row -%}

{% block textarea_widget -%}
{% set attr = attr|merge({class: (attr.class|default('') ~ ' textarea')|trim}) %}
{%- block checkbox_widget -%}
{%- set widget_class = widget_class|default('mr-2') -%}
{{- parent() -}}
{%- endblock textarea_widget %}

{% block form_widget_simple -%}
{%- if type is not defined or type != 'hidden' %}
{%- set widget_class = ' input' %}
{%- set attr = attr|merge({class: (attr.class|default('') ~ widget_class)|trim}) -%}
{% endif -%}
{%- endblock checkbox_widget -%}

{%- block radio_widget -%}
{%- set widget_class = widget_class|default('mr-2') -%}
{{- parent() -}}
{%- endblock form_widget_simple %}
{%- endblock radio_widget -%}
Loading
0