[Form] Fix merge

This commit is contained in:
Nicolas Grekas 2015-09-29 11:59:39 +02:00
parent 03a63dbc14
commit 525e63d68c

View File

@ -668,7 +668,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="radio"]
[
./label
[.="Choice&A"]
[.=" Choice&A"]
[
./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
]
@ -677,7 +677,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="radio"]
[
./label
[.="Choice&B"]
[.=" Choice&B"]
[
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
]
@ -706,7 +706,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="radio"]
[
./label
[.="[trans]Choice&A[/trans]"]
[.=" [trans]Choice&A[/trans]"]
[
./input[@type="radio"][@name="name"][@id="name_0"][@value="&a"][@checked]
]
@ -715,7 +715,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="radio"]
[
./label
[.="[trans]Choice&B[/trans]"]
[.=" [trans]Choice&B[/trans]"]
[
./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]'.$classPart.'
]
@ -868,7 +868,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="checkbox"]
[
./label
[.="Choice&A"]
[.=" Choice&A"]
[
./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
]
@ -877,7 +877,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="checkbox"]
[
./label
[.="Choice&B"]
[.=" Choice&B"]
[
./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]
]
@ -886,7 +886,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="checkbox"]
[
./label
[.="Choice&C"]
[.=" Choice&C"]
[
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
]
@ -916,7 +916,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="checkbox"]
[
./label
[.="[trans]Choice&A[/trans]"]
[.=" [trans]Choice&A[/trans]"]
[
./input[@type="checkbox"][@name="name[]"][@id="name_0"][@checked][not(@required)]
]
@ -925,7 +925,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="checkbox"]
[
./label
[.="[trans]Choice&B[/trans]"]
[.=" [trans]Choice&B[/trans]"]
[
./input[@type="checkbox"][@name="name[]"][@id="name_1"][not(@checked)][not(@required)]'.$classPart.'
]
@ -934,7 +934,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
[@class="checkbox"]
[
./label
[.="[trans]Choice&C[/trans]"]
[.=" [trans]Choice&C[/trans]"]
[
./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
]