diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/views/gedcom-record-page.phtml | 17 | ||||
| -rw-r--r-- | resources/views/individual-page.phtml | 6 | ||||
| -rw-r--r-- | resources/views/media-page.phtml | 14 | ||||
| -rw-r--r-- | resources/views/modules/place-hierarchy/events.phtml | 4 | ||||
| -rw-r--r-- | resources/views/modules/statistics-chart/page.phtml | 2 | ||||
| -rw-r--r-- | resources/views/note-page.phtml | 17 | ||||
| -rw-r--r-- | resources/views/pending-changes-page.phtml | 2 | ||||
| -rw-r--r-- | resources/views/repository-page.phtml | 5 | ||||
| -rw-r--r-- | resources/views/search-results.phtml | 10 | ||||
| -rw-r--r-- | resources/views/source-page.phtml | 14 | ||||
| -rw-r--r-- | resources/views/submitter-page.phtml | 8 |
11 files changed, 61 insertions, 38 deletions
diff --git a/resources/views/gedcom-record-page.phtml b/resources/views/gedcom-record-page.phtml index 7c29fbe1c0..2aacbf882b 100644 --- a/resources/views/gedcom-record-page.phtml +++ b/resources/views/gedcom-record-page.phtml @@ -34,36 +34,41 @@ use Fisharebest\Webtrees\I18N; <div class="wt-page-content"> <ul class="nav nav-tabs" role="tablist"> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link active" data-toggle="tab" role="tab" href="#details"> <?= I18N::translate('Details') ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $individuals->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#individuals"> <?= I18N::translate('Individuals') ?> <?= view('components/badge', ['count' => $individuals->count()]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $families->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#families"> <?= I18N::translate('Families') ?> <?= view('components/badge', ['count' => $families->count()]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $media_objects->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#media"> <?= I18N::translate('Media objects') ?> <?= view('components/badge', ['count' => $media_objects->count()]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $sources->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#sources"> <?= I18N::translate('Sources') ?> <?= view('components/badge', ['count' => $sources->count()]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $notes->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#notes"> <?= I18N::translate('Notes') ?> <?= view('components/badge', ['count' => $notes->count()]) ?> diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml index 8001c1dc74..d1002384a7 100644 --- a/resources/views/individual-page.phtml +++ b/resources/views/individual-page.phtml @@ -104,15 +104,16 @@ use Illuminate\Support\Collection; </div> <div class="wt-tabs-individual" id="individual-tabs"> - <ul class="nav nav-tabs flex-wrap"> + <ul class="nav nav-tabs flex-wrap" role="tablist"> <?php foreach ($tabs as $tab) : ?> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link<?= $tab->isGrayedOut($individual) ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" data-href="<?= e(route('module', ['module' => $tab->name(), 'action' => 'Tab', 'tree' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>" href="#<?= $tab->name() ?>"> <?= $tab->tabTitle() ?> </a> </li> <?php endforeach ?> </ul> + <div class="tab-content"> <?php foreach ($tabs as $tab) : ?> <div id="<?= $tab->name() ?>" class="tab-pane fade wt-ajax-load" role="tabpanel"><?php if (!$tab->canLoadAjax()) : @@ -133,6 +134,7 @@ use Illuminate\Support\Collection; </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 class="card-body"> <?= $sidebar->getSidebarContent($individual) ?></div> diff --git a/resources/views/media-page.phtml b/resources/views/media-page.phtml index 211e9ed416..1fc7c33901 100644 --- a/resources/views/media-page.phtml +++ b/resources/views/media-page.phtml @@ -48,30 +48,34 @@ use Illuminate\Support\Collection; <div class="wt-page-content"> <ul class="nav nav-tabs" role="tablist"> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link active" data-toggle="tab" role="tab" href="#details"> <?= I18N::translate('Details') ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $individuals->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#individuals"> <?= I18N::translate('Individuals') ?> <?= view('components/badge', ['count' => $individuals->count()]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $families->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#families"> <?= I18N::translate('Families') ?> <?= view('components/badge', ['count' => $families->count()]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $sources->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#sources"> <?= I18N::translate('Sources') ?> <?= view('components/badge', ['count' => $sources->count()]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $notes->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#notes"> <?= I18N::translate('Notes') ?> <?= view('components/badge', ['count' => $notes->count()]) ?> diff --git a/resources/views/modules/place-hierarchy/events.phtml b/resources/views/modules/place-hierarchy/events.phtml index d5a4ea2e42..afc3073b8f 100644 --- a/resources/views/modules/place-hierarchy/events.phtml +++ b/resources/views/modules/place-hierarchy/events.phtml @@ -5,13 +5,13 @@ use Fisharebest\Webtrees\I18N; ?> <ul class="nav nav-tabs" role="tablist"> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link active<?= $indilist === [] ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#individuals"> <?= I18N::translate('Individuals') ?> <?= view('components/badge', ['count' => count($indilist)]) ?> </a> </li> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link<?= $famlist === [] ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#families"> <?= I18N::translate('Families') ?> <?= view('components/badge', ['count' => count($famlist)]) ?> diff --git a/resources/views/modules/statistics-chart/page.phtml b/resources/views/modules/statistics-chart/page.phtml index eab740a57c..6c7c665920 100644 --- a/resources/views/modules/statistics-chart/page.phtml +++ b/resources/views/modules/statistics-chart/page.phtml @@ -13,7 +13,7 @@ use Fisharebest\Webtrees\View; <div class="wt-page-content wt-chart wt-statistics-chart" id="statistics-tabs"> <ul class="nav nav-tabs" role="tablist"> <?php foreach ($tabs as $label => $url) : ?> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link" href="#tab-<?= e(md5($url)) ?>" data-toggle="tab" data-href="<?= e($url) ?>" role="tab"> <?= $label ?> </a> diff --git a/resources/views/note-page.phtml b/resources/views/note-page.phtml index 601994a2a8..0563481bb2 100644 --- a/resources/views/note-page.phtml +++ b/resources/views/note-page.phtml @@ -34,36 +34,41 @@ use Fisharebest\Webtrees\I18N; <div class="wt-page-content"> <ul class="nav nav-tabs" role="tablist"> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link active" data-toggle="tab" role="tab" href="#details"> <?= I18N::translate('Details') ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $individuals->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#individuals"> <?= I18N::translate('Individuals') ?> <?= view('components/badge', ['count' => count($individuals)]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $families->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#families"> <?= I18N::translate('Families') ?> <?= view('components/badge', ['count' => count($families)]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $media_objects->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#media"> <?= I18N::translate('Media objects') ?> <?= view('components/badge', ['count' => count($media_objects)]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $sources->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#sources"> <?= I18N::translate('Sources') ?> <?= view('components/badge', ['count' => count($sources)]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $notes->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#notes"> <?= I18N::translate('Notes') ?> <?= view('components/badge', ['count' => count($notes)]) ?> diff --git a/resources/views/pending-changes-page.phtml b/resources/views/pending-changes-page.phtml index f35060e857..70207d3081 100644 --- a/resources/views/pending-changes-page.phtml +++ b/resources/views/pending-changes-page.phtml @@ -26,7 +26,7 @@ use Fisharebest\Webtrees\I18N; <ul class="nav nav-tabs" role="tablist"> <?php foreach ($changes as $tree_name => $gedcom_changes) : ?> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link <?= $tree_name === $active_tree_name ? 'active' : '' ?>" data-toggle="tab" href="#tree-<?= e(md5($tree_name)) ?>" aria-controls="tree-<?= e(md5($tree_name)) ?>" id="tree-<?= e(md5($tree_name)) ?>-tab"> <?= e($trees[$tree_name]->title()) ?> <span class="badge badge-secondary"> diff --git a/resources/views/repository-page.phtml b/resources/views/repository-page.phtml index e5c9dd248c..6ffc2e78dc 100644 --- a/resources/views/repository-page.phtml +++ b/resources/views/repository-page.phtml @@ -34,12 +34,13 @@ use Fisharebest\Webtrees\I18N; <div class="wt-page-content"> <ul class="nav nav-tabs" role="tablist"> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link active" data-toggle="tab" role="tab" href="#details"> <?= I18N::translate('Details') ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $sources->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#sources"> <?= I18N::translate('Sources') ?> <?= view('components/badge', ['count' => count($sources)]) ?> diff --git a/resources/views/search-results.phtml b/resources/views/search-results.phtml index 8c17a48533..4bc57bf9be 100644 --- a/resources/views/search-results.phtml +++ b/resources/views/search-results.phtml @@ -8,7 +8,7 @@ use Fisharebest\Webtrees\I18N; <div class="wt-search-results"> <ul class="nav nav-tabs wt-search-results-tabs" role="tablist"> <?php if ($search_individuals) : ?> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link <?= $individuals->isEmpty() ? 'text-muted' : '' ?>" id="individuals-tab" data-toggle="tab" href="#individuals" role="tab" aria-controls="individuals"> <?= I18N::translate('Individuals') ?> <span class="badge badge-secondary"> @@ -19,7 +19,7 @@ use Fisharebest\Webtrees\I18N; <?php endif ?> <?php if ($search_families) : ?> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link <?= $families->isEmpty() ? 'text-muted' : '' ?>" id="families-tab" data-toggle="tab" href="#families" role="tab" aria-controls="families"> <?= I18N::translate('Families') ?> <span class="badge badge-secondary"> @@ -30,7 +30,7 @@ use Fisharebest\Webtrees\I18N; <?php endif ?> <?php if ($search_sources) : ?> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link <?= $sources->isEmpty() ? 'text-muted' : '' ?>" id="sources-tab" data-toggle="tab" href="#sources" role="tab" aria-controls="sources"> <?= I18N::translate('Sources') ?> <span class="badge badge-secondary"> @@ -41,7 +41,7 @@ use Fisharebest\Webtrees\I18N; <?php endif ?> <?php if ($search_repositories) : ?> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link <?= $repositories->isEmpty() ? 'text-muted' : '' ?>" id="repositories-tab" data-toggle="tab" href="#repositories" role="tab" aria-controls="repositories"> <?= I18N::translate('Repositories') ?> <span class="badge badge-secondary"> @@ -52,7 +52,7 @@ use Fisharebest\Webtrees\I18N; <?php endif ?> <?php if ($search_notes) : ?> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link <?= $notes->isEmpty() ? 'text-muted' : '' ?>" id="notes-tab" data-toggle="tab" href="#notes" role="tab" aria-controls="notes"> <?= I18N::translate('Notes') ?> <span class="badge badge-secondary"> diff --git a/resources/views/source-page.phtml b/resources/views/source-page.phtml index 34eef50cc3..c9e81d2a63 100644 --- a/resources/views/source-page.phtml +++ b/resources/views/source-page.phtml @@ -35,30 +35,34 @@ use Fisharebest\Webtrees\I18N; <div class="wt-page-content"> <ul class="nav nav-tabs" role="tablist"> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link active" data-toggle="tab" role="tab" href="#details"> <?= I18N::translate('Details') ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $individuals->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#individuals"> <?= I18N::translate('Individuals') ?> <?= view('components/badge', ['count' => count($individuals)]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $families->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#families"> <?= I18N::translate('Families') ?> <?= view('components/badge', ['count' => count($families)]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $media_objects->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#media"> <?= I18N::translate('Media objects') ?> <?= view('components/badge', ['count' => count($media_objects)]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $notes->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#notes"> <?= I18N::translate('Notes') ?> <?= view('components/badge', ['count' => count($notes)]) ?> diff --git a/resources/views/submitter-page.phtml b/resources/views/submitter-page.phtml index fd98f6ef73..bde828f4cf 100644 --- a/resources/views/submitter-page.phtml +++ b/resources/views/submitter-page.phtml @@ -34,18 +34,20 @@ use Fisharebest\Webtrees\I18N; <div class="wt-page-content"> <ul class="nav nav-tabs" role="tablist"> - <li class="nav-item"> + <li class="nav-item" role="presentation"> <a class="nav-link active" data-toggle="tab" role="tab" href="#details"> <?= I18N::translate('Details') ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $individuals->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#individuals"> <?= I18N::translate('Individuals') ?> <?= view('components/badge', ['count' => $individuals->count()]) ?> </a> </li> - <li class="nav-item"> + + <li class="nav-item" role="presentation"> <a class="nav-link<?= $families->isEmpty() ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" href="#families"> <?= I18N::translate('Families') ?> <?= view('components/badge', ['count' => $families->count()]) ?> |
