Skip to content

Commit

Permalink
Fix bootstrap 5's data attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
ADmad committed Oct 6, 2023
1 parent 8e70739 commit 31b08ca
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion templates/element/action-groups.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<?php foreach ($groups as $key => $group) : ?>
<div class='btn-group' role="group">
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<button type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
<?= $key ?>
</button>
<div class="dropdown-menu dropdown-menu-right">
Expand Down
2 changes: 1 addition & 1 deletion templates/element/form/tabs.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<?php $firstTab = key($formTabGroups) ?>
<?php foreach ($formTabGroups as $group => $groupFields) : ?>
<li role="presentation" <?= $group === $firstTab ? 'class="active"' : '' ?>>
<a href="#tab-<?= mb_strtolower(Text::slug($group)) ?>" role="tab" data-toggle="tab"><?= $group ?></a>
<a href="#tab-<?= mb_strtolower(Text::slug($group)) ?>" role="tab" data-bs-toggle="tab"><?= $group ?></a>
</li>
<?php endforeach ?>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion templates/element/menu/dropdown.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<li class="dropdown alerts-dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?= $dropdown->getTitle() ?></a>
<a href="#" class="dropdown-toggle" data-bs-toggle="dropdown"><?= $dropdown->getTitle() ?></a>
<ul class="dropdown-menu">
<?php
foreach ($dropdown->getEntries() as $entry) {
Expand Down
46 changes: 23 additions & 23 deletions templates/layout/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@
</head>
<body>
<nav class="navbar navbar-light bg-light" role="navigation">
<button type="button" class="navbar-toggler mr-2" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<span class="navbar-toggler-icon"></span>
</button>
<?php
$siteTitleContent = $siteTitle;
if (!empty($siteTitleImage)) {
$siteTitleContent = $this->Html->image($siteTitleImage, ['class' => 'navbar-brand mr-auto']);
}
if (empty($siteTitleLink)) {
echo $this->Html->tag(
'span',
$siteTitleContent,
['class' => 'navbar-brand mr-auto', 'escape' => false]
);
} else {
echo $this->Html->link(
$siteTitleContent,
$siteTitleLink,
['class' => 'navbar-brand mr-auto', 'escape' => false]
);
}
?>
<button type="button" class="navbar-toggler mr-2" data-bs-toggle="collapse" data-bs-target=".navbar-ex1-collapse">
<span class="navbar-toggler-icon"></span>
</button>
<?php
$siteTitleContent = $siteTitle;
if (!empty($siteTitleImage)) {
$siteTitleContent = $this->Html->image($siteTitleImage, ['class' => 'navbar-brand mr-auto']);
}
if (empty($siteTitleLink)) {
echo $this->Html->tag(
'span',
$siteTitleContent,
['class' => 'navbar-brand mr-auto', 'escape' => false]
);
} else {
echo $this->Html->link(
$siteTitleContent,
$siteTitleLink,
['class' => 'navbar-brand mr-auto', 'escape' => false]
);
}
?>

<?= $this->element('topbar'); ?>
<?= $this->element('topbar'); ?>
</nav>

<div class="container-fluid">
Expand Down

0 comments on commit 31b08ca

Please sign in to comment.