diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2020-06-14 20:05:15 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2020-06-14 20:05:15 +0100 |
| commit | 336be01c6cd8bcecfb1fbd0695c076a77ca0995d (patch) | |
| tree | 2ce6d654dad5551c5c3cb835326ce4e44dccf75a | |
| parent | fb2382c069d6f5521b73874690780f2e15884ce9 (diff) | |
| download | webtrees-336be01c6cd8bcecfb1fbd0695c076a77ca0995d.tar.gz webtrees-336be01c6cd8bcecfb1fbd0695c076a77ca0995d.tar.bz2 webtrees-336be01c6cd8bcecfb1fbd0695c076a77ca0995d.zip | |
Fix: accordion not closing panels.
| -rw-r--r-- | app/Http/RequestHandlers/IndividualPage.php | 14 | ||||
| -rw-r--r-- | resources/views/individual-page.phtml | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/app/Http/RequestHandlers/IndividualPage.php b/app/Http/RequestHandlers/IndividualPage.php index 732a71db40..4056b29bf8 100644 --- a/app/Http/RequestHandlers/IndividualPage.php +++ b/app/Http/RequestHandlers/IndividualPage.php @@ -323,14 +323,14 @@ class IndividualPage implements RequestHandlerInterface return ' <div class="' . $container_class . '"> - <div class="card-header" role="tab" id="name-header-' . $n . '"> - <a data-toggle="collapse" data-parent="#individual-names" href="#name-content-' . $n . '" aria-expanded="' . $aria . '" aria-controls="name-content-' . $n . '">' . $dummy->fullName() . '</a> + <div class="card-header" role="tab" id="name-header-' . $n . '"> + <a data-toggle="collapse" href="#name-content-' . $n . '" aria-expanded="' . $aria . '" aria-controls="name-content-' . $n . '">' . $dummy->fullName() . '</a> ' . $edit_links . ' - </div> - <div id="name-content-' . $n . '" class="' . $content_class . '" role="tabpanel" aria-labelledby="name-header-' . $n . '"> - <div class="card-body">' . $content . '</div> - </div> - </div>'; + </div> + <div id="name-content-' . $n . '" class="' . $content_class . '" data-parent="#individual-names" aria-labelledby="name-header-' . $n . '"> + <div class="card-body">' . $content . '</div> + </div> + </div>'; } /** diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml index 7d5d87390b..57dbb1fe65 100644 --- a/resources/views/individual-page.phtml +++ b/resources/views/individual-page.phtml @@ -95,7 +95,7 @@ use Illuminate\Support\Collection; <?php endif ?> <!-- Name accordion --> - <div class="col-sm" id="individual-names" role="tablist"> + <div class="col-sm accordion" id="individual-names" role="tablist"> <?php foreach ($name_records as $name_record) : ?> <?= $name_record ?> <?php endforeach ?> @@ -127,18 +127,18 @@ use Illuminate\Support\Collection; </div> </div> <?php if ($sidebars->isNotEmpty()) : ?> - <div class="col-sm-4" id="sidebar" role="tablist"> + <div class="col-sm-4 accordion" id="sidebar"> <?php foreach ($sidebars as $sidebar) : ?> <div class="card"> <div class="card-header" role="tab" id="sidebar-header-<?= $sidebar->name() ?>"> <div class="card-title mb-0"> - <a data-toggle="collapse" data-parent="#sidebar" href="#sidebar-content-<?= $sidebar->name() ?>" aria-expanded="<?= $sidebar->name() === 'family_nav' ? 'true' : 'false' ?>" aria-controls="sidebar-content-<?= $sidebar->name() ?>"> + <a data-toggle="collapse" href="#sidebar-content-<?= $sidebar->name() ?>" aria-expanded="<?= $sidebar->name() === 'family_nav' ? 'true' : 'false' ?>" aria-controls="sidebar-content-<?= $sidebar->name() ?>"> <?= $sidebar->sidebarTitle() ?> </a> </div> </div> - <div id="sidebar-content-<?= $sidebar->name() ?>" class="collapse<?= $sidebar->name() === 'family_nav' ? ' show' : '' ?>" role="tabpanel" aria-labelledby="sidebar-header-<?= $sidebar->name() ?>"> + <div id="sidebar-content-<?= $sidebar->name() ?>" class="collapse<?= $sidebar->name() === 'family_nav' ? ' show' : '' ?>" data-parent="#sidebar" aria-labelledby="sidebar-header-<?= $sidebar->name() ?>"> <div class="card-body"> <?= $sidebar->getSidebarContent($individual) ?></div> </div> |