Skip to content

Commit 34508ef

Browse files
committed
Bump up foc/bui to v5.1
1 parent 82c58db commit 34508ef

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"require": {
3232
"cakephp/cakephp": "^5.0",
3333
"friendsofcake/crud": "^7.0",
34-
"friendsofcake/bootstrap-ui": "^5.0"
34+
"friendsofcake/bootstrap-ui": "^5.1"
3535
},
3636
"require-dev": {
3737
"friendsofcake/cakephp-test-utilities": "^3.0",

templates/element/search.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44
}
55
?>
66

7-
<div class="search-filters">
7+
<div class="search-filters mb-3">
88
<?php
99
$searchOptions = $searchOptions ?? [];
1010
$searchOptions += ['align' => 'inline', 'id' => 'searchFilter'];
11-
12-
echo $this->Form->create(null, $searchOptions);
13-
echo $this->Form->hidden('_search');
1411
?>
1512

13+
<?= $this->Form->create(null, $searchOptions) ?>
14+
<?= $this->Form->hidden('_search') ?>
15+
1616
<?= $this->Form->controls($searchInputs, ['fieldset' => false]); ?>
17-
<?= $this->Form->button(__d('crud', 'Filter results'), ['type' => 'submit', 'class' => 'btn btn-primary']); ?>
18-
<?php if ($this->Search->isSearch()) : ?>
19-
<div class="col-auto">
20-
<?= $this->Search->resetLink(__d('crud', 'Reset'), ['class' => 'btn btn-primary']) ?>
21-
</div>
22-
<?php endif ?>
17+
18+
<div class="col-auto">
19+
<?= $this->Form->button(__d('crud', 'Filter results'), ['type' => 'submit', 'class' => 'btn btn-primary']); ?>
20+
<?php if ($this->Search->isSearch()) : ?>
21+
<?= $this->Search->resetLink(__d('crud', 'Reset'), ['class' => 'btn btn-secondary']) ?>
22+
<?php endif ?>
23+
</div>
2324

2425
<?= $this->Form->end(); ?>
2526
</div>

tests/TestCase/View/Helper/CrudViewHelperTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public function testIntrospect(): void
5454
$this->assertEquals($entity->created->i18nFormat(), $result);
5555

5656
$result = $this->CrudView->introspect('created', 'invalid');
57-
$this->assertEquals('<span class="bg-info badge">N/A</span>', $result);
57+
$this->assertEquals('<span class="text-bg-info badge">N/A</span>', $result);
5858

5959
$result = $this->CrudView->introspect('created', null);
60-
$this->assertEquals('<span class="bg-info badge">N/A</span>', $result);
60+
$this->assertEquals('<span class="text-bg-info badge">N/A</span>', $result);
6161

6262
$this->CrudView->setConfig('fieldFormatters', [
6363
'datetime' => function () {

0 commit comments

Comments
 (0)