Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdfdcbb4

Browse files
committed
[TwigBridge] Add row_attr to all form themes
1 parent996d8a7 commitdfdcbb4

10 files changed

+28
-27
lines changed

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ col-sm-2
2727
{%-ifhelpis notempty -%}
2828
{%-setwidget_attr= {attr: {'aria-describedby':id ~"_help"}} -%}
2929
{%-endif -%}
30-
<divclass="form-group{%if (notcompoundorforce_error|default(false))andnotvalid%}has-error{%endif %}">
30+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group' ~ ((notcompoundorforce_error|default(false))andnotvalid?'has-error'))|trim})} %}{{block('attributes') }}{%endwith %}>
3131
{{- form_label(form) -}}
3232
<divclass="{{block('form_group_class') }}">
3333
{{- form_widget(form,widget_attr) -}}
@@ -38,7 +38,7 @@ col-sm-2
3838
{%-endblockform_row %}
3939

4040
{%blocksubmit_row -%}
41-
<divclass="form-group">{#--#}
41+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group')|trim})} %}{{block('attributes') }}{%endwith %}>{#--#}
4242
<divclass="{{block('form_label_class') }}"></div>{#--#}
4343
<divclass="{{block('form_group_class') }}">
4444
{{- form_widget(form) -}}
@@ -47,7 +47,7 @@ col-sm-2
4747
{%-endblocksubmit_row %}
4848

4949
{%blockreset_row -%}
50-
<divclass="form-group">{#--#}
50+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group')|trim})} %}{{block('attributes') }}{%endwith %}>{#--#}
5151
<divclass="{{block('form_label_class') }}"></div>{#--#}
5252
<divclass="{{block('form_group_class') }}">
5353
{{- form_widget(form) -}}
@@ -60,7 +60,7 @@ col-sm-10
6060
{%-endblockform_group_class %}
6161

6262
{%blockcheckbox_row -%}
63-
<divclass="form-group{%ifnotvalid%}has-error{%endif %}">{#--#}
63+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group' ~ (notvalid?'has-error'))|trim})} %}{{block('attributes') }}{%endwith %}>{#--#}
6464
<divclass="{{block('form_label_class') }}"></div>{#--#}
6565
<divclass="{{block('form_group_class') }}">
6666
{{- form_widget(form) -}}

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
{%-ifhelpis notempty -%}
112112
{%-setwidget_attr= {attr: {'aria-describedby':id ~"_help"}} -%}
113113
{%-endif -%}
114-
<divclass="form-group{%if (notcompoundorforce_error|default(false))andnotvalid%}has-error{%endif %}">
114+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group' ~ ((notcompoundorforce_error|default(false))andnotvalid?'has-error'))|trim})} %}{{block('attributes') }}{%endwith %}>
115115
{{- form_label(form) }}{#-#}
116116
{{ form_widget(form,widget_attr) }}{#-#}
117117
{{- form_help(form) -}}
@@ -120,7 +120,7 @@
120120
{%-endblockform_row %}
121121

122122
{%blockbutton_row -%}
123-
<divclass="form-group">
123+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group')|trim})} %}{{block('attributes') }}{%endwith %}>
124124
{{- form_widget(form) -}}
125125
</div>
126126
{%-endblockbutton_row %}
@@ -146,14 +146,14 @@
146146
{%-endblockdatetime_row %}
147147

148148
{%blockcheckbox_row -%}
149-
<divclass="form-group{%ifnotvalid%}has-error{%endif %}">
149+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group' ~ (notvalid?'has-error'))|trim})} %}{{block('attributes') }}{%endwith %}>
150150
{{- form_widget(form) -}}
151151
{{- form_errors(form) -}}
152152
</div>
153153
{%-endblockcheckbox_row %}
154154

155155
{%blockradio_row -%}
156-
<divclass="form-group{%ifnotvalid%}has-error{%endif %}">
156+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group' ~ (notvalid?'has-error'))|trim})} %}{{block('attributes') }}{%endwith %}>
157157
{{- form_widget(form) -}}
158158
{{- form_errors(form) -}}
159159
</div>

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ col-sm-2
2828
{%-ifhelpis notempty -%}
2929
{%-setwidget_attr= {attr: {'aria-describedby':id ~"_help"}} -%}
3030
{%-endif -%}
31-
<divclass="form-group row{%if (notcompoundorforce_error|default(false))andnotvalid%}is-invalid{%endif %}">
31+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group row' ~ ((notcompoundorforce_error|default(false))andnotvalid?'is-invalid'))|trim})} %}{{block('attributes') }}{%endwith %}>
3232
{{- form_label(form) -}}
3333
<divclass="{{block('form_group_class') }}">
3434
{{- form_widget(form,widget_attr) -}}
@@ -43,7 +43,7 @@ col-sm-2
4343
{%-ifhelpis notempty -%}
4444
{%-setwidget_attr= {attr: {'aria-describedby':id ~"_help"}} -%}
4545
{%-endif -%}
46-
<fieldsetclass="form-group">
46+
<fieldset{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group')|trim})} %}{{block('attributes') }}{%endwith %}>
4747
<divclass="row{%if (notcompoundorforce_error|default(false))andnotvalid %} is-invalid{%endif %}">
4848
{{- form_label(form) -}}
4949
<divclass="{{block('form_group_class') }}">
@@ -55,7 +55,7 @@ col-sm-2
5555
{%-endblockfieldset_form_row %}
5656

5757
{%blocksubmit_row -%}
58-
<divclass="form-group row">{#--#}
58+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group row')|trim})} %}{{block('attributes') }}{%endwith %}>{#--#}
5959
<divclass="{{block('form_label_class') }}"></div>{#--#}
6060
<divclass="{{block('form_group_class') }}">
6161
{{- form_widget(form) -}}
@@ -64,7 +64,7 @@ col-sm-2
6464
{%-endblocksubmit_row %}
6565

6666
{%blockreset_row -%}
67-
<divclass="form-group row">{#--#}
67+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group row')|trim})} %}{{block('attributes') }}{%endwith %}>{#--#}
6868
<divclass="{{block('form_label_class') }}"></div>{#--#}
6969
<divclass="{{block('form_group_class') }}">
7070
{{- form_widget(form) -}}
@@ -77,7 +77,7 @@ col-sm-10
7777
{%-endblockform_group_class %}
7878

7979
{%blockcheckbox_row -%}
80-
<divclass="form-group row">{#--#}
80+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group row')|trim})} %}{{block('attributes') }}{%endwith %}>{#--#}
8181
<divclass="{{block('form_label_class') }}"></div>{#--#}
8282
<divclass="{{block('form_group_class') }}">
8383
{{- form_widget(form) -}}

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
{%-ifhelpis notempty -%}
283283
{%-setwidget_attr= {attr: {'aria-describedby':id ~"_help"}} -%}
284284
{%-endif -%}
285-
<{{element|default('div') }}class="form-group">
285+
<{{element|default('div') }}{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group')|trim})} %}{{block('attributes') }}{%endwith %}>
286286
{{- form_label(form) -}}
287287
{{- form_widget(form,widget_attr) -}}
288288
{{- form_help(form) -}}

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
{# Rows#}
188188

189189
{%blockbutton_row -%}
190-
<divclass="form-group">
190+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'form-group')|trim})} %}{{block('attributes') }}{%endwith %}>
191191
{{- form_widget(form) -}}
192192
</div>
193193
{%-endblockbutton_row %}

‎src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
{%-ifhelpis notempty -%}
326326
{%-setwidget_attr= {attr: {'aria-describedby':id ~"_help"}} -%}
327327
{%-endif -%}
328-
<div{%with {attr:row_attr|default({})} %}{{block('attributes') }}{%endwith %}>
328+
<div{%with {attr:row_attr} %}{{block('attributes') }}{%endwith %}>
329329
{{- form_label(form) -}}
330330
{{- form_errors(form) -}}
331331
{{- form_widget(form,widget_attr) -}}
@@ -334,7 +334,7 @@
334334
{%-endblockform_row -%}
335335

336336
{%-blockbutton_row -%}
337-
<div{%with {attr:row_attr|default({})} %}{{block('attributes') }}{%endwith %}>
337+
<div{%with {attr:row_attr} %}{{block('attributes') }}{%endwith %}>
338338
{{- form_widget(form) -}}
339339
</div>
340340
{%-endblockbutton_row -%}

‎src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{%-ifhelpis notempty -%}
66
{%-setwidget_attr= {attr: {'aria-describedby':id ~"_help"}} -%}
77
{%-endif -%}
8-
<tr>
8+
<tr{%with {attr:row_attr} %}{{block('attributes') }}{%endwith %}>
99
<td>
1010
{{- form_label(form) -}}
1111
</td>
@@ -18,7 +18,7 @@
1818
{%-endblockform_row -%}
1919

2020
{%-blockbutton_row -%}
21-
<tr>
21+
<tr{%with {attr:row_attr} %}{{block('attributes') }}{%endwith %}>
2222
<td></td>
2323
<td>
2424
{{- form_widget(form) -}}
@@ -27,7 +27,8 @@
2727
{%-endblockbutton_row -%}
2828

2929
{%-blockhidden_row -%}
30-
<trstyle="display: none">
30+
{%-setstyle=row_attr.styleisdefined? (row_attr.style~ (row_attr.style|trim|last!=';'?';')):'' -%}
31+
<tr{%with {attr:row_attr|merge({style: (style ~' display: none')|trim})} %}{{block('attributes') }}{%endwith %}>
3132
<tdcolspan="2">
3233
{{- form_widget(form) -}}
3334
</td>

‎src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
{%-ifhelpis notempty -%}
278278
{%-setwidget_attr= {attr: {'aria-describedby':id ~"_help"}} -%}
279279
{%-endif -%}
280-
<divclass="row">
280+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'row')|trim})} %}{{block('attributes') }}{%endwith %}>
281281
<divclass="large-12 columns{%if (notcompoundorforce_error|default(false))andnotvalid %} error{%endif %}">
282282
{{- form_label(form) -}}
283283
{{- form_widget(form,widget_attr) -}}
@@ -308,7 +308,7 @@
308308
{%-endblockdatetime_row %}
309309

310310
{%blockcheckbox_row -%}
311-
<divclass="row">
311+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'row')|trim})} %}{{block('attributes') }}{%endwith %}>
312312
<divclass="large-12 columns{%ifnotvalid %} error{%endif %}">
313313
{{ form_widget(form) }}
314314
{{ form_errors(form) }}
@@ -317,7 +317,7 @@
317317
{%-endblockcheckbox_row %}
318318

319319
{%blockradio_row -%}
320-
<divclass="row">
320+
<div{%with {attr:row_attr|merge({class: (row_attr.class|default('') ~'row')|trim})} %}{{block('attributes') }}{%endwith %}>
321321
<divclass="large-12 columns{%ifnotvalid %} error{%endif %}">
322322
{{ form_widget(form) }}
323323
{{ form_errors(form) }}

‎src/Symfony/Bridge/Twig/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"symfony/asset":"~3.4|~4.0",
2727
"symfony/dependency-injection":"~3.4|~4.0",
2828
"symfony/finder":"~3.4|~4.0",
29-
"symfony/form":"^4.3.4",
29+
"symfony/form":"^4.3.5",
3030
"symfony/http-foundation":"~4.3",
3131
"symfony/http-kernel":"~3.4|~4.0",
3232
"symfony/mime":"~4.3",
@@ -48,7 +48,7 @@
4848
},
4949
"conflict": {
5050
"symfony/console":"<3.4",
51-
"symfony/form":"<4.3.4",
51+
"symfony/form":"<4.3.5",
5252
"symfony/http-foundation":"<4.3",
5353
"symfony/translation":"<4.2",
5454
"symfony/workflow":"<4.3"

‎src/Symfony/Bundle/FrameworkBundle/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"symfony/css-selector":"~3.4|~4.0",
3939
"symfony/dom-crawler":"^4.3",
4040
"symfony/polyfill-intl-icu":"~1.0",
41-
"symfony/form":"^4.3.4",
41+
"symfony/form":"^4.3.5",
4242
"symfony/expression-language":"~3.4|~4.0",
4343
"symfony/http-client":"^4.3",
4444
"symfony/mailer":"^4.3",
@@ -72,7 +72,7 @@
7272
"symfony/console":"<4.3",
7373
"symfony/dotenv":"<4.2",
7474
"symfony/dom-crawler":"<4.3",
75-
"symfony/form":"<4.3",
75+
"symfony/form":"<4.3.5",
7676
"symfony/messenger":"<4.3.6",
7777
"symfony/property-info":"<3.4",
7878
"symfony/serializer":"<4.2",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp