8000 Removed custom classes for input="file" types by lsv · Pull Request #27478 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Removed custom classes for input="file" types #27478

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

Closed
wants to merge 4 commits into from
Closed

Removed custom classes for input="file" types #27478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e993ac
Removed custom classes for input="file" types
lsv Jun 2, 2018
292bef1
Setting the css class for file upload to form-control-file
lsv Jun 12, 2018
fc6cd47
Rollback bootstrap_4_layout.html.twig
lsv Jul 19, 2018
37d1a34
disable custom bootstrap css classes
lsv Jul 19, 2018
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
38 changes: 29 additions & 9 deletions src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,12 @@
{%- endblock percent_widget %}

{% block form_widget_simple -%}
{% if use_bootstrap_custom is not defined %}
{% set use_bootstrap_custom = true %}
{% endif %}

{% if type is not defined or type != 'hidden' %}
{%- set attr = attr|merge({class: (attr.class|default('') ~ (type|default('') == 'file' ? ' custom-file-input' : ' form-control'))|trim}) -%}
{%- set attr = attr|merge({class: (attr.class|default('') ~ (type|default('') == 'file' and use_bootstrap_custom ? ' custom-file-input' : ' form-control'))|trim}) -%}
{% endif %}
{%- if type is defined and (type == 'range' or type == 'color') %}
{# Attribute "required" is not supported #}
Expand All @@ -138,8 +142,12 @@
{%- endblock button_widget %}

{% block checkbox_widget -%}
{% if use_bootstrap_custom is not defined %}
{% set use_bootstrap_custom = true %}
{% endif %}

{%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
{%- if 'checkbox-custom' in parent_label_class -%}
{%- if 'checkbox-custom' in parent_label_class and use_bootstrap_custom -%}
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' custom-control-input')|trim}) -%}
<div class="custom-control custom-checkbox{{ 'checkbox-inline' in parent_label_class ? ' custom-control-inline' }}">
{{- form_label(form, null, { widget: parent() }) -}}
Expand All @@ -153,8 +161,12 @@
{%- endblock checkbox_widget %}

{% block radio_widget -%}
{% if use_bootstrap_custom is not defined %}
{% set use_bootstrap_custom = true %}
{% endif %}

{%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
{%- if 'radio-custom' in parent_label_class -%}
{%- if 'radio-custom' in parent_label_class and use_bootstrap_custom -%}
{%- set attr = attr|merge({class: (attr.class|default('') ~ ' custom-control-input')|trim}) -%}
<div class="custom-control custom-radio{{ 'radio-inline' in parent_label_class ? ' custom-control-inline' }}">
{{- form_label(form, null, { widget: parent() }) -}}
Expand Down Expand Up @@ -182,11 +194,15 @@
{# Labels #}

{% block form_label -%}
{% if use_bootstrap_custom is not defined %}
{% set use_bootstrap_custom = true %}
{% endif %}

{% if label is not same as(false) -%}
{%- if compound is defined and compound -%}
{%- set element = 'legend' -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
{% elseif type is defined and type == 'file' %}
{% elseif type is defined and type == 'file' and use_bootstrap_custom %}
{%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' custom-file-label')|trim}) -%}
{%- else -%}
{%- set label_attr = label_attr|merge({for: id, class: (label_attr.class|default('') ~ ' form-control-label')|trim}) -%}
Expand Down Expand Up @@ -215,11 +231,15 @@
{%- endblock form_label %}

{% block checkbox_radio_label -%}
{% if use_bootstrap_custom is not defined %}
{% set use_bootstrap_custom = true %}
{% endif %}

{#- Do not display the label if widget is not defined in order to prevent double label rendering -#}
{%- if widget is defined -%}
{% set is_parent_custom = parent_label_class is defined and ('checkbox-custom' in parent_label_class or 'radio-custom' in parent_label_class) %}
{% set is_custom = label_attr.class is defined and ('checkbox-custom' in label_attr.class or 'radio-custom' in label_attr.class) %}
{%- if is_parent_custom or is_custom -%}
{%- if (is_parent_custom or is_custom) and use_bootstrap_custom -%}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' custom-control-label')|trim}) -%}
{%- else %}
{%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' form-check-label')|trim}) -%}
Expand Down Expand Up @@ -271,10 +291,10 @@

{% block file_row -%}
<div class="form-group">
<{{ element|default('div') }} class="custom-file">
{{- form_widget(form) -}}
{{- form_label(form) -}}
</{{ element|default('div') }}>
<{{ element|default('div') }} class="custom-file">
{{- form_widget(form) -}}
{{- form_label(form) -}}
</{{ element|default('div') }}>
</div>
{% endblock %}

Expand Down
35 changes: 35 additions & 0 deletions src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_nocustom_layout.html.twig
View file
Open in desktop
Original file line nu 871B mber Diff line number Diff line change
@@ -0,0 +1,35 @@
{% use "bootstrap_4_layout.html.twig" %}

{% block form_widget_simple -%}
{% set use_bootstrap_custom = false %}
{{- parent() -}}
{%- endblock form_widget_simple %}

{% block form_label -%}
{% set use_bootstrap_custom = false %}
{{- parent() -}}
{% endblock %}

{% block checkbox_radio_label -%}
{% set use_bootstrap_custom = false %}
{{- parent() -}}
{% endblock %}

{% block checkbox_widget -%}
{% set use_bootstrap_custom = false %}
{{- parent() -}}
{%- endblock checkbox_widget %}

{% block radio_widget -%}
{% set use_bootstrap_custom = false %}
{{- parent() -}}
{% endblock %}

{% block file_row -%}
<div class="form-group">
<{{ element|default('div') }}>
{{- form_label(form) -}}
{{- form_widget(form) -}}
</{{ element|default('div') }}>
</div>
{% endblock %}
0