[TwigBridge] Apply some changes to support Bootstrap4-stable #26167
Conversation
|
@Nyholm I gave you access to my fork so you can finish this PR if you don't mind (tests esp. are broken for now.) |
| {%- set prepend = not (money_pattern starts with '{{') -%} | ||
| {%- set append = not (money_pattern ends with '}}') -%} | ||
| {%- if prepend or append -%} | ||
| <div class="input-group{{ group_class|default('') }}"> |
There was a problem hiding this comment.
Not in this block no. The abstract form has the same code: https://github.com/symfony/symfony/blob/v4.0.4/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_base_layout.html.twig#L14
I guess it was just copied and added some modifications.
| @@ -53,7 +53,7 @@ public function testLabelOnForm() | |||
|
|
|||
| $this->assertMatchesXpath($html, | |||
| '/legend | |||
| [@class="col-form-label col-sm-2 col-form-legend required"] | |||
| [@class="col-form-label col-sm-2 col-form-label required"] | |||
There was a problem hiding this comment.
Here is the col-form-label added twice. Do we bother?
There was a problem hiding this comment.
it would be better if we could avoid, to make the HTML cleaner. But it should not break anything.
nicolas-grekas
force-pushed
the
mpiot-master
branch
from
9efdb4c
to
14e2282
Compare
|
Thank you @mpiot. |
|
Thank you @Nyholm also |
…le (mpiot, Nyholm) This PR was merged into the 3.4 branch. Discussion ---------- [TwigBridge] Apply some changes to support Bootstrap4-stable | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25655 #25635 #24435 | License | MIT | Doc PR | - Follow up of #25715, see discussion there. This fixes the following errors: - Delete form-control-label, don't used in Bootstrap 4 - Replace col-form-legend by col-form-label - Separate the label and input (before the input was in the label) - Use form-check-inline to put radio and/or checkboxes inline - Add support of custom form for radio and checkboxes - Fix input-group: MoneyType (Issue #25655), PercentType - Remove form-control duplication (Issue #25635) - Fix Errors in label (#24435) Commits ------- 14e2282 Fixed broken tests cf4e956 [TwigBridge] Apply some changes to support Bootstrap4-stable
|
Ping @mpiot, Can you make a PR with the awesome help-block as I mentioned here? If you do not have time right now that is also very fine. Just tell me. |
Follow up of #25715, see discussion there.
This fixes the following errors: