diff options
Diffstat (limited to 'resources/views')
29 files changed, 302 insertions, 112 deletions
diff --git a/resources/views/chart-box.phtml b/resources/views/chart-box.phtml new file mode 100644 index 0000000000..e4c70969b3 --- /dev/null +++ b/resources/views/chart-box.phtml @@ -0,0 +1,187 @@ +<?php +declare(strict_types=1); + +use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Fact; +use Fisharebest\Webtrees\Functions\Functions; +use Fisharebest\Webtrees\Gedcom; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Menu; +use Fisharebest\Webtrees\Module\ModuleChartInterface; +use Fisharebest\Webtrees\Services\ModuleService; +use Illuminate\Support\Collection; +use Ramsey\Uuid\Uuid; + +/** + * @var Individual $individual + * @var ModuleService $module_service + * @var Collection|Menu[] $menus + */ + +$module_service = app(ModuleService::class); + +$menus = $module_service->findByComponent('chart', $individual->tree(), Auth::user())->map(function (ModuleChartInterface $module) use ($individual): ?Menu { + return $module->chartBoxMenu($individual); +})->filter(); + +foreach ($individual->getSpouseFamilies() as $family) { + $menus[] = new Menu('<strong>' . I18N::translate('Family with spouse') . '</strong>', $family->url()); + $spouse = $family->getSpouse($individual); + if ($spouse && $spouse->canShow()) { + $menus->push(new Menu($spouse->getFullName(), $spouse->url())); + } + foreach ($family->getChildren() as $child) { + if ($child->canShow()) { + $menus->push(new Menu($child->getFullName(), $child->url())); + } + } +} + + // Do not show these facts in the expanded chart boxes. + $exclude = [ + 'ADDR', + 'ALIA', + 'ASSO', + 'CHAN', + 'CHIL', + 'EMAIL', + 'FAMC', + 'FAMS', + 'HUSB', + 'NAME', + 'NOTE', + 'OBJE', + 'PHON', + 'RESI', + 'RESN', + 'SEX', + 'SOUR', + 'SSN', + 'SUBM', + 'TITL', + 'URL', + 'WIFE', + 'WWW', + '_EMAIL', + '_TODO', + '_UID', + '_WT_OBJE_SORT', + ]; + + +/** @var Fact[] $all_facts */ +$all_facts = $individual->facts(); +foreach ($individual->getSpouseFamilies() as $family) { + foreach ($family->facts() as $fact) { + $all_facts[] = $fact; + } +} +Functions::sortFacts($all_facts); + +$all_facts = array_filter($all_facts, function (Fact $fact) use ($exclude): bool { + return !in_array($fact->getTag(), $exclude); +}); + + +$id = Uuid::uuid4()->toString(); + +/** + * @var Individual $individual + */ +?> +<div class="wt-chart-box wt-chart-box-<?= strtolower($individual->getSex()) ?>" style="overflow: hidden;" data-xref="<?= e($individual->xref()) ?>" data-tree="<?= e($individual->tree()->name()) ?>"> + <?php if ($individual->canShow() && $individual->tree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) : ?> + <div class="wt-chart-box-thumbnail float-left mr-1"> + <?= $individual->displayImage(40, 50, 'crop', ['class' => 'wt-chart-box-thumbnail']) ?> + </div> + <?php endif ?> + + <div class="wt-chart-box-extra float-right ml-1"> + <div class="dropdown position-static wt-chart-box-zoom"> + <a class="wt-chart-box-icon" href="#" role="button" id="chart-box-zoom-<?= $id ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <div ><?= view('icons/zoom-in') ?></div> + <div class="d-none"><?= view('icons/zoom-out') ?></div> + <span class="sr-only"><?= I18N::translate('Links') ?></span> + </a> + + <div class="dropdown-menu dropdown-menu-right wt-chart-box-dropdown wt-chart-box-zoom-dropdown" style="position: inherit" aria-labelledby="#chart-box-zoom-<?= $id ?>"> + <?php foreach ($all_facts as $fact): ?> + <?= $fact->summary() ?> + <?php endforeach ?> + </div> + </div> + + <div class="dropdown position-static wt-chart-box-links"> + <a class="wt-chart-box-icon" href="#" role="button" id="chart-box-menu-<?= $id ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <i class="icon-pedigree" title="<?= I18N::translate('Links') ?>"></i> + <span class="sr-only"><?= I18N::translate('Links') ?></span> + </a> + + <div class="dropdown-menu dropdown-menu-right wt-chart-box-dropdown wt-chart-box-links-dropdown" style="position: inherit" aria-labelledby="#chart-box-menu-<?= $id ?>"> + <?php foreach ($menus as $menu): ?> + <?= $menu->getMenuAsList() ?> + <?php endforeach ?> + </div> + </div> + </div> + + <div class="wt-chart-box-name font-weight-bold"> + <a href="<?= e($individual->url()) ?>" class="wt-chart-box-name"><?= $individual->getFullName() ?></a> + </div> + + <div class="wt-chart-box-name font-weight-bold"> + <?= $individual->getAddName() ?> + </div> + + <div class="wt-chart-box-lifespan"> + <?= $individual->getLifeSpan() ?> + </div> + + <div class="wt-chart-box-facts"> + <div class="wt-chart-box-fact small"> + <?php + $opt_tags = preg_split('/\W/', $individual->tree()->getPreference('CHART_BOX_TAGS'), 0, PREG_SPLIT_NO_EMPTY); + // Show BIRT or equivalent event + + foreach (Gedcom::BIRTH_EVENTS as $birttag) { + if (!in_array($birttag, $opt_tags)) { + $event = $individual->getFirstFact($birttag); + if ($event instanceof Fact) { + echo $event->summary(); + break; + } + } + } + // Show optional events (before death) + foreach ($opt_tags as $key => $tag) { + if (!in_array($tag, Gedcom::DEATH_EVENTS)) { + $event = $individual->getFirstFact($tag); + if ($event instanceof Fact) { + echo $event->summary(); + unset($opt_tags[$key]); + } + } + } + // Show DEAT or equivalent event + foreach (Gedcom::DEATH_EVENTS as $deattag) { + $event = $individual->getFirstFact($deattag); + if ($event instanceof Fact) { + echo $event->summary(); + if (in_array($deattag, $opt_tags)) { + unset($opt_tags[array_search($deattag, $opt_tags)]); + } + break; + } + } + // Show remaining optional events (after death) + foreach ($opt_tags as $tag) { + $event = $individual->getFirstFact($tag); + if ($event instanceof Fact) { + echo $event->summary(); + } + } + ?> + </div> + </div> +</div> diff --git a/resources/views/edit-blocks-page.phtml b/resources/views/edit-blocks-page.phtml index 666536285a..ef4b3f2ff2 100644 --- a/resources/views/edit-blocks-page.phtml +++ b/resources/views/edit-blocks-page.phtml @@ -12,17 +12,17 @@ <table border="1" id="change_blocks"> <thead> <tr> - <th class="descriptionbox center vmiddle" colspan="2"> + <th class="descriptionbox text-center vmiddle" colspan="2"> <label for="main_select"> <?= I18N::translate('Main section blocks') ?> </label> </th> - <th class="descriptionbox center vmiddle" colspan="3"> + <th class="descriptionbox text-center vmiddle" colspan="3"> <label for="available_select"> <?= I18N::translate('Available blocks') ?> </label> </th> - <th class="descriptionbox center vmiddle" colspan="2"> + <th class="descriptionbox text-center vmiddle" colspan="2"> <label for="side_select"> <?= I18N::translate('Right section blocks') ?> </label> @@ -31,7 +31,7 @@ </thead> <tbody> <tr> - <td class="optionbox center vmiddle"> + <td class="optionbox text-center vmiddle"> <a href="#" class="btn btn-link" onclick="<?= e('return move_up_block("main_select");') ?>" title="<?= I18N::translate('Move up') ?>"> <?= view('icons/arrow-up') ?> </a> @@ -57,7 +57,7 @@ <?php endforeach ?> </select> </td> - <td class="optionbox center vmiddle"> + <td class="optionbox text-center vmiddle"> <a href="#" class="btn btn-link" onclick="<?= e('return move_left_right_block("available_select", "main_select");') ?>" title="<?= I18N::translate('Add') ?>"> <?= view('icons/arrow-left') ?> </a> @@ -71,7 +71,7 @@ <?php endforeach ?> </select> </td> - <td class="optionbox center vmiddle"> + <td class="optionbox text-center vmiddle"> <a href="#" class="btn btn-link" onclick="<?= e('return move_left_right_block("available_select", "side_select");') ?>" title="<?= I18N::translate('Add') ?>"> <?= view('icons/arrow-right') ?> </a> @@ -85,7 +85,7 @@ <?php endforeach ?> </select> </td> - <td class="optionbox center vmiddle"> + <td class="optionbox text-center vmiddle"> <a href="#" class="btn btn-link" onclick="<?= e('return move_up_block("side_select");') ?>" title="<?= I18N::translate('Move up') ?>"> <?= view('icons/arrow-up') ?> </a> diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml index a8f8e2f233..b60027143a 100644 --- a/resources/views/individual-page.phtml +++ b/resources/views/individual-page.phtml @@ -38,7 +38,7 @@ <!-- Individual images --> <div class="col-sm-3"> <?php if (empty($individual_media)) : ?> - <i class="wt-individual-silhouette wt-individual-silhouette-<?= $individual->getSex() ?>"></i> + <i class="wt-individual-silhouette wt-individual-silhouette-<?= strtolower($individual->getSex()) ?>"></i> <?php elseif (count($individual_media) === 1) : ?> <?= $individual_media[0]->displayImage(200, 260, 'crop', ['class' => 'img-thumbnail img-fluid w-100']) ?> <?php else : ?> diff --git a/resources/views/interactive-tree-page.phtml b/resources/views/interactive-tree-page.phtml index 021f970982..928bfbb05a 100644 --- a/resources/views/interactive-tree-page.phtml +++ b/resources/views/interactive-tree-page.phtml @@ -31,7 +31,7 @@ </div> </form> -<div class="wt-page-content wt-chart wt-interactive-tree"> +<div class="wt-page-content wt-chart wt-chart-interactive"> <?= $html ?> </div> diff --git a/resources/views/lists/families-table.phtml b/resources/views/lists/families-table.phtml index 2a67c45e26..e1724a0230 100644 --- a/resources/views/lists/families-table.phtml +++ b/resources/views/lists/families-table.phtml @@ -261,7 +261,7 @@ for ($year = 1550; $year < 2030; $year += 10) { } } ?> - <td class="center" data-sort="<?= Date::getAgeDays($hdate, $mdate) ?>"> + <td class="text-center" data-sort="<?= Date::getAgeDays($hdate, $mdate) ?>"> <?= Date::getAge($hdate, $mdate) ?> </td> @@ -297,7 +297,7 @@ for ($year = 1550; $year < 2030; $year += 10) { } ?> - <td class="center" data-sort="<?= Date::getAgeDays($wdate, $mdate) ?>"> + <td class="text-center" data-sort="<?= Date::getAgeDays($wdate, $mdate) ?>"> <?= Date::getAge($wdate, $mdate) ?> </td> @@ -318,7 +318,7 @@ for ($year = 1550; $year < 2030; $year += 10) { </td> <!-- Marriage anniversary --> - <td class="center" data-sort="<?= -$family->getMarriageDate()->julianDay() ?>"> + <td class="text-center" data-sort="<?= -$family->getMarriageDate()->julianDay() ?>"> <?= Date::getAge($family->getMarriageDate(), null) ?> </td> @@ -331,7 +331,7 @@ for ($year = 1550; $year < 2030; $year += 10) { </td> <!-- Number of children --> - <td class="center" data-sort="<?= $family->getNumberOfChildren() ?>"> + <td class="text-center" data-sort="<?= $family->getNumberOfChildren() ?>"> <?= I18N::number($family->getNumberOfChildren()) ?> </td> diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml index 5cf5b39fb9..ea0205aa4a 100644 --- a/resources/views/lists/individuals-table.phtml +++ b/resources/views/lists/individuals-table.phtml @@ -266,7 +266,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <td hidden data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', $individual->getSortName())) ?>"></td> - <td class="center" data-sort="<?= $key ?>"> + <td class="text-center" data-sort="<?= $key ?>"> <?php if ($sosa) : ?> <?php if ($module instanceof RelationshipsChartModule) : ?> <a href="<?= e($module->chartUrl($individuals[1], ['xref2' => $individual->xref()])) ?>" rel="nofollow" title="<?= I18N::translate('Relationships') ?>" rel="nofollow"> @@ -289,7 +289,7 @@ for ($year = 1550; $year < 2030; $year += 10) { </td> <!-- Birth anniversary --> - <td class="center" data-sort="<?= -$individual->getEstimatedBirthDate()->julianDay() ?>"> + <td class="text-center" data-sort="<?= -$individual->getEstimatedBirthDate()->julianDay() ?>"> <?php if (isset($birth_dates[0]) && $birth_dates[0]->gregorianYear() >= 1550 && $birth_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->xref()])) : ?> <?php $birt_by_decade[(int) ($birth_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?> <?= Date::getAge($birth_dates[0], null) ?> @@ -305,7 +305,7 @@ for ($year = 1550; $year < 2030; $year += 10) { </td> <!-- Number of children --> - <td class="center" data-sort="<?= $individual->getNumberOfChildren() ?>"> + <td class="text-center" data-sort="<?= $individual->getNumberOfChildren() ?>"> <?= I18N::number($individual->getNumberOfChildren()) ?> </td> @@ -319,7 +319,7 @@ for ($year = 1550; $year < 2030; $year += 10) { </td> <!-- Death anniversary --> - <td class="center" data-sort="<?= -$individual->getEstimatedDeathDate()->julianDay() ?>"> + <td class="text-center" data-sort="<?= -$individual->getEstimatedDeathDate()->julianDay() ?>"> <?php if (isset($death_dates[0]) && $death_dates[0]->gregorianYear() >= 1550 && $death_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->xref()])) : ?> <?php $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?> <?= Date::getAge($death_dates[0], null) ?> @@ -337,7 +337,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <?php $age_at_death = ''; ?> <?php $age_at_death_sort = PHP_INT_MAX; ?> <?php endif ?> - <td class="center" data-sort="<?= e($age_at_death_sort) ?>"> + <td class="text-center" data-sort="<?= e($age_at_death_sort) ?>"> <?= e($age_at_death) ?> </td> diff --git a/resources/views/lists/media-table.phtml b/resources/views/lists/media-table.phtml index f1fed989fb..91b83a9edf 100644 --- a/resources/views/lists/media-table.phtml +++ b/resources/views/lists/media-table.phtml @@ -88,17 +88,17 @@ $count_sources = DB::table('sources') </td> <!-- Count of linked individuals --> - <td class="center" data-sort="<?= $count_individuals[$media_object->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_individuals[$media_object->xref()] ?? 0 ?>"> <?= I18N::number($count_individuals[$media_object->xref()] ?? 0) ?> </td> <!-- Count of linked families --> - <td class="center" data-sort="<?= $count_families[$media_object->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_families[$media_object->xref()] ?? 0 ?>"> <?= I18N::number($count_families[$media_object->xref()] ?? 0) ?> </td> <!-- Count of sources --> - <td class="center" data-sort="<?= $count_sources[$media_object->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_sources[$media_object->xref()] ?? 0 ?>"> <?= I18N::number($count_sources[$media_object->xref()] ?? 0) ?> </td> diff --git a/resources/views/lists/notes-table.phtml b/resources/views/lists/notes-table.phtml index 471cf34cf8..d2e039a182 100644 --- a/resources/views/lists/notes-table.phtml +++ b/resources/views/lists/notes-table.phtml @@ -93,22 +93,22 @@ $count_sources = DB::table('sources') </td> <!-- Count of linked individuals --> - <td class="center" data-sort="<?= $count_individuals[$note->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_individuals[$note->xref()] ?? 0 ?>"> <?= I18N::number($count_individuals[$note->xref()] ?? 0) ?> </td> <!-- Count of linked families --> - <td class="center" data-sort="<?= $count_families[$note->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_families[$note->xref()] ?? 0 ?>"> <?= I18N::number($count_families[$note->xref()] ?? 0) ?> </td> <!-- Count of linked media objects --> - <td class="center" data-sort="<?= $count_media[$note->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_media[$note->xref()] ?? 0 ?>"> <?= I18N::number($count_media[$note->xref()] ?? 0) ?> </td> <!-- Count of sources --> - <td class="center" data-sort="<?= $count_sources[$note->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_sources[$note->xref()] ?? 0 ?>"> <?= I18N::number($count_sources[$note->xref()] ?? 0) ?> </td> diff --git a/resources/views/lists/repositories-table.phtml b/resources/views/lists/repositories-table.phtml index c2674e360e..5e2269cd2b 100644 --- a/resources/views/lists/repositories-table.phtml +++ b/resources/views/lists/repositories-table.phtml @@ -51,7 +51,7 @@ $count_sources = DB::table('sources') </td> <!-- Count of linked sources --> - <td class="center" data-sort="<?= $count_sources[$repository->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_sources[$repository->xref()] ?? 0 ?>"> <?= I18N::number($count_sources[$repository->xref()] ?? 0) ?> </td> diff --git a/resources/views/lists/sources-table.phtml b/resources/views/lists/sources-table.phtml index a1481be22a..fe596bf945 100644 --- a/resources/views/lists/sources-table.phtml +++ b/resources/views/lists/sources-table.phtml @@ -101,22 +101,22 @@ $count_notes = DB::table('other') </td> <!-- Count of linked individuals --> - <td class="center" data-sort="<?= $count_individuals[$source->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_individuals[$source->xref()] ?? 0 ?>"> <?= I18N::number($count_individuals[$source->xref()] ?? 0) ?> </td> <!-- Count of linked families --> - <td class="center" data-sort="<?= $count_families[$source->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_families[$source->xref()] ?? 0 ?>"> <?= I18N::number($count_families[$source->xref()] ?? 0) ?> </td> <!-- Count of linked media objects --> - <td class="center" data-sort="<?= $count_media[$source->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_media[$source->xref()] ?? 0 ?>"> <?= I18N::number($count_media[$source->xref()] ?? 0) ?> </td> <!-- Count of linked notes --> - <td class="center" data-sort="<?= $count_notes[$source->xref()] ?? 0 ?>"> + <td class="text-center" data-sort="<?= $count_notes[$source->xref()] ?? 0 ?>"> <?= I18N::number($count_notes[$source->xref()] ?? 0) ?> </td> diff --git a/resources/views/modules/ancestors-chart/page.phtml b/resources/views/modules/ancestors-chart/page.phtml index 5c008bae25..c76b6feeaf 100644 --- a/resources/views/modules/ancestors-chart/page.phtml +++ b/resources/views/modules/ancestors-chart/page.phtml @@ -51,7 +51,7 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-ancestors-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-chart-ancestors" data-ajax-url="<?= e($ajax_url) ?>"></div> <?php View::push('javascript') ?> <script> diff --git a/resources/views/modules/compact-chart/arrow-down.phtml b/resources/views/modules/compact-chart/arrow-down.phtml index 70b0f135d3..932cbe3d08 100644 --- a/resources/views/modules/compact-chart/arrow-down.phtml +++ b/resources/views/modules/compact-chart/arrow-down.phtml @@ -3,7 +3,7 @@ <?php if ($individual === null) : ?> <?= view('icons/arrow-down') ?> <?php else : ?> - <a href="<?= e(route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name()])) ?>" title="<?= I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())) ?>"> + <a href="<?= e($module->chartUrl($individual)) ?>" title="<?= strip_tags($module->chartTitle($individual)) ?>"> <?= view('icons/arrow-down') ?> </a> <?php endif; diff --git a/resources/views/modules/compact-chart/arrow-left.phtml b/resources/views/modules/compact-chart/arrow-left.phtml index 0f5a819ba3..c279518bd1 100644 --- a/resources/views/modules/compact-chart/arrow-left.phtml +++ b/resources/views/modules/compact-chart/arrow-left.phtml @@ -3,7 +3,7 @@ <?php if ($individual === null) : ?> <?= view('icons/arrow-left') ?> <?php else : ?> - <a href="<?= e(route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name()])) ?>" title="<?= I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())) ?>"> + <a href="<?= e($module->chartUrl($individual)) ?>" title="<?= strip_tags($module->chartTitle($individual)) ?>"> <?= view('icons/arrow-left') ?> </a> <?php endif; diff --git a/resources/views/modules/compact-chart/arrow-right.phtml b/resources/views/modules/compact-chart/arrow-right.phtml index cc46038d5d..95f4eddc9c 100644 --- a/resources/views/modules/compact-chart/arrow-right.phtml +++ b/resources/views/modules/compact-chart/arrow-right.phtml @@ -3,7 +3,7 @@ <?php if ($individual === null) : ?> <?= view('icons/arrow-right') ?> <?php else : ?> - <a href="<?= e(route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name()])) ?>" title="<?= I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())) ?>"> + <a href="<?= e($module->chartUrl($individual)) ?>" title="<?= strip_tags($module->chartTitle($individual)) ?>"> <?= view('icons/arrow-right') ?> </a> <?php endif; diff --git a/resources/views/modules/compact-chart/arrow-up.phtml b/resources/views/modules/compact-chart/arrow-up.phtml index f9654311d5..5feaa5a717 100644 --- a/resources/views/modules/compact-chart/arrow-up.phtml +++ b/resources/views/modules/compact-chart/arrow-up.phtml @@ -3,7 +3,7 @@ <?php if ($individual === null) : ?> <?= view('icons/arrow-up') ?> <?php else : ?> - <a href="<?= e(route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->tree()->name()])) ?>" title="<?= I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())) ?>"> + <a href="<?= e($module->chartUrl($individual)) ?>" title="<?= strip_tags($module->chartTitle($individual)) ?>"> <?= view('icons/arrow-up') ?> </a> <?php endif; diff --git a/resources/views/modules/compact-chart/chart.phtml b/resources/views/modules/compact-chart/chart.phtml index 6463e4fddc..ccb26c9411 100644 --- a/resources/views/modules/compact-chart/chart.phtml +++ b/resources/views/modules/compact-chart/chart.phtml @@ -1,123 +1,123 @@ -<table class="text-center w-100 h-100" role="presentation"> +<table class="text-center w-100 h-100 wt-chart-compact-table" role="presentation"> <tr> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(16)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(16)]) ?> </td> <td></td> <td></td> <td></td> <td class="h-100"> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(18)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(18)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(24)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(24)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(26)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(26)]) ?> </td> </tr> <tr> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(16)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(16)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(18)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(18)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(24)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(24)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(26)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(26)]) ?> </td> </tr> <tr> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(8)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(8)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow-left', ['individual' => $ancestors->get(8)]) ?> + <?= view('modules/compact-chart/arrow-left', ['module' => $module, 'individual' => $ancestors->get(8)]) ?> </td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(4)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(4)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow-right', ['individual' => $ancestors->get(9)]) ?> + <?= view('modules/compact-chart/arrow-right', ['module' => $module, 'individual' => $ancestors->get(9)]) ?> </td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(9)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(9)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(12)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(12)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow-left', ['individual' => $ancestors->get(12)]) ?> + <?= view('modules/compact-chart/arrow-left', ['module' => $module, 'individual' => $ancestors->get(12)]) ?> </td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(6)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(6)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow-right', ['individual' => $ancestors->get(13)]) ?> + <?= view('modules/compact-chart/arrow-right', ['module' => $module, 'individual' => $ancestors->get(13)]) ?> </td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(13)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(13)]) ?> </td> </tr> <tr> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(17)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(17)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(19)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(19)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(25)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(25)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(27)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(27)]) ?> </td> </tr> <tr> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(17)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(17)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(4)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(4)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(19)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(19)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(25)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(25)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(6)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(6)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(27)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(27)]) ?> </td> </tr> <tr> @@ -137,27 +137,27 @@ <td></td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(2)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(2)]) ?> </td> <td></td> <td colspan="3"> <table width="100%"> <tr> <td width='25%'> - <?= view('modules/compact-chart/arrow-left', ['individual' => $ancestors->get(2)]) ?> + <?= view('modules/compact-chart/arrow-left', ['module' => $module, 'individual' => $ancestors->get(2)]) ?> </td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(1)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(1)]) ?> </td> <td width='25%'> - <?= view('modules/compact-chart/arrow-right', ['individual' => $ancestors->get(3)]) ?> + <?= view('modules/compact-chart/arrow-right', ['module' => $module, 'individual' => $ancestors->get(3)]) ?> </td> </tr> </table> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(3)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(3)]) ?> </td> <td></td> <td></td> @@ -177,123 +177,123 @@ </tr> <tr> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(20)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(20)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(5)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(5)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(22)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(22)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(28)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(28)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(7)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(7)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(30)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(30)]) ?> </td> </tr> <tr> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(20)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(20)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(22)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(22)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(28)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(28)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow-up', ['individual' => $ancestors->get(30)]) ?> + <?= view('modules/compact-chart/arrow-up', ['module' => $module, 'individual' => $ancestors->get(30)]) ?> </td> </tr> <tr> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(10)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(10)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow-left', ['individual' => $ancestors->get(10)]) ?> + <?= view('modules/compact-chart/arrow-left', ['module' => $module, 'individual' => $ancestors->get(10)]) ?> </td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(5)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(5)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow-right', ['individual' => $ancestors->get(11)]) ?> + <?= view('modules/compact-chart/arrow-right', ['module' => $module, 'individual' => $ancestors->get(11)]) ?> </td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(11)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(11)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(14)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(14)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow-left', ['individual' => $ancestors->get(14)]) ?> + <?= view('modules/compact-chart/arrow-left', ['module' => $module, 'individual' => $ancestors->get(14)]) ?> </td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(7)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(7)]) ?> </td> <td> - <?= view('modules/compact-chart/arrow-right', ['individual' => $ancestors->get(15)]) ?> + <?= view('modules/compact-chart/arrow-right', ['module' => $module, 'individual' => $ancestors->get(15)]) ?> </td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(15)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(15)]) ?> </td> </tr> <tr> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(21)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(21)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(23)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(23)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(29)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(29)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/arrow-down', ['individual' => $ancestors->get(31)]) ?> + <?= view('modules/compact-chart/arrow-down', ['module' => $module, 'individual' => $ancestors->get(31)]) ?> </td> </tr> <tr> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(21)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(21)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(23)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(23)]) ?> </td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(29)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(29)]) ?> </td> <td></td> <td></td> <td></td> <td> - <?= view('modules/compact-chart/individual', ['individual' => $ancestors->get(31)]) ?> + <?= view('modules/compact-chart/individual', ['module' => $module, 'individual' => $ancestors->get(31)]) ?> </td> </tr> </table> diff --git a/resources/views/modules/compact-chart/individual.phtml b/resources/views/modules/compact-chart/individual.phtml index a93a18fc29..660ecf8cf5 100644 --- a/resources/views/modules/compact-chart/individual.phtml +++ b/resources/views/modules/compact-chart/individual.phtml @@ -1,6 +1,8 @@ <?php if ($individual === null) : ?> - <div class="h-100 person_boxNN person_box_template"> </div> + <div class="h-100 wt-chart-box"> </div> <?php else : ?> + <?= view('chart-box', ['individual' => $individual]) ?> +<!-- <div class="h-100 person_box<?= ['M' => '', 'F' => 'F', 'U' => 'NN'][$individual->getSex()]?> person_box_template"> <a href="<?= e($individual->url()) ?>"> <?= $individual->getFullName() ?> @@ -9,4 +11,5 @@ <?= $individual->getLifeSpan() ?> </div> </div> +--> <?php endif ?> diff --git a/resources/views/modules/compact-chart/page.phtml b/resources/views/modules/compact-chart/page.phtml index aae3243eb8..e99bc29cb8 100644 --- a/resources/views/modules/compact-chart/page.phtml +++ b/resources/views/modules/compact-chart/page.phtml @@ -28,4 +28,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-compact-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-chart-compact" data-ajax-url="<?= e($ajax_url) ?>"></div> diff --git a/resources/views/modules/descendancy_chart/page.phtml b/resources/views/modules/descendancy_chart/page.phtml index 6866de25f1..013faf30f3 100644 --- a/resources/views/modules/descendancy_chart/page.phtml +++ b/resources/views/modules/descendancy_chart/page.phtml @@ -49,4 +49,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-descendants-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-chart-descendants" data-ajax-url="<?= e($ajax_url) ?>"></div> diff --git a/resources/views/modules/family-book-chart/page.phtml b/resources/views/modules/family-book-chart/page.phtml index 59fbfe84d4..977d5740d6 100644 --- a/resources/views/modules/family-book-chart/page.phtml +++ b/resources/views/modules/family-book-chart/page.phtml @@ -58,4 +58,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-family-book-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-chart-family-book" data-ajax-url="<?= e($ajax_url) ?>"></div> diff --git a/resources/views/modules/fanchart/chart.phtml b/resources/views/modules/fanchart/chart.phtml index 34f58c7e1c..20a328011d 100644 --- a/resources/views/modules/fanchart/chart.phtml +++ b/resources/views/modules/fanchart/chart.phtml @@ -5,7 +5,7 @@ </map> <div class="text-center"> - <img class="wt-fan-chart-img" src="data:image/png;base64,<?= base64_encode($png) ?>" width="<?= $fanw ?>" height="<?= $fanh ?>" alt="<?= strip_tags($title) ?>" usemap="#fan-chart-map"> + <img class="wt-chart-fan-img" src="data:image/png;base64,<?= base64_encode($png) ?>" width="<?= $fanw ?>" height="<?= $fanh ?>" alt="<?= strip_tags($title) ?>" usemap="#fan-chart-map"> </div> <script> diff --git a/resources/views/modules/fanchart/page.phtml b/resources/views/modules/fanchart/page.phtml index 16688e1319..d6601e15d2 100644 --- a/resources/views/modules/fanchart/page.phtml +++ b/resources/views/modules/fanchart/page.phtml @@ -63,4 +63,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-fan-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-chart-fan" data-ajax-url="<?= e($ajax_url) ?>"></div> diff --git a/resources/views/modules/gedcom_stats/statistics.phtml b/resources/views/modules/gedcom_stats/statistics.phtml index 927b1a4fd0..c0a785babf 100644 --- a/resources/views/modules/gedcom_stats/statistics.phtml +++ b/resources/views/modules/gedcom_stats/statistics.phtml @@ -233,7 +233,7 @@ </div> <?php if (!empty($surnames)) : ?> - <div class="clearfloat"> + <div class="clearfix"> <p> <strong> <?= I18N::translate('Most common surnames') ?> diff --git a/resources/views/modules/hourglass-chart/page.phtml b/resources/views/modules/hourglass-chart/page.phtml index 041d43acbc..133f71c2e5 100644 --- a/resources/views/modules/hourglass-chart/page.phtml +++ b/resources/views/modules/hourglass-chart/page.phtml @@ -49,4 +49,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-hourglass-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-chart-hourglass" data-ajax-url="<?= e($ajax_url) ?>"></div> diff --git a/resources/views/modules/pedigree-chart/page.phtml b/resources/views/modules/pedigree-chart/page.phtml index f71b3f1c68..d506711d75 100644 --- a/resources/views/modules/pedigree-chart/page.phtml +++ b/resources/views/modules/pedigree-chart/page.phtml @@ -47,4 +47,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-pedigree-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-chart-pedigree" data-ajax-url="<?= e($ajax_url) ?>"></div> diff --git a/resources/views/modules/relationships-chart/page.phtml b/resources/views/modules/relationships-chart/page.phtml index 1cfcdcabbf..7d36a6c18b 100644 --- a/resources/views/modules/relationships-chart/page.phtml +++ b/resources/views/modules/relationships-chart/page.phtml @@ -81,7 +81,7 @@ </form> <?php if ($individual1 !== null && $individual2 !== null) : ?> - <div class="wt-ajax-load wt-page-content wt-chart wt-relationships-chart" data-ajax-url="<?= e($ajax_url) ?>"></div> + <div class="wt-ajax-load wt-page-content wt-chart wt-chart-relationships" data-ajax-url="<?= e($ajax_url) ?>"></div> <?php endif ?> <?php View::push('javascript') ?> diff --git a/resources/views/modules/statistics-chart/custom.phtml b/resources/views/modules/statistics-chart/custom.phtml index df8bc61762..bdbc9d46a3 100644 --- a/resources/views/modules/statistics-chart/custom.phtml +++ b/resources/views/modules/statistics-chart/custom.phtml @@ -270,7 +270,7 @@ </div> </div> - <p class="center"> + <p> <button type="submit" class="btn btn-primary"> <?= view('icons/save') ?> <?= I18N::translate('show the chart') ?> diff --git a/resources/views/modules/stories/tab.phtml b/resources/views/modules/stories/tab.phtml index 9767de219d..9c7544be28 100644 --- a/resources/views/modules/stories/tab.phtml +++ b/resources/views/modules/stories/tab.phtml @@ -2,7 +2,7 @@ <div class="wt-stories-tab py-4"> <?php foreach ($stories as $story) : ?> - <div class="story_title descriptionbox center rela"> + <div class="story_title descriptionbox text-center rela"> <?= e($story->title) ?> </div> <div class="story_body optionbox"> diff --git a/resources/views/places-page.phtml b/resources/views/places-page.phtml index 647c96ec37..0f5a26ff18 100644 --- a/resources/views/places-page.phtml +++ b/resources/views/places-page.phtml @@ -3,7 +3,7 @@ <div id="place-hierarchy"> <div class="container"> <h4><?= $title ?></h4> - <h5 class="center"> + <h5 class="text-center"> <?php if ($current) : ?> <a href="<?= e(route('place-hierarchy', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('World') ?> @@ -22,12 +22,12 @@ <?php endif ?> </h5> <?php if ($note) : ?> - <div class="center small text-muted"> + <div class="text-center small text-muted"> <?= I18N::translate("Places without valid co-ordinates are not shown on the map and have a red border around the sidebar entry") ?> </div> <?php endif ?> <?= $content ?> - <div class="center"> + <div class="text-center"> <?php if ($showeventslink) : ?> <a class="formField" href= <?= e(route('place-hierarchy', ['ged' => $tree->name(), 'parent' => $parent, 'action' => 'hierarchy-e'])) ?>> <?= I18N::translate('View table of events occurring in %s', $place) ?> |