diff options
Diffstat (limited to 'resources')
108 files changed, 275 insertions, 275 deletions
diff --git a/resources/views/admin/broadcast.phtml b/resources/views/admin/broadcast.phtml index 18fc808f5d..dddc705240 100644 --- a/resources/views/admin/broadcast.phtml +++ b/resources/views/admin/broadcast.phtml @@ -7,7 +7,7 @@ <form method="post" action="<?= e(route('broadcast')) ?>"> <?= csrf_field() ?> <input type="hidden" name="url" value="<?= e($url) ?>"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label" for="from"> diff --git a/resources/views/admin/control-panel-tree-list.phtml b/resources/views/admin/control-panel-tree-list.phtml index 393c2b30b4..0db1c932f8 100644 --- a/resources/views/admin/control-panel-tree-list.phtml +++ b/resources/views/admin/control-panel-tree-list.phtml @@ -3,20 +3,20 @@ <?php foreach ($all_trees as $tree) : ?> <tr class="<?= $changes[$tree->id()] ? 'danger' : '' ?>"> <th scope="row"> - <a href="<?= e(route('tree-page', ['ged' => $tree->getName()])) ?>"> - <?= e($tree->getName()) ?> + <a href="<?= e(route('tree-page', ['ged' => $tree->name()])) ?>"> + <?= e($tree->name()) ?> - <?= e($tree->getTitle()) ?> </a> </th> <td> - <a href="<?= e(route('admin-trees', ['ged' => $tree->getName()])) ?>" title="<?= I18N::translate('Preferences') ?>"> + <a href="<?= e(route('admin-trees', ['ged' => $tree->name()])) ?>" title="<?= I18N::translate('Preferences') ?>"> <?= view('icons/preferences') ?> </a> </td> <td class="text-right"> <?php if ($changes[$tree->id()]) : ?> - <a href="<?= e(route('show-pending', ['ged' => $tree->getName(), 'url' => route('admin-control-panel')])) ?>"> + <a href="<?= e(route('show-pending', ['ged' => $tree->name(), 'url' => route('admin-control-panel')])) ?>"> <?= I18N::number($changes[$tree->id()]) ?> <span class="sr-only"><?= I18N::translate('Pending changes') ?> <?= e($tree->getTitle()) ?></span> </a> @@ -26,7 +26,7 @@ </td> <td class="d-none d-sm-table-cell text-right"> <?php if ($individuals[$tree->id()]) : ?> - <a href="<?= e(route('individual-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('individual-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($individuals[$tree->id()]) ?> </a> <?php else : ?> @@ -35,7 +35,7 @@ </td> <td class="d-none d-lg-table-cell text-right"> <?php if ($families[$tree->id()]) : ?> - <a href="<?= e(route('family-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('family-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($families[$tree->id()]) ?> </a> <?php else : ?> @@ -44,7 +44,7 @@ </td> <td class="d-none d-sm-table-cell text-right"> <?php if ($sources[$tree->id()]) : ?> - <a href="<?= e(route('source-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('source-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($sources[$tree->id()]) ?> </a> <?php else : ?> @@ -53,7 +53,7 @@ </td> <td class="d-none d-lg-table-cell text-right"> <?php if ($repositories[$tree->id()]) : ?> - <a href="<?= e(route('repository-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('repository-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($repositories[$tree->id()]) ?> </a> <?php else : ?> @@ -62,7 +62,7 @@ </td> <td class="d-none d-sm-table-cell text-right"> <?php if ($media[$tree->id()]) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($media[$tree->id()]) ?> </a> <?php else : ?> @@ -71,7 +71,7 @@ </td> <td class="d-none d-lg-table-cell text-right"> <?php if ($notes[$tree->id()]) : ?> - <a href="<?= e(route('note-list', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('note-list', ['ged' => $tree->name()])) ?>"> <?= I18N::number($media[$tree->id()]) ?> </a> <?php else : ?> diff --git a/resources/views/admin/control-panel.phtml b/resources/views/admin/control-panel.phtml index 7240987756..255cf7de26 100644 --- a/resources/views/admin/control-panel.phtml +++ b/resources/views/admin/control-panel.phtml @@ -170,7 +170,7 @@ <ul class="fa-ul"> <li> <span class="fa-li"><?= view('icons/preferences') ?></span> - <a href="<?= e(route('admin-trees', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('Manage family trees') ?> </a> </li> @@ -226,13 +226,13 @@ <ul class="fa-ul"> <li> <span class="fa-li"><?= view('icons/preferences') ?></span> - <a href="<?= e(route('admin-users', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('admin-users', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('User administration') ?> </a> </li> <li> <span class="fa-li"><?= view('icons/preferences') ?></span> - <a href="<?= e(route('admin-users-create', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('admin-users-create', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('Add a user') ?> </a> </li> diff --git a/resources/views/admin/import-progress.phtml b/resources/views/admin/import-progress.phtml index 54f54b21d0..b594c87721 100644 --- a/resources/views/admin/import-progress.phtml +++ b/resources/views/admin/import-progress.phtml @@ -15,5 +15,5 @@ <script> $("#import<?= e($tree->id()) ?>") - .load("<?= route('import', ['ged' => $tree->getName()]) ?>", {}); + .load("<?= route('import', ['ged' => $tree->name()]) ?>", {}); </script> diff --git a/resources/views/admin/merge-records-step-1.phtml b/resources/views/admin/merge-records-step-1.phtml index 60adec8727..c029598270 100644 --- a/resources/views/admin/merge-records-step-1.phtml +++ b/resources/views/admin/merge-records-step-1.phtml @@ -8,7 +8,7 @@ <form> <input type="hidden" name="route" value="merge-records"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label" for="record-type"> <?= I18N::translate('Select two records to merge.') ?> diff --git a/resources/views/admin/merge-records-step-2.phtml b/resources/views/admin/merge-records-step-2.phtml index b456ef435b..8ec42b5d69 100644 --- a/resources/views/admin/merge-records-step-2.phtml +++ b/resources/views/admin/merge-records-step-2.phtml @@ -5,7 +5,7 @@ <h1><?= $title ?></h1> -<form action="<?= e(route('merge-records', ['ged' => $tree->getName(), 'xref1' => $record1->getXref(), 'xref2' => $record2->getXref()])) ?>" method="POST"> +<form action="<?= e(route('merge-records', ['ged' => $tree->name(), 'xref1' => $record1->getXref(), 'xref2' => $record2->getXref()])) ?>" method="POST"> <?= csrf_field() ?> <p> <?= I18N::translate('Select the facts and events to keep from both records.') ?> diff --git a/resources/views/admin/trees-duplicates.phtml b/resources/views/admin/trees-duplicates.phtml index 55723dc222..032ed38649 100644 --- a/resources/views/admin/trees-duplicates.phtml +++ b/resources/views/admin/trees-duplicates.phtml @@ -20,7 +20,7 @@ <?php endforeach ?> <?php if (count($duplicates) === 2) : ?> — - <a href="<?= e(route('merge-records', ['ged' => $tree->getName(), 'xref1' => $duplicates[0]->getXref(), 'xref2' => $duplicates[1]->getXref()])) ?>"> + <a href="<?= e(route('merge-records', ['ged' => $tree->name(), 'xref1' => $duplicates[0]->getXref(), 'xref2' => $duplicates[1]->getXref()])) ?>"> <?= I18N::translate('Merge') ?> </a> <?php endif ?> diff --git a/resources/views/admin/trees-export.phtml b/resources/views/admin/trees-export.phtml index fb7c822782..ce9c355143 100644 --- a/resources/views/admin/trees-export.phtml +++ b/resources/views/admin/trees-export.phtml @@ -23,7 +23,7 @@ <form class="form form-horizontal"> <input type="hidden" name="route" value="admin-trees-download"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <!-- DOWNLOAD OPTIONS --> <fieldset class="form-group"> diff --git a/resources/views/admin/trees-import.phtml b/resources/views/admin/trees-import.phtml index 4b3370b99e..4589405556 100644 --- a/resources/views/admin/trees-import.phtml +++ b/resources/views/admin/trees-import.phtml @@ -10,7 +10,7 @@ </div> <form class="form form-horizontal" method="post" enctype="multipart/form-data" onsubmit="return checkGedcomImportForm('<?= e(I18N::translate('You have selected a GEDCOM file with a different name. Is this correct?')) ?>');"> - <input type="hidden" name="ged" value="<?= $tree->getName() ?>"> + <input type="hidden" name="ged" value="<?= $tree->name() ?>"> <input type="hidden" id="gedcom_filename" value="<?= e($default_gedcom_file) ?>"> <?= csrf_field() ?> diff --git a/resources/views/admin/trees-merge.phtml b/resources/views/admin/trees-merge.phtml index 4ad15c3435..659642be84 100644 --- a/resources/views/admin/trees-merge.phtml +++ b/resources/views/admin/trees-merge.phtml @@ -1,7 +1,7 @@ <?php use Fisharebest\Webtrees\Bootstrap4; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->getName()]) => I18N::translate('Manage family trees '), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->name()]) => I18N::translate('Manage family trees '), $title]]) ?> <h1><?= $title ?></h1> diff --git a/resources/views/admin/trees-places.phtml b/resources/views/admin/trees-places.phtml index cc1d6a07e8..9871423f0e 100644 --- a/resources/views/admin/trees-places.phtml +++ b/resources/views/admin/trees-places.phtml @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->getName()]) => I18N::translate('Manage family trees '), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->name()]) => I18N::translate('Manage family trees '), $title]]) ?> <h1><?= $title ?></h1> @@ -10,7 +10,7 @@ <form> <input type="hidden" name="route" value="admin-trees-places"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <dl> <dt> @@ -49,7 +49,7 @@ <?php } ?> </ul> - <form method="post" action="<?= e(route('admin-trees-places', ['ged' => $tree->getName(), 'search' => $search, 'replace' => $replace])) ?>"> + <form method="post" action="<?= e(route('admin-trees-places', ['ged' => $tree->name(), 'search' => $search, 'replace' => $replace])) ?>"> <?= csrf_field() ?> <button class="btn btn-primary" type="submit" value="update" name="confirm"><?= /* I18N: A button label. */ I18N::translate('update') ?></button> diff --git a/resources/views/admin/trees-preferences.phtml b/resources/views/admin/trees-preferences.phtml index 29a8bd9603..1350413072 100644 --- a/resources/views/admin/trees-preferences.phtml +++ b/resources/views/admin/trees-preferences.phtml @@ -8,7 +8,7 @@ <form class="form-horizontal" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="action" value="general"> @@ -52,7 +52,7 @@ name="gedcom" required type="text" - value="<?= e($tree->getName()) ?>" + value="<?= e($tree->name()) ?>" > </div> <p class="small text-muted"> @@ -1135,7 +1135,7 @@ <?= view('icons/save') ?> <?= I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('admin-trees', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('admin-trees', ['ged' => $tree->name()])) ?>"> <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/admin/trees-privacy.phtml b/resources/views/admin/trees-privacy.phtml index 081a51bb89..7fc712cb28 100644 --- a/resources/views/admin/trees-privacy.phtml +++ b/resources/views/admin/trees-privacy.phtml @@ -10,7 +10,7 @@ <form method="POST"> <input type="hidden" name="route" value="tree-privacy"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= csrf_field() ?> <!-- REQUIRE_AUTHENTICATION --> @@ -272,7 +272,7 @@ <?= view('icons/save') ?> <?= I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="<?= route('admin-trees', ['ged' => $tree->getName()]) ?>"> + <a class="btn btn-secondary" href="<?= route('admin-trees', ['ged' => $tree->name()]) ?>"> <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/admin/trees-renumber.phtml b/resources/views/admin/trees-renumber.phtml index 8bacaac9bd..ee032ef37d 100644 --- a/resources/views/admin/trees-renumber.phtml +++ b/resources/views/admin/trees-renumber.phtml @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->getName()]) => I18N::translate('Manage family trees '), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->name()]) => I18N::translate('Manage family trees '), $title]]) ?> <h1><?= $title ?></h1> diff --git a/resources/views/admin/trees-unconnected.phtml b/resources/views/admin/trees-unconnected.phtml index f8d6a7557b..273f54ba85 100644 --- a/resources/views/admin/trees-unconnected.phtml +++ b/resources/views/admin/trees-unconnected.phtml @@ -1,13 +1,13 @@ <?php use Fisharebest\Webtrees\Bootstrap4; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->getName()]) => I18N::translate('Manage family trees '), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-trees', ['ged' => $tree->name()]) => I18N::translate('Manage family trees '), $title]]) ?> <h1><?= $title ?></h1> <form class="form-inline"> <input type="hidden" name="route" value="admin-trees-unconnected""> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= Bootstrap4::checkbox(I18N::translate('Include associates'), true, ['checked' => $associates, 'name' => 'associates']) ?> <button type="submit"> <?= I18N::translate('update') ?> diff --git a/resources/views/admin/trees.phtml b/resources/views/admin/trees.phtml index bc2643d551..0c172335d3 100644 --- a/resources/views/admin/trees.phtml +++ b/resources/views/admin/trees.phtml @@ -24,7 +24,7 @@ <h2 class="mb-0"> <?= view('icons/tree') ?> <a data-toggle="collapse" data-parent="#accordion" href="#card-tree-content-<?= $managed_tree->id() ?>" <?= $managed_tree == $tree || $managed_tree->getPreference('imported') === '0' ? 'aria-expanded="true"' : '' ?> aria-controls="card-tree-content-<?= $managed_tree->id() ?>"> - <?= e($managed_tree->getName()) ?> — <?= e($managed_tree->getTitle()) ?> + <?= e($managed_tree->name()) ?> — <?= e($managed_tree->getTitle()) ?> </a> </h2> </div> @@ -39,14 +39,14 @@ </div> <?php View::push('javascript'); ?> <script> - $("#import<?= $managed_tree->id() ?>").load("<?= route('import', ['ged' => $managed_tree->getName()]) ?>", {}); + $("#import<?= $managed_tree->id() ?>").load("<?= route('import', ['ged' => $managed_tree->name()]) ?>", {}); </script> <?php View::endpush() ?> <?php endif ?> <div class="row<?= $importing ? ' d-none' : '' ?>" id="actions<?= $managed_tree->id() ?>"> <div class="col-sm-6 col-md-3"> <h3> - <a href="<?= e(route('tree-page', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('tree-page', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Family tree') ?> </a> </h3> @@ -54,7 +54,7 @@ <!-- PREFERENCES --> <li> <span class="fa-li"><?= view('icons/preferences') ?></span> - <a href="<?= e(route('admin-trees-preferences', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-preferences', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Preferences') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -64,7 +64,7 @@ <!-- PRIVACY --> <li> <span class="fa-li"><?= view('icons/lock') ?></span> - <a href="<?= e(route('tree-privacy', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('tree-privacy', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Privacy') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -74,7 +74,7 @@ <!-- HOME PAGE BLOCKS--> <li> <span class="fa-li"><?= view('icons/block') ?></span> - <a href="<?= e(route('tree-page-edit', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('tree-page-edit', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Change the “Home page” blocks') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -90,7 +90,7 @@ <?= e($managed_tree->getTitle()) ?> </span> </a> - <form name="delete_form<?= $managed_tree->id() ?>" method="post" action="<?= route('admin-trees-delete', ['ged' => $managed_tree->getName()]) ?>"> + <form name="delete_form<?= $managed_tree->id() ?>" method="post" action="<?= route('admin-trees-delete', ['ged' => $managed_tree->name()]) ?>"> <?= csrf_field() ?> <!-- A11Y - forms need submit buttons, but they look ugly here --> <button class="sr-only" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($managed_tree->getTitle())) ?>" onclick="return confirm(this.dataset.confirm)" type="submit"> @@ -102,14 +102,14 @@ <?php if (count($all_trees) > 1) : ?> <li> <span class="fa-li"><?= view('icons/favorite') ?></span> - <?php if ($managed_tree->getName() === Site::getPreference('DEFAULT_GEDCOM')) : ?> + <?php if ($managed_tree->name() === Site::getPreference('DEFAULT_GEDCOM')) : ?> <?= I18N::translate('Default family tree') ?> <?php else : ?> <a href="#" onclick="document.defaultform<?= $managed_tree->id() ?>.submit();"> <?= I18N::translate('Set as default') ?> <span class="sr-only"><?= e($managed_tree->getTitle()) ?></span> </a> - <form name="defaultform<?= $managed_tree->id() ?>" method="post" action="<?= route('admin-trees-default', ['ged' => $managed_tree->getName()]) ?>"> + <form name="defaultform<?= $managed_tree->id() ?>" method="post" action="<?= route('admin-trees-default', ['ged' => $managed_tree->name()]) ?>"> <?= csrf_field() ?> <!-- A11Y - forms need submit buttons, but they look ugly here --> <button class="sr-only" type="submit"> @@ -129,7 +129,7 @@ <!-- FIND DUPLICATES --> <li> <span class="fa-li"><?= view('icons/copy') ?></span> - <a href="<?= e(route('admin-trees-duplicates', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-duplicates', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Find duplicates') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -139,7 +139,7 @@ <!-- MERGE --> <li> <span class="fa-li"><?= view('icons/merge') ?></span> - <a href="<?= e(route('merge-records', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('merge-records', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Merge records') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -149,7 +149,7 @@ <!-- UPDATE PLACE NAMES --> <li> <span class="fa-li"><?= view('icons/location') ?></span> - <a href="<?= e(route('admin-trees-places', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-places', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Update place names') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -159,7 +159,7 @@ <!-- CHECK FOR ERRORS --> <li> <span class="fa-li"><?= view('icons/warning') ?></span> - <a href="<?= e(route('admin-trees-check', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-check', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Check for errors') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -169,7 +169,7 @@ <!-- UNCONNECTED INDIVIDUALS --> <li> <span class="fa-li"><?= view('icons/unlink') ?></span> - <a href="<?= e(route('admin-trees-unconnected', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-unconnected', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Find unrelated individuals') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -179,7 +179,7 @@ <!-- RENUMBER --> <li> <span class="fa-li"><?= view('icons/sort') ?></span> - <a href="<?= e(route('admin-trees-renumber', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-renumber', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Renumber') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -189,7 +189,7 @@ <!-- CHANGES --> <li> <span class="fa-li"><?= view('icons/edit') ?></span> - <a href="<?= route('admin-changes-log', ['ged' => $managed_tree->getName()]) ?>"> + <a href="<?= route('admin-changes-log', ['ged' => $managed_tree->name()]) ?>"> <?= I18N::translate('Changes log') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -207,7 +207,7 @@ <!-- UNLINKED INDIVIDUAL --> <li> <span class="fa-li"><?= view('icons/individual') ?></span> - <a href="<?= e(route('add-unlinked-individual', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('add-unlinked-individual', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Individual') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -217,7 +217,7 @@ <!-- UNLINKED SOURCE --> <li> <span class="fa-li"><?= view('icons/source') ?></span> - <a href="#" data-href="<?= e(route('create-source', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-source', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Source') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -227,7 +227,7 @@ <!-- UNLINKED REPOSITORY --> <li> <span class="fa-li"><?= view('icons/repository') ?></span> - <a href="#" data-href="<?= e(route('create-repository', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-repository', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Repository') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -237,7 +237,7 @@ <!-- UNLINKED MEDIA OBJECT --> <li> <span class="fa-li"><?= view('icons/media') ?></span> - <a href="#" data-href="<?= e(route('create-media-object', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-media-object', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Media object') ?> <span class="sr-only"> @@ -248,7 +248,7 @@ <!-- UNLINKED NOTE --> <li> <span class="fa-li"><?= view('icons/note') ?></span> - <a href="#" data-href="<?= e(route('create-note-object', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-note-object', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> </span> @@ -258,7 +258,7 @@ <!-- UNLINKED SUBMITTER --> <li> <span class="fa-li"><?= view('icons/submitter') ?></span> - <a href="#" data-href="<?= e(route('create-submitter', ['ged' => $managed_tree->getName()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('create-submitter', ['ged' => $managed_tree->name()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> </span> @@ -275,7 +275,7 @@ <!-- DOWNLOAD/Export --> <li> <span class="fa-li"><?= view('icons/download') ?></span> - <a href="<?= e(route('admin-trees-export', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-export', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Export') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -285,7 +285,7 @@ <!-- UPLOAD/IMPORT --> <li> <span class="fa-li"><?= view('icons/upload') ?></span> - <a href="<?= e(route('admin-trees-import', ['ged' => $managed_tree->getName()])) ?>"> + <a href="<?= e(route('admin-trees-import', ['ged' => $managed_tree->name()])) ?>"> <?= I18N::translate('Import') ?> <span class="sr-only"> <?= e($managed_tree->getTitle()) ?> @@ -418,7 +418,7 @@ <p> <?= I18N::translate('Create, update, and delete a family tree for every GEDCOM file in the data folder.') ?> </p> - <form method="post" class="form form-horizontal" action="<?= e(route('admin-trees-sync', ['ged' => $tree->getName()])) ?>"> + <form method="post" class="form form-horizontal" action="<?= e(route('admin-trees-sync', ['ged' => $tree->name()])) ?>"> <?= csrf_field() ?> <button type="submit" class="btn btn-danger"> <?= view('icons/save') ?> diff --git a/resources/views/admin/webtrees1-thumbnails-form.phtml b/resources/views/admin/webtrees1-thumbnails-form.phtml index 184c614005..2c87579cf7 100644 --- a/resources/views/admin/webtrees1-thumbnails-form.phtml +++ b/resources/views/admin/webtrees1-thumbnails-form.phtml @@ -3,7 +3,7 @@ <form action="<?= e(route('admin-webtrees1-thumbs-action')) ?>" method="POST"> <input type="hidden" name="thumbnail" value="<?= e($thumbnail) ?>"> <?php foreach ($media as $medium) : ?> - <input type="hidden" name="ged[]" value="<?= e($medium->getTree()->getName()) ?>"> + <input type="hidden" name="ged[]" value="<?= e($medium->getTree()->name()) ?>"> <input type="hidden" name="xref[]" value="<?= e($medium->getXref()) ?>"> <?php endforeach ?> <div class="btn-group"> diff --git a/resources/views/ancestors-page.phtml b/resources/views/ancestors-page.phtml index 35e8a0ebaa..6e902188a5 100644 --- a/resources/views/ancestors-page.phtml +++ b/resources/views/ancestors-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-ancestors-chart d-print-none"> <input type="hidden" name="route" value="ancestors"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -48,4 +48,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-ancestors-chart" data-ajax-url="<?= e(route('ancestors-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'generations' => $generations, 'chart_style' => $chart_style, 'show_cousins' => $show_cousins])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-ancestors-chart" data-ajax-url="<?= e(route('ancestors-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => $chart_style, 'show_cousins' => $show_cousins])) ?>"></div> diff --git a/resources/views/branches-page.phtml b/resources/views/branches-page.phtml index d8ba95276c..da0f6e5c83 100644 --- a/resources/views/branches-page.phtml +++ b/resources/views/branches-page.phtml @@ -7,7 +7,7 @@ <form class="wt-page-options wt-page-options-branches d-print-none"> <input type="hidden" name="route" value="branches"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-form-label col-sm-3 wt-page-options-label" for="surname"> @@ -42,5 +42,5 @@ </form> <?php if ($surname !== '') : ?> - <div class="wt-ajax-load wt-page-content wt-chart wt-branches" data-ajax-url="<?= e(route('branches-list', ['surname' => $surname, 'soundex_std' => $soundex_std, 'soundex_dm' => $soundex_dm, 'ged' => $tree->getName()])) ?>"></div> + <div class="wt-ajax-load wt-page-content wt-chart wt-branches" data-ajax-url="<?= e(route('branches-list', ['surname' => $surname, 'soundex_std' => $soundex_std, 'soundex_dm' => $soundex_dm, 'ged' => $tree->name()])) ?>"></div> <?php endif ?> diff --git a/resources/views/calendar-page.phtml b/resources/views/calendar-page.phtml index fbecea6294..304079b680 100644 --- a/resources/views/calendar-page.phtml +++ b/resources/views/calendar-page.phtml @@ -26,12 +26,12 @@ </th> <td class="wt-page-options-value" colspan="3"> <?php for ($d = 1; $d <= $days_in_month; $d++) : ?> - <a <?= $d === $cal_date->day() ? 'class="error"' : '' ?> href="<?= e(route('calendar', ['cal' => $cal, 'day' => $d, 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a <?= $d === $cal_date->day() ? 'class="error"' : '' ?> href="<?= e(route('calendar', ['cal' => $cal, 'day' => $d, 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= (new Date($cal_date->format("%@ {$d} %O %E")))->minimumDate()->format('%j') ?> </a> | <?php endfor ?> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $today->day(), 'month' => $today_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $today->day(), 'month' => $today_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->name()])) ?>" rel="nofollow"> <b><?php $tmp = new Date($today->format('%@ %A %O %E')); echo $tmp->display() ?></b> </a> </td> @@ -42,7 +42,7 @@ </th> <td class="wt-page-options-value" colspan="3"> <?php foreach ($months as $m => $month_name) : ?> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $m, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $m, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?php if ($m === $cal_month) : ?> <span class="error"><?= e($month_name) ?></span> <?php else : ?> @@ -50,7 +50,7 @@ <?php endif ?> </a> | <?php endforeach ?> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => min($cal_date->day(), $today->daysInMonth()), 'month' => $today_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => min($cal_date->day(), $today->daysInMonth()), 'month' => $today_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->name()])) ?>" rel="nofollow"> <b><?= $today->format('%F %Y') ?></b> </a> </td> @@ -60,15 +60,15 @@ <label for="year"><?= I18N::translate('Year') ?></label> </th> <td class="wt-page-options-value"> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year() === 1 ? -1 : $cal_date->year() - 1, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year() === 1 ? -1 : $cal_date->year() - 1, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> -1 </a> <input type="text" id="year" name="year" value="<?= $year ?>" size="4"> - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year() === -1 ? 1 : $cal_date->year() + 1, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year() === -1 ? 1 : $cal_date->year() + 1, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> +1 </a> | - <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $today->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= $today->format('%Y') ?> </a> <?= FunctionsPrint::helpLink('annivers_year_select') ?> @@ -93,16 +93,16 @@ </select> <?php endif ?> - <a title="<?= I18N::translate('All individuals') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => '', 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a title="<?= I18N::translate('All individuals') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => '', 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> <i class="<?= $filtersx === '' ? 'icon-sex_m_15x15' : 'icon-sex_m_9x9' ?>"></i> <i class="<?= $filtersx === '' ? 'icon-sex_f_15x15' : 'icon-sex_f_9x9' ?>"></i> </a> | - <a title="<?= I18N::translate('Males') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => 'M', 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a title="<?= I18N::translate('Males') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => 'M', 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> <i class="<?= $filtersx === 'M' ? 'icon-sex_m_15x15' : 'icon-sex_m_9x9' ?>"></i> </a> | - <a title="<?= I18N::translate('Females') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => 'F', 'view' => $view, 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a title="<?= I18N::translate('Females') ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => 'F', 'view' => $view, 'ged' => $tree->name()])) ?>" rel="nofollow"> <i class="<?= $filtersx === 'F' ? 'icon-sex_f_15x15' : 'icon-sex_f_9x9' ?>"></i> </a> @@ -145,15 +145,15 @@ <table class="w-100"> <tr> <td class="topbottombar"> - <a class="<?= $view === 'day' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a class="<?= $view === 'day' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'day', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= I18N::translate('View this day') ?> </a> | - <a class="<?= $view === 'month' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a class="<?= $view === 'month' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= I18N::translate('View this month') ?> </a> | - <a class="<?= $view === 'year' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'year', 'ged' => $tree->getName()])) ?>" rel="nofollow"> + <a class="<?= $view === 'year' ? 'error' : '' ?>" href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $cal_month, 'year' => $cal_date->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'year', 'ged' => $tree->name()])) ?>" rel="nofollow"> <?= I18N::translate('View this year') ?> </a> </td> @@ -166,7 +166,7 @@ if ($n++) { echo ' | '; } - echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->day(), 'month' => $tmp->format('%O'), 'year' => $tmp->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->getName()])) . '" rel="nofollow">', $cal_name, '</a>'; + echo '<a ' . (get_class($tmp) === get_class($cal_date) ? 'class="error"' : '') . 'href="' . e(route('calendar', ['cal' => $tmp->format('%@'), 'day' => $tmp->day(), 'month' => $tmp->format('%O'), 'year' => $tmp->year(), 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => $view, 'ged' => $tree->name()])) . '" rel="nofollow">', $cal_name, '</a>'; } } ?> </td> @@ -174,6 +174,6 @@ </table> </form> -<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->getName(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx])) ?>"></div> +<div class="wt-ajax-load wt-page-content" data-ajax-url="<?= e(route('calendar-events', ['ged' => $tree->name(), 'cal' => $cal, 'day' => $day, 'month' => $month, 'year' => $year, 'view' => $view, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx])) ?>"></div> <?= view('modals/ajax') ?> diff --git a/resources/views/compact-tree-arrow.phtml b/resources/views/compact-tree-arrow.phtml index 6f6b14cd36..00ab56b5dd 100644 --- a/resources/views/compact-tree-arrow.phtml +++ b/resources/views/compact-tree-arrow.phtml @@ -4,5 +4,5 @@ <?php if ($individual === null) : ?> <?= FontAwesome::decorativeIcon($class) ?> <?php else : ?> - <?= FontAwesome::linkIcon($class, I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName()])]) ?> + <?= FontAwesome::linkIcon($class, I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name()])]) ?> <?php endif; diff --git a/resources/views/compact-tree-page.phtml b/resources/views/compact-tree-page.phtml index 1662639fd9..aac7831be9 100644 --- a/resources/views/compact-tree-page.phtml +++ b/resources/views/compact-tree-page.phtml @@ -7,7 +7,7 @@ <form class="wt-page-options wt-page-options-compact-chart d-print-none"> <input type="hidden" name="route" value="compact-tree"> - <input type="hidden" name="ged" value="<?= e($individual->getTree()->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($individual->getTree()->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -26,4 +26,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-compact-chart" data-ajax-url="<?= e(route('compact-tree-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName()])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-compact-chart" data-ajax-url="<?= e(route('compact-tree-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name()])) ?>"></div> diff --git a/resources/views/contact-page.phtml b/resources/views/contact-page.phtml index e0d3ce9dc1..9de42e80f6 100644 --- a/resources/views/contact-page.phtml +++ b/resources/views/contact-page.phtml @@ -4,7 +4,7 @@ <form method="post" action="<?= e(route('contact')) ?>"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="url" value="<?= e($url) ?>"> <div class="form-group row"> diff --git a/resources/views/descendants-page.phtml b/resources/views/descendants-page.phtml index 475639592c..162c28f8d3 100644 --- a/resources/views/descendants-page.phtml +++ b/resources/views/descendants-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-descendants-chart d-print-none"> <input type="hidden" name="route" value="descendants"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -48,4 +48,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-descendants-chart" data-ajax-url="<?= e(route('descendants-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'generations' => $generations, 'chart_style' => $chart_style])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-descendants-chart" data-ajax-url="<?= e(route('descendants-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => $chart_style])) ?>"></div> diff --git a/resources/views/edit-account-page.phtml b/resources/views/edit-account-page.phtml index f4b807db06..0873e02f8e 100644 --- a/resources/views/edit-account-page.phtml +++ b/resources/views/edit-account-page.phtml @@ -24,7 +24,7 @@ <form class="wt-page-options wt-page-options-my-account" method="post" onsubmit="return checkform(this);"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="user-name"> @@ -190,7 +190,7 @@ </form> <?php if ($show_delete_option) : ?> - <form action="<?= e(route('delete-account', ['ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('delete-account', ['ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <div class="row form-group"> <div class="col-sm-3 wt-page-options-label"></div> diff --git a/resources/views/edit/add-fact.phtml b/resources/views/edit/add-fact.phtml index aa4a6952e3..5e7d41c67d 100644 --- a/resources/views/edit/add-fact.phtml +++ b/resources/views/edit/add-fact.phtml @@ -9,7 +9,7 @@ <h2 class="wt-page-title"><?= $title ?></h2> -<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->getName(), 'xref' => $record->getXref()])) ?>" method="post"> +<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->name(), 'xref' => $record->getXref()])) ?>" method="post"> <?= csrf_field() ?> <?php FunctionsEdit::createAddForm($tree, $fact) ?> diff --git a/resources/views/edit/change-family-members.phtml b/resources/views/edit/change-family-members.phtml index 687862239e..ec140cad2e 100644 --- a/resources/views/edit/change-family-members.phtml +++ b/resources/views/edit/change-family-members.phtml @@ -7,7 +7,7 @@ <form class="wt-page-content" name="changefamform" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($family->getXref()) ?>"> <div class="form-group row"> diff --git a/resources/views/edit/edit-fact.phtml b/resources/views/edit/edit-fact.phtml index 7e858c7083..c8ac5a1c0b 100644 --- a/resources/views/edit/edit-fact.phtml +++ b/resources/views/edit/edit-fact.phtml @@ -9,7 +9,7 @@ <h2 class="wt-page-title"><?= $title ?></h2> -<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->getName(), 'xref' => $record->getXref(), 'fact_id' => $edit_fact->id()])) ?>" method="post"> <?= csrf_field() ?> +<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->name(), 'xref' => $record->getXref(), 'fact_id' => $edit_fact->id()])) ?>" method="post"> <?= csrf_field() ?> <?php FunctionsEdit::createEditForm($edit_fact) ?> @@ -112,7 +112,7 @@ I18N::translate('cancel') ?> </a> <?php if ($can_edit_raw) : ?> - <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $record->getXref(), 'fact_id' => $edit_fact->id(), 'ged' => $tree->getName()])) ?>"> + <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $record->getXref(), 'fact_id' => $edit_fact->id(), 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif; ?> diff --git a/resources/views/edit/new-individual.phtml b/resources/views/edit/new-individual.phtml index a764421f30..b47dadc331 100644 --- a/resources/views/edit/new-individual.phtml +++ b/resources/views/edit/new-individual.phtml @@ -128,7 +128,7 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR <h2 class="wt-page-title"><?= $title ?></h2> <form method="post" onsubmit="return checkform();"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="action" value="<?= e($nextaction) ?>"> <input type="hidden" name="fact_id" value="<?= e($name_fact_id) ?>"> <input type="hidden" name="xref" value="<?= e($xref) ?>"> @@ -333,7 +333,7 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR </a> <?php if ($name_fact instanceof Fact && (Auth::isAdmin() || $tree->getPreference('SHOW_GEDCOM_RECORD'))) : ?> - <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $xref, 'fact_id' => $name_fact->id(), 'ged' => $tree->getName()])) ?>"> + <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $xref, 'fact_id' => $name_fact->id(), 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/edit/raw-gedcom-fact.phtml b/resources/views/edit/raw-gedcom-fact.phtml index 839a24e847..cab24087dc 100644 --- a/resources/views/edit/raw-gedcom-fact.phtml +++ b/resources/views/edit/raw-gedcom-fact.phtml @@ -5,7 +5,7 @@ <form class="wt-page-content" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($fact->record()->getTree()->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($fact->record()->getTree()->name()) ?>"> <input type="hidden" name="xref" value="<?= e($fact->record()->getXref()) ?>"> <input type="hidden" name="fact_id" value="<?= e($fact->getFactId()) ?>"> diff --git a/resources/views/edit/raw-gedcom-record.phtml b/resources/views/edit/raw-gedcom-record.phtml index d107f85917..eb658d92a3 100644 --- a/resources/views/edit/raw-gedcom-record.phtml +++ b/resources/views/edit/raw-gedcom-record.phtml @@ -6,7 +6,7 @@ <form class="wt-page-content" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($record->getXref()) ?>"> <p class="text-muted small"> diff --git a/resources/views/emails/pending-changes-html.phtml b/resources/views/emails/pending-changes-html.phtml index 3270465529..bc48127416 100644 --- a/resources/views/emails/pending-changes-html.phtml +++ b/resources/views/emails/pending-changes-html.phtml @@ -9,7 +9,7 @@ <ul> <li> - <a href="<?= e(route('show-pending', ['ged' => $tree->getName()], true)) ?>"> + <a href="<?= e(route('show-pending', ['ged' => $tree->name()], true)) ?>"> <?= e($tree->getTitle()) ?> </a> </li> diff --git a/resources/views/emails/pending-changes-text.phtml b/resources/views/emails/pending-changes-text.phtml index 3d448e283b..8d51a28c4d 100644 --- a/resources/views/emails/pending-changes-text.phtml +++ b/resources/views/emails/pending-changes-text.phtml @@ -4,4 +4,4 @@ <?= I18N::translate('There are pending changes for you to moderate.') ?> -<?= $tree->getTitle() ?> - <?= route('show-pending', ['ged' => $tree->getName()], true) ?> +<?= $tree->getTitle() ?> - <?= route('show-pending', ['ged' => $tree->name()], true) ?> diff --git a/resources/views/emails/register-user-html.phtml b/resources/views/emails/register-user-html.phtml index cdc184914e..5ded2c974f 100644 --- a/resources/views/emails/register-user-html.phtml +++ b/resources/views/emails/register-user-html.phtml @@ -12,8 +12,8 @@ </p> <p> - <a href="<?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->getName()], true)) ?>"> - <?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->getName()], true)) ?> + <a href="<?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>"> + <?= e(route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?> </a> </p> diff --git a/resources/views/emails/register-user-text.phtml b/resources/views/emails/register-user-text.phtml index f1ddd92efb..3018919818 100644 --- a/resources/views/emails/register-user-text.phtml +++ b/resources/views/emails/register-user-text.phtml @@ -5,6 +5,6 @@ <?= I18N::translate('Follow this link to verify your email address.') ?> -<?= route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->getName()], true) ?> +<?= route('verify', ['username' => $user->getUserName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true) ?> <?= I18N::translate('If you didn’t request an account, you can just delete this message.'); diff --git a/resources/views/family-book-page.phtml b/resources/views/family-book-page.phtml index bbfbb68ee5..39053b9c8c 100644 --- a/resources/views/family-book-page.phtml +++ b/resources/views/family-book-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-family-book-chart d-print-none"> <input type="hidden" name="route" value="family-book"> - <input type="hidden" name="ged" value="<?= e($individual->getTree()->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($individual->getTree()->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -56,4 +56,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-family-book-chart" data-ajax-url="<?= e(route('family-book-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'book_size' => $book_size, 'generations' => $generations, 'show_spouse' => (int) $show_spouse])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-family-book-chart" data-ajax-url="<?= e(route('family-book-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'book_size' => $book_size, 'generations' => $generations, 'show_spouse' => (int) $show_spouse])) ?>"></div> diff --git a/resources/views/family-page-menu.phtml b/resources/views/family-page-menu.phtml index d09cffcec2..e71f6c3606 100644 --- a/resources/views/family-page-menu.phtml +++ b/resources/views/family-page-menu.phtml @@ -8,30 +8,30 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-fam-change" href="<?= e(route('change-family-members', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-change" href="<?= e(route('change-family-members', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Change family members') ?> </a> - <a class="dropdown-item menu-fam-addchil" href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-addchil" href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Add a child to this family') ?> </a> <?php if ($record->getNumberOfChildren() > 1) : ?> - <a class="dropdown-item menu-fam-orderchil" href="<?= e(route('reorder-children', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-orderchil" href="<?= e(route('reorder-children', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Re-order children') ?> </a> <?php endif ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-fam-del" href="#" data-confirm="<?= I18N::translate('Deleting the family will unlink all of the individuals from each other but will leave the individuals in place. Are you sure you want to delete this family?') ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-fam-del" href="#" data-confirm="<?= I18N::translate('Deleting the family will unlink all of the individuals from each other but will leave the individuals in place. Are you sure you want to delete this family?') ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-fam-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml index d7a5d91298..9cac6c292e 100644 --- a/resources/views/family-page.phtml +++ b/resources/views/family-page.phtml @@ -7,13 +7,13 @@ <?php if ($record->isPendingDeletion()) : ?> <?php if (Auth::isModerator($record->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($record->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($record->isPendingAddition()) : ?> <?php if (Auth::isModerator($record->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This family has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($record->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> @@ -45,13 +45,13 @@ <?php FunctionsCharts::printFamilyParents($record) ?> <?php if (Auth::isEditor($record->getTree())) : ?> <?php if ($record->getHusband() === null) : ?> - <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'famtag' => 'HUSB'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->name(), 'xref' => $record->getXref(), 'famtag' => 'HUSB'])) ?>"> <?= I18N::translate('Add a father') ?> </a> <br> <?php endif ?> <?php if ($record->getWife() === null) : ?> - <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'famtag' => 'WIFE'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->name(), 'xref' => $record->getXref(), 'famtag' => 'WIFE'])) ?>"> <?= I18N::translate('Add a mother') ?> </a> <br> @@ -84,7 +84,7 @@ <?= I18N::translate('Note') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'fact' => 'NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref(), 'fact' => 'NOTE'])) ?>"> <?= I18N::translate('Add a note') ?> </a> </td> @@ -95,7 +95,7 @@ <?= I18N::translate('Shared note') ?> </th> <td class="optionbox"> - <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> <?= I18N::translate('Add a shared note') ?> </a> </td> @@ -107,7 +107,7 @@ <?= I18N::translate('Media object') ?> </th> <td class="optionbox"> - <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'fact' => 'OBJE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref(), 'fact' => 'OBJE'])) ?>"> <?= I18N::translate('Add a media object') ?> </a> </td> @@ -119,7 +119,7 @@ <?= I18N::translate('Source') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref(), 'fact' => 'SOUR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref(), 'fact' => 'SOUR'])) ?>"> <?= I18N::translate('Add a source citation') ?> </a> </td> diff --git a/resources/views/fan-page.phtml b/resources/views/fan-page.phtml index 92cc09650a..0dc2f482cb 100644 --- a/resources/views/fan-page.phtml +++ b/resources/views/fan-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-fan-chart d-print-none"> <input type="hidden" name="route" value="fan"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -61,4 +61,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-fan-chart" data-ajax-url="<?= e(route('fan-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'generations' => $generations, 'chart_style' => $chart_style, 'fan_width' => $fan_width])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-fan-chart" data-ajax-url="<?= e(route('fan-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => $chart_style, 'fan_width' => $fan_width])) ?>"></div> diff --git a/resources/views/forgot-password-page.phtml b/resources/views/forgot-password-page.phtml index 52bc200191..7802408854 100644 --- a/resources/views/forgot-password-page.phtml +++ b/resources/views/forgot-password-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-forgot-password" method="post"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label wt-page-options-label" for="identifier"> diff --git a/resources/views/gedcom-record-page-menu.phtml b/resources/views/gedcom-record-page-menu.phtml index a5e3d6715d..3ac9a1385a 100644 --- a/resources/views/gedcom-record-page-menu.phtml +++ b/resources/views/gedcom-record-page-menu.phtml @@ -8,14 +8,14 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/gedcom-record-page.phtml b/resources/views/gedcom-record-page.phtml index 205c379d74..a4ccbe7f72 100644 --- a/resources/views/gedcom-record-page.phtml +++ b/resources/views/gedcom-record-page.phtml @@ -6,13 +6,13 @@ <?php if ($record->isPendingDeletion()) : ?> <?php if (Auth::isModerator($record->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This record has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This record has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($record->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This record has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($record->isPendingAddition()) : ?> <?php if (Auth::isModerator($record->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This record has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This record has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($record->getXref()) . '\', \'' . e($record->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($record->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This record has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> diff --git a/resources/views/hourglass-page.phtml b/resources/views/hourglass-page.phtml index c4bb15fea4..cf6f8111ca 100644 --- a/resources/views/hourglass-page.phtml +++ b/resources/views/hourglass-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-hourglass-chart d-print-none"> <input type="hidden" name="route" value="hourglass"> - <input type="hidden" name="ged" value="<?= e($individual->getTree()->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($individual->getTree()->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -47,4 +47,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-hourglass-chart" data-ajax-url="<?= e(route('hourglass-chart', ['xref' => $individual->getXref(), 'generations' => $generations, 'show_spouse' => $show_spouse, 'ged' => $individual->getTree()->getName()])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-hourglass-chart" data-ajax-url="<?= e(route('hourglass-chart', ['xref' => $individual->getXref(), 'generations' => $generations, 'show_spouse' => $show_spouse, 'ged' => $individual->getTree()->name()])) ?>"></div> diff --git a/resources/views/individual-page-menu.phtml b/resources/views/individual-page-menu.phtml index 500e39cbd0..6c5ed3e8fa 100644 --- a/resources/views/individual-page-menu.phtml +++ b/resources/views/individual-page-menu.phtml @@ -9,37 +9,37 @@ </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> <?php if ($count_sex === 0) : ?> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Edit the gender') ?> </a> <?php endif ?> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-name', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-name', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Add a name') ?> </a> <?php if ($count_names > 1) : ?> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('reorder-names', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('reorder-names', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Re-order names') ?> </a> <?php endif ?> <?php if (empty($individual->getFacts('SEX'))) : ?> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Edit the gender') ?> </a> <?php endif ?> - <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($individual->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($individual->getXref()) ?>', '<?= e($individual->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($individual->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($individual->getXref()) ?>', '<?= e($individual->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $individual->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml index 5cc7f264ba..8fb15ee971 100644 --- a/resources/views/individual-page.phtml +++ b/resources/views/individual-page.phtml @@ -7,7 +7,7 @@ <?php if (Auth::isModerator($individual->getTree())) : ?> <?= view('components/alert-warning-dismissible', [ 'alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ - I18N::translate('This individual has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes'), + I18N::translate('This individual has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes'), ]) ?> <?php elseif (Auth::isEditor($individual->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This individual has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> @@ -16,7 +16,7 @@ <?php if (Auth::isModerator($individual->getTree())) : ?> <?= view('components/alert-warning-dismissible', [ 'alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ - I18N::translate('This individual has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes'), + I18N::translate('This individual has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($individual->getXref()) . '\', \'' . e($individual->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes'), ]) ?> <?php elseif (Auth::isEditor($individual->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This individual has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> @@ -65,7 +65,7 @@ <?php if (Auth::isEditor($individual->getTree())) : ?> <?php if (count($individual->getFacts('OBJE')) > 1) : ?> <div> - <a href="<?= e(route('reorder-media', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('reorder-media', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Re-order media') ?> </a> </div> @@ -73,7 +73,7 @@ <?php if ($individual->getTree()->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($individual->getTree())) : ?> <div> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'OBJE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'fact' => 'OBJE'])) ?>"> <?= I18N::translate('Add a media object') ?> </a> </div> @@ -97,7 +97,7 @@ <ul class="nav nav-tabs flex-wrap"> <?php foreach ($tabs as $tab) : ?> <li class="nav-item"> - <a class="nav-link<?= $tab->isGrayedOut($individual) ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" data-href="<?= e(route('individual-tab', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'module' => $tab->getName()])) ?>" href="#<?= $tab->getName() ?>"> + <a class="nav-link<?= $tab->isGrayedOut($individual) ? ' text-muted' : '' ?>" data-toggle="tab" role="tab" data-href="<?= e(route('individual-tab', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'module' => $tab->getName()])) ?>" href="#<?= $tab->getName() ?>"> <?= $tab->getTitle() ?> </a> </li> diff --git a/resources/views/interactive-tree-page.phtml b/resources/views/interactive-tree-page.phtml index 496caa9f71..12b58fbf47 100644 --- a/resources/views/interactive-tree-page.phtml +++ b/resources/views/interactive-tree-page.phtml @@ -10,7 +10,7 @@ <input type="hidden" name="route" value="module"> <input type="hidden" name="module" value="tree"> <input type="hidden" name="action" value="Treeview"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> diff --git a/resources/views/layouts/default.phtml b/resources/views/layouts/default.phtml index ce125d36e9..3e6faf2d9a 100644 --- a/resources/views/layouts/default.phtml +++ b/resources/views/layouts/default.phtml @@ -62,7 +62,7 @@ <div class="col wt-header-search"> <form class="wt-header-search-form" role="search"> <input type="hidden" name="route" value="search-quick"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="input-group"> <label class="sr-only" for="quick-search"><?= I18N::translate('Search') ?></label> <input type="search" class="form-control wt-header-search-field" id="quick-search" name="query" size="15" placeholder="<?= I18N::translate('Search') ?>"> diff --git a/resources/views/lifespans-page.phtml b/resources/views/lifespans-page.phtml index 079a3221e5..b633e97da6 100644 --- a/resources/views/lifespans-page.phtml +++ b/resources/views/lifespans-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-lifespans-chart d-print-none"> <input type="hidden" name="route" value="lifespans"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?php foreach ($xrefs as $xref) : ?> <input name="xrefs[]" type="hidden" value="<?= e($xref) ?>"> @@ -67,7 +67,7 @@ <button type="submit" class="btn btn-primary" type="submit"> <?= /* I18N: A button label. */ I18N::translate('add') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('lifespans', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('lifespans', ['ged' => $tree->name()])) ?>"> <?= /* I18N: A button label. */ I18N::translate('reset') ?> </a> </div> @@ -75,4 +75,4 @@ </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-timeline-chart" data-ajax-url="<?= e(route('lifespans-chart', ['ged' => $tree->getName(), 'xrefs' => $xrefs, 'subtitle' => $subtitle])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-timeline-chart" data-ajax-url="<?= e(route('lifespans-chart', ['ged' => $tree->name(), 'xrefs' => $xrefs, 'subtitle' => $subtitle])) ?>"></div> diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml index 6e545aa3ad..8fd74ee734 100644 --- a/resources/views/lists/individuals-table.phtml +++ b/resources/views/lists/individuals-table.phtml @@ -256,7 +256,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <td class="center" data-sort="<?= $key ?>"> <?php if ($sosa) : ?> - <a href="<?= e(route('relationships', ['xref1' => $individuals[1]->getXref(), 'xref2' => $individual->getXref(), 'ged' => $individual->getTree()->getName()])) ?>" title="<?= I18N::translate('Relationships') ?>" rel="nofollow"> + <a href="<?= e(route('relationships', ['xref1' => $individuals[1]->getXref(), 'xref2' => $individual->getXref(), 'ged' => $individual->getTree()->name()])) ?>" title="<?= I18N::translate('Relationships') ?>" rel="nofollow"> <?= I18N::number($key) ?> </a> <?php endif ?> diff --git a/resources/views/lists/surnames-table.phtml b/resources/views/lists/surnames-table.phtml index 7506b8aa93..19bac44961 100644 --- a/resources/views/lists/surnames-table.phtml +++ b/resources/views/lists/surnames-table.phtml @@ -27,17 +27,17 @@ <?php foreach ($surns as $spfxsurn => $indis) : ?> <?php if ($spfxsurn) : ?> <?php if ($surn !== '') : ?> - <a href="<?= route($route, ['surname' => $surn, 'ged' => $tree->getName()]) ?>" dir="auto"> + <a href="<?= route($route, ['surname' => $surn, 'ged' => $tree->name()]) ?>" dir="auto"> <?= e($spfxsurn) ?> </a> <?php else : ?> - <a href="<?= route($route, ['alpha' => ',', 'ged' => $tree->getName()]) ?>" dir="auto"> + <a href="<?= route($route, ['alpha' => ',', 'ged' => $tree->name()]) ?>" dir="auto"> <?= e($spfxsurn) ?> </a> <?php endif ?> <?php else : ?> <!-- No surname, but a value from "2 SURN"? A common workaround for toponyms, etc. --> - <a href="<?= route($route, ['surname' => $surn, 'ged' => $tree->getName()]) ?>" dir="auto"><?= e($surn) ?></a> + <a href="<?= route($route, ['surname' => $surn, 'ged' => $tree->name()]) ?>" dir="auto"><?= e($surn) ?></a> <?php endif ?> <br> <?php endforeach ?> diff --git a/resources/views/media-list-page.phtml b/resources/views/media-list-page.phtml index 679172b50c..aa2bbc6368 100644 --- a/resources/views/media-list-page.phtml +++ b/resources/views/media-list-page.phtml @@ -12,7 +12,7 @@ </h2> <form class="wt-page-options wt-page-options-media-list d-print-none"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="route" value="media-list"> <input type="hidden" name="action" value="1"> <input type="hidden" name="search" value="yes"> @@ -62,7 +62,7 @@ <button type="submit" name="action" value="1" class="btn btn-primary"> <?= /* I18N: A button label. */ I18N::translate('search') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('media-list', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('media-list', ['ged' => $tree->name()])) ?>"> <?= /* I18N: A button label. */ I18N::translate('reset') ?> </a> </div> @@ -76,14 +76,14 @@ <div class="row text-center"> <div class="col"> <?php if ($page > 1) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => 1])) ?>"> <?= I18N::translate('first') ?> </a> <?php endif ?> </div> <div class="col"> <?php if ($page > 1) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page - 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page - 1])) ?>"> <?= I18N::translate('previous') ?> </a> <?php endif ?> @@ -93,14 +93,14 @@ </div> <div class="col"> <?php if ($page < $pages) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page + 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page + 1])) ?>"> <?= I18N::translate('next') ?> </a> <?php endif ?> </div> <div class="col"> <?php if ($page < $pages) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $pages])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $pages])) ?>"> <?= I18N::translate('last') ?> </a> <?php endif ?> @@ -175,14 +175,14 @@ <div class="row text-center"> <div class="col"> <?php if ($page > 1) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => 1])) ?>"> <?= I18N::translate('first') ?> </a> <?php endif ?> </div> <div class="col"> <?php if ($page > 1) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page - 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page - 1])) ?>"> <?= I18N::translate('previous') ?> </a> <?php endif ?> @@ -192,14 +192,14 @@ </div> <div class="col"> <?php if ($page < $pages) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page + 1])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $page + 1])) ?>"> <?= I18N::translate('next') ?> </a> <?php endif ?> </div> <div class="col"> <?php if ($page < $pages) : ?> - <a href="<?= e(route('media-list', ['ged' => $tree->getName(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $pages])) ?>"> + <a href="<?= e(route('media-list', ['ged' => $tree->name(), 'action' => '1', 'folder' => $folder, 'subdirs' => $subdirs, 'filter' => $filter, 'form_type' => $form_type, 'max' => $max, 'page' => $pages])) ?>"> <?= I18N::translate('last') ?> </a> <?php endif ?> diff --git a/resources/views/media-page-menu.phtml b/resources/views/media-page-menu.phtml index 0094231fec..de323b312a 100644 --- a/resources/views/media-page-menu.phtml +++ b/resources/views/media-page-menu.phtml @@ -11,31 +11,31 @@ <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> <?php if (false && Module::getModuleByName('GEDFact_assistant')) : ?> - <a class="dropdown-item menu-obje-link" href="#" onclick="return ilinkitem('<?= e($record->getXref()) ?>','manage','<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-obje-link" href="#" onclick="return ilinkitem('<?= e($record->getXref()) ?>','manage','<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Manage the links') ?> </a> <?php else : ?> - <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-individual', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-individual', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Link this media object to an individual') ?> </a> - <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-family', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-family', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Link this media object to a family') ?> </a> - <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-source', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a class="dropdown-item menu-obje-link" href="#" data-href="<?= e(route('link-media-to-source', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Link this media object to a source') ?> </a> <?php endif ?> - <a class="dropdown-item menu-obje-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-obje-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-obje-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-obje-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/media-page.phtml b/resources/views/media-page.phtml index f9458eeea9..cf47bba253 100644 --- a/resources/views/media-page.phtml +++ b/resources/views/media-page.phtml @@ -8,13 +8,13 @@ <?php if ($media->isPendingDeletion()) : ?> <?php if (Auth::isModerator($media->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($media->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This media object has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($media->isPendingAddition()) : ?> <?php if (Auth::isModerator($media->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This media object has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($media->getXref()) . '\', \'' . e($media->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($media->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This media object has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> @@ -71,9 +71,9 @@ <?= I18N::translate('Media file') ?> <?php if ($media->canEdit()) : ?> <div class="editfacts"> - <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => '#', 'data-toggle' => 'modal', 'data-target' => '#wt-ajax-modal', 'data-href' => route('edit-media-file', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref(), 'fact_id' => $media_file->factId()])]) ?> + <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => '#', 'data-toggle' => 'modal', 'data-target' => '#wt-ajax-modal', 'data-href' => route('edit-media-file', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref(), 'fact_id' => $media_file->factId()])]) ?> <?php if (count($media->mediaFiles()) > 1) : ?> - <?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . e($media->getTree()->getName()) . '", , "' . e($media->getXref()) . '", "' . $media_file->factId() . '");']) ?> + <?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . e($media->getTree()->name()) . '", , "' . e($media->getXref()) . '", "' . $media_file->factId() . '");']) ?> <?php endif ?> </div> <?php endif ?> @@ -120,7 +120,7 @@ <?= I18N::translate('Source') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref(), 'fact' => 'SOUR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref(), 'fact' => 'SOUR'])) ?>"> <?= I18N::translate('Add a source citation') ?> </a> </td> @@ -130,7 +130,7 @@ <?= I18N::translate('Shared note') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> <?= I18N::translate('Add a shared note') ?> </a> </td> @@ -140,7 +140,7 @@ <?= I18N::translate('Restriction') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref(), 'fact' => 'RESN'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref(), 'fact' => 'RESN'])) ?>"> <?= I18N::translate('Add a restriction') ?> </a> </td> @@ -150,7 +150,7 @@ <?= I18N::translate('Media file') ?> </th> <td> - <a href="#" data-href="<?= e(route('add-media-file', ['ged' => $media->getTree()->getName(), 'xref' => $media->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> + <a href="#" data-href="<?= e(route('add-media-file', ['ged' => $media->getTree()->name(), 'xref' => $media->getXref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Add a media file') ?> </a> </td> diff --git a/resources/views/message-page.phtml b/resources/views/message-page.phtml index f0c3613c9a..ed3259cad0 100644 --- a/resources/views/message-page.phtml +++ b/resources/views/message-page.phtml @@ -5,7 +5,7 @@ <form method="post" action="<?= e(route('message')) ?>"> <?= csrf_field() ?> <input type="hidden" name="url" value="<?= e($url) ?>"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label" for="from"> diff --git a/resources/views/modals/add-media-file.phtml b/resources/views/modals/add-media-file.phtml index f2ddfe97ec..bbfcee1905 100644 --- a/resources/views/modals/add-media-file.phtml +++ b/resources/views/modals/add-media-file.phtml @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<form action="<?= e(route('add-media-file', ['xref' => $media->getXref(), 'ged' => $media->getTree()->getName()])) ?>" enctype="multipart/form-data" method="POST"> +<form action="<?= e(route('add-media-file', ['xref' => $media->getXref(), 'ged' => $media->getTree()->name()])) ?>" enctype="multipart/form-data" method="POST"> <?= csrf_field() ?> <?= view('modals/header', ['title' => I18N::translate('Add a media file')]) ?> diff --git a/resources/views/modals/create-family.phtml b/resources/views/modals/create-family.phtml index a5bf3ab994..09420bee1c 100644 --- a/resources/views/modals/create-family.phtml +++ b/resources/views/modals/create-family.phtml @@ -5,7 +5,7 @@ <div class="modal wt-modal-create-record" id="modal-create-family"> <form action="<?= e(route('create-family')) ?>" id="form-create-family"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="modal-dialog modal-lg" role="document"> <div class="modal-content"> <div class="modal-header"> diff --git a/resources/views/modals/create-media-object.phtml b/resources/views/modals/create-media-object.phtml index 06dade7474..26fa69108a 100644 --- a/resources/views/modals/create-media-object.phtml +++ b/resources/views/modals/create-media-object.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-media-object')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a media object')]) ?> diff --git a/resources/views/modals/create-note-object.phtml b/resources/views/modals/create-note-object.phtml index 968bcb93b7..d1cf9d7f6c 100644 --- a/resources/views/modals/create-note-object.phtml +++ b/resources/views/modals/create-note-object.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-note-object')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a shared note')]) ?> diff --git a/resources/views/modals/create-repository.phtml b/resources/views/modals/create-repository.phtml index 5f6f21abf2..2fe82ff154 100644 --- a/resources/views/modals/create-repository.phtml +++ b/resources/views/modals/create-repository.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-repository')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a repository')]) ?> diff --git a/resources/views/modals/create-source.phtml b/resources/views/modals/create-source.phtml index 387f1567b9..0bc7ed6494 100644 --- a/resources/views/modals/create-source.phtml +++ b/resources/views/modals/create-source.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-source')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a source')]) ?> diff --git a/resources/views/modals/create-submitter.phtml b/resources/views/modals/create-submitter.phtml index 8a7c8d9512..8dac93c235 100644 --- a/resources/views/modals/create-submitter.phtml +++ b/resources/views/modals/create-submitter.phtml @@ -2,7 +2,7 @@ <form action="<?= e(route('create-submitter')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Create a submitter')]) ?> diff --git a/resources/views/modals/edit-media-file.phtml b/resources/views/modals/edit-media-file.phtml index 7db7b7ade5..9ac91330ca 100644 --- a/resources/views/modals/edit-media-file.phtml +++ b/resources/views/modals/edit-media-file.phtml @@ -1,6 +1,6 @@ <?php use Fisharebest\Webtrees\I18N; ?> -<form action="<?= e(route('edit-media-file', ['xref' => $media->getXref(), 'ged' => $media->getTree()->getName(), 'fact_id' => $media_file->factId()])) ?>" enctype="multipart/form-data" method="POST"> +<form action="<?= e(route('edit-media-file', ['xref' => $media->getXref(), 'ged' => $media->getTree()->name(), 'fact_id' => $media_file->factId()])) ?>" enctype="multipart/form-data" method="POST"> <?= csrf_field() ?> <?= view('modals/header', ['title' => I18N::translate('Edit a media file')]) ?> diff --git a/resources/views/modals/link-media-to-family.phtml b/resources/views/modals/link-media-to-family.phtml index dea7f4463c..f9d92f22a9 100644 --- a/resources/views/modals/link-media-to-family.phtml +++ b/resources/views/modals/link-media-to-family.phtml @@ -3,7 +3,7 @@ <form action="<?= e(route('link-media-to-record')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($media->getXref()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Link this media object to a family')]) ?> diff --git a/resources/views/modals/link-media-to-individual.phtml b/resources/views/modals/link-media-to-individual.phtml index 9a99c61840..31cb2044b5 100644 --- a/resources/views/modals/link-media-to-individual.phtml +++ b/resources/views/modals/link-media-to-individual.phtml @@ -3,7 +3,7 @@ <form action="<?= e(route('link-media-to-record')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($media->getXref()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Link this media object to an individual')]) ?> diff --git a/resources/views/modals/link-media-to-source.phtml b/resources/views/modals/link-media-to-source.phtml index d0de9aa62b..d3fe184a3d 100644 --- a/resources/views/modals/link-media-to-source.phtml +++ b/resources/views/modals/link-media-to-source.phtml @@ -3,7 +3,7 @@ <form action="<?= e(route('link-media-to-record')) ?>" id="wt-modal-form" method="POST"> <?= csrf_field() ?> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="xref" value="<?= e($media->getXref()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Link this media object to a source')]) ?> diff --git a/resources/views/modules/batch_update/admin.phtml b/resources/views/modules/batch_update/admin.phtml index d56426fec5..7eb79aab69 100644 --- a/resources/views/modules/batch_update/admin.phtml +++ b/resources/views/modules/batch_update/admin.phtml @@ -15,7 +15,7 @@ <div class="row form-group"> <label class="col-sm-3 col-form-label"><?= I18N::translate('Family tree') ?></label> <div class="col-sm-9"> - <?= Bootstrap4::select($trees, $tree->getName(), ['id' => 'ged', 'name' => 'ged', 'onchange' => 'this.form.submit();']) ?> + <?= Bootstrap4::select($trees, $tree->name(), ['id' => 'ged', 'name' => 'ged', 'onchange' => 'this.form.submit();']) ?> </div> </div> <div class="row form-group"> diff --git a/resources/views/modules/census-assistant.phtml b/resources/views/modules/census-assistant.phtml index 9aa70dbb20..2eee2aafe3 100644 --- a/resources/views/modules/census-assistant.phtml +++ b/resources/views/modules/census-assistant.phtml @@ -105,7 +105,7 @@ document.querySelector('#census-assistant-class').value = census; document.querySelector('#census-assistant-title').value = censusYear + ' ' + censusPlace + ' - <?= I18N::translate('Census transcript') ?> - <?= strip_tags($individual->getFullName()) ?> - <?= I18N::translate('Household') ?>'; - fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusHeader', 'ged' => $individual->getTree()->getName()]) ?>&census=' + census) + fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusHeader', 'ged' => $individual->getTree()->name()]) ?>&census=' + census) .then(function (response) { return response.text(); }) @@ -135,7 +135,7 @@ var headTd = document.querySelector('#census-assistant-table td'); var head = headTd === null ? xref : headTd.innerHTML; - fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusIndividual', 'ged' => $individual->getTree()->getName()]) ?>&census=' + encodeURIComponent(census) + '&xref=' + encodeURIComponent(xref) + '&head=' + encodeURIComponent(head), {credentials: 'same-origin'}) + fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusIndividual', 'ged' => $individual->getTree()->name()]) ?>&census=' + encodeURIComponent(census) + '&xref=' + encodeURIComponent(xref) + '&head=' + encodeURIComponent(head), {credentials: 'same-origin'}) .then(function (response) { return response.text(); }) @@ -153,7 +153,7 @@ var indi_selector = document.querySelector('#census-assistant-individual'); var xref = indi_selector.options[indi_selector.selectedIndex].value; - fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusIndividual', 'ged' => $individual->getTree()->getName()]) ?>&census=' + encodeURIComponent(census) + '&xref=' + encodeURIComponent(xref) + '&head=' + encodeURIComponent(xref), {credentials: 'same-origin'}) + fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusIndividual', 'ged' => $individual->getTree()->name()]) ?>&census=' + encodeURIComponent(census) + '&xref=' + encodeURIComponent(xref) + '&head=' + encodeURIComponent(xref), {credentials: 'same-origin'}) .then(function (response) { return response.text(); }) diff --git a/resources/views/modules/clippings/download.phtml b/resources/views/modules/clippings/download.phtml index 6b6c82aa0a..a531c7ee96 100644 --- a/resources/views/modules/clippings/download.phtml +++ b/resources/views/modules/clippings/download.phtml @@ -7,7 +7,7 @@ <input type="hidden" name="route" value="module"> <input type="hidden" name="module" value="clippings"> <input type="hidden" name="action" value="Download"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <?php if ($is_manager) : ?> <div class="row form-group"> @@ -60,7 +60,7 @@ <?= FontAwesome::decorativeIcon('download') ?> <?= I18N::translate('download') ?> </button> - <a href="<?= e(route('module', ['module' => 'clippings', 'action' => 'Show', 'ged' => $tree->getName()])) ?>" class="btn btn-secondary"> + <a href="<?= e(route('module', ['module' => 'clippings', 'action' => 'Show', 'ged' => $tree->name()])) ?>" class="btn btn-secondary"> <?= FontAwesome::decorativeIcon('cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/modules/clippings/show.phtml b/resources/views/modules/clippings/show.phtml index c33a0d4f50..20f4bfdb82 100644 --- a/resources/views/modules/clippings/show.phtml +++ b/resources/views/modules/clippings/show.phtml @@ -43,7 +43,7 @@ </a> </td> <td> - <form method="post" action="<?= e(route('module', ['module' => 'clippings', 'action' => 'Remove', 'ged' => $tree->getName(), 'xref' => $record->getXref()])) ?>"> + <form method="post" action="<?= e(route('module', ['module' => 'clippings', 'action' => 'Remove', 'ged' => $tree->name(), 'xref' => $record->getXref()])) ?>"> <?= csrf_field() ?> <button type="submit" class="btn btn-link" title="<?= I18N::translate('Remove') ?>"> <i class="icon-remove"></i> diff --git a/resources/views/modules/descendancy/sidebar.phtml b/resources/views/modules/descendancy/sidebar.phtml index 5d8763b807..20e1c49c4a 100644 --- a/resources/views/modules/descendancy/sidebar.phtml +++ b/resources/views/modules/descendancy/sidebar.phtml @@ -1,7 +1,7 @@ <?php use Fisharebest\Webtrees\I18N; ?> <?php use Fisharebest\Webtrees\View; ?> -<form method="post" action="<?= e(route('module', ['module' => 'descendancy', 'action' => 'Descendants', 'ged' => $tree->getName()])) ?>" onsubmit="return false;"> +<form method="post" action="<?= e(route('module', ['module' => 'descendancy', 'action' => 'Descendants', 'ged' => $tree->name()])) ?>" onsubmit="return false;"> <input type="search" name="sb_desc_name" id="sb_desc_name" placeholder="<?= I18N::translate('Search') ?>"> </form> @@ -16,7 +16,7 @@ function dsearchQ() { var query = $("#sb_desc_name").val(); if (query.length>1) { - $("#sb_desc_content").load(<?= json_encode(route('module', ['module' => 'descendancy', 'action' => 'Search', 'ged' => $tree->getName()])) ?> + "&search=" + encodeURIComponent(query)); + $("#sb_desc_content").load(<?= json_encode(route('module', ['module' => 'descendancy', 'action' => 'Search', 'ged' => $tree->name()])) ?> + "&search=" + encodeURIComponent(query)); } } diff --git a/resources/views/modules/faq/config.phtml b/resources/views/modules/faq/config.phtml index 6c20ef39ee..9cccb4c751 100644 --- a/resources/views/modules/faq/config.phtml +++ b/resources/views/modules/faq/config.phtml @@ -19,13 +19,13 @@ <label for="ged" class="sr-only"> <?= I18N::translate('Family tree') ?> </label> - <?= Bootstrap4::select($tree_names, $tree->getName(), ['id' => 'ged', 'name' => 'ged']) ?> + <?= Bootstrap4::select($tree_names, $tree->name(), ['id' => 'ged', 'name' => 'ged']) ?> <input type="submit" class="btn btn-primary" value="<?= I18N::translate('show') ?>"> </form> </p> <p> - <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link"> + <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'ged' => $tree->name()])) ?>" class="btn btn-link"> <?= view('icons/add') ?> <?= /* I18N: FAQ = “Frequently Asked Question” */ I18N::translate('Add an FAQ') ?> @@ -62,7 +62,7 @@ </td> <td> <?php if ($faq->block_order != $min_block_order) : ?> - <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveUp', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveUp', 'block_id' => $faq->block_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-secondary"> <?= view('icons/arrow-up') ?> @@ -73,7 +73,7 @@ </td> <td> <?php if ($faq->block_order != $max_block_order) : ?> - <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveDown', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminMoveDown', 'block_id' => $faq->block_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-secondary"> <?= view('icons/arrow-down') ?> @@ -83,13 +83,13 @@ <?php endif ?> </td> <td> - <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" class="btn btn-primary"> + <a href="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminEdit', 'block_id' => $faq->block_id, 'ged' => $tree->name()])) ?>" class="btn btn-primary"> <?= view('icons/edit') ?> <?= I18N::translate('Edit') ?> </a> </td> <td> - <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminDelete', 'block_id' => $faq->block_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'faq', 'action' => 'AdminDelete', 'block_id' => $faq->block_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-danger" onclick="return confirm(this.dataset.confirm);" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($faq->header)) ?>"> <?= view('icons/delete') ?> diff --git a/resources/views/modules/faq/edit.phtml b/resources/views/modules/faq/edit.phtml index 206f1109aa..1438f5c452 100644 --- a/resources/views/modules/faq/edit.phtml +++ b/resources/views/modules/faq/edit.phtml @@ -2,7 +2,7 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-modules') => I18N::translate('Modules'), route('module', ['module' => 'faq', 'action' => 'Admin', 'ged' => $tree->getName()]) => I18N::translate('Frequently asked questions'), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-modules') => I18N::translate('Modules'), route('module', ['module' => 'faq', 'action' => 'Admin', 'ged' => $tree->name()]) => I18N::translate('Frequently asked questions'), $title]]) ?> <h1><?= $title ?></h1> @@ -58,7 +58,7 @@ </label> <div class="col-sm-9"> - <?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->getName(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?> + <?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->name(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?> <p class="small text-muted"> <?= /* I18N: FAQ = “Frequently Asked Question” */ I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?> diff --git a/resources/views/modules/gedcom_favorites/favorites.phtml b/resources/views/modules/gedcom_favorites/favorites.phtml index 5ca167dabb..ab190e1c45 100644 --- a/resources/views/modules/gedcom_favorites/favorites.phtml +++ b/resources/views/modules/gedcom_favorites/favorites.phtml @@ -18,7 +18,7 @@ </div> <?php if ($is_manager) : ?> - <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->getName(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->name(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-link btn-sm" data-confirm="<?= I18N::translate('Are you sure you want to remove this item from your list of favorites?') ?>" onclick="return confirm(this.dataset.confirm);"> <?= I18N::translate('Remove') ?> @@ -35,7 +35,7 @@ </a> </div> <div id="add_fav<?= e($block_id) ?>" style="display: none;"> - <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'AddFavorite', 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'gedcom_favorites', 'action' => 'AddFavorite', 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <div class="add_fav_ref"> <input type="radio" name="fav_category" value="record" checked onclick="$('#xref<?= e($block_id) ?>').removeAttr('disabled'); $('#url, #title').attr('disabled','disabled').val('');"> diff --git a/resources/views/modules/gedcom_news/edit.phtml b/resources/views/modules/gedcom_news/edit.phtml index 1da2e6525b..8fa6fd5a21 100644 --- a/resources/views/modules/gedcom_news/edit.phtml +++ b/resources/views/modules/gedcom_news/edit.phtml @@ -37,7 +37,7 @@ <?= I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('tree-page', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('tree-page', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('cancel') ?> </a> </td> diff --git a/resources/views/modules/gedcom_news/list.phtml b/resources/views/modules/gedcom_news/list.phtml index 979e917fb3..435e28f7c5 100644 --- a/resources/views/modules/gedcom_news/list.phtml +++ b/resources/views/modules/gedcom_news/list.phtml @@ -22,9 +22,9 @@ <?php if (Auth::isManager($tree)) : ?> <hr> - <form action="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'DeleteNews', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'DeleteNews', 'news_id' => $article->news_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> - <a class="btn btn-link" href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>"> + <a class="btn btn-link" href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'news_id' => $article->news_id, 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit') ?> </a> | @@ -42,7 +42,7 @@ <?php if (Auth::isManager($tree)) : ?> <p> - <a href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('module', ['module' => 'gedcom_news', 'action' => 'EditNews', 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Add a news article') ?> </a> </p> diff --git a/resources/views/modules/notes/tab.phtml b/resources/views/modules/notes/tab.phtml index bbb5b1e216..d746883ff8 100644 --- a/resources/views/modules/notes/tab.phtml +++ b/resources/views/modules/notes/tab.phtml @@ -34,7 +34,7 @@ <?= I18N::translate('Note') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'fact' => 'NOTE'])) ?>"> <?= I18N::translate('Add a note') ?> </a> </td> @@ -44,7 +44,7 @@ <?= I18N::translate('Shared note') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> <?= I18N::translate('Add a shared note') ?> </a> </td> diff --git a/resources/views/modules/pedigree-map/pedigree-map-page.phtml b/resources/views/modules/pedigree-map/pedigree-map-page.phtml index fc85f6dffa..f084a839b8 100644 --- a/resources/views/modules/pedigree-map/pedigree-map-page.phtml +++ b/resources/views/modules/pedigree-map/pedigree-map-page.phtml @@ -8,7 +8,7 @@ <input type="hidden" name="route" value="module"> <input type="hidden" name="module" value="<?= $module ?>"> <input type="hidden" name="action" value="PedigreeMap"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> diff --git a/resources/views/modules/pedigree-map/pedigree-map.phtml b/resources/views/modules/pedigree-map/pedigree-map.phtml index 411903b049..f31215824d 100644 --- a/resources/views/modules/pedigree-map/pedigree-map.phtml +++ b/resources/views/modules/pedigree-map/pedigree-map.phtml @@ -152,7 +152,7 @@ reference: reference, type: mapType, generations: Generations, - ged: <?= json_encode($tree->getName()) ?> + ged: <?= json_encode($tree->name()) ?> }) .done(function (data, textStatus, jqXHR) { if (jqXHR.status === 200 && data.features.length === 1) { diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml index 08b0fab15c..c1781d1482 100644 --- a/resources/views/modules/relatives/family.phtml +++ b/resources/views/modules/relatives/family.phtml @@ -42,7 +42,7 @@ <tr> <th scope="row"></th> <td> - <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'famtag' => 'HUSB'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->name(), 'xref' => $family->getXref(), 'famtag' => 'HUSB'])) ?>"> <?= I18N::translate('Add a husband to this family') ?> </a> </td> @@ -79,7 +79,7 @@ <tr> <th scope="row"></th> <td> - <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'famtag' => 'WIFE'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->name(), 'xref' => $family->getXref(), 'famtag' => 'WIFE'])) ?>"> <?= I18N::translate('Add a wife to this family') ?> </a> </td> @@ -122,7 +122,7 @@ <th scope="row"> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref(), 'fact' => 'MARR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $family->getTree()->name(), 'xref' => $family->getXref(), 'fact' => 'MARR'])) ?>"> <?= I18N::translate('Add marriage details') ?> </a> </td> @@ -190,13 +190,13 @@ <tr> <th scope="row"> <?php if (count($family->getChildren()) > 1) : ?> - <a href="<?= e(route('reorder-children', ['ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>"> + <a href="<?= e(route('reorder-children', ['ged' => $family->getTree()->name(), 'xref' => $family->getXref()])) ?>"> <i class="icon-media-shuffle"></i> <?= I18N::translate('Re-order children') ?> </a> <?php endif; ?> </th> <td> - <a href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>"> + <a href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $family->getTree()->name(), 'xref' => $family->getXref()])) ?>"> <?php if ($type == 'FAMS') : ?> <?= I18N::translate('Add a son or daughter') ?> <?php else : ?> @@ -204,9 +204,9 @@ <?php endif ?> </a> - <a href="<?= e(route('add-child-to-family', ['gender' => 'M', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>" class="icon-sex_m_15x15"></a> + <a href="<?= e(route('add-child-to-family', ['gender' => 'M', 'ged' => $family->getTree()->name(), 'xref' => $family->getXref()])) ?>" class="icon-sex_m_15x15"></a> - <a href="<?= e(route('add-child-to-family', ['gender' => 'F', 'ged' => $family->getTree()->getName(), 'xref' => $family->getXref()])) ?>" class="icon-sex_f_15x15"></a> + <a href="<?= e(route('add-child-to-family', ['gender' => 'F', 'ged' => $family->getTree()->name(), 'xref' => $family->getXref()])) ?>" class="icon-sex_f_15x15"></a> </td> </tr> <?php endif ?> diff --git a/resources/views/modules/relatives/tab.phtml b/resources/views/modules/relatives/tab.phtml index 38e1fd4692..2329da77c5 100644 --- a/resources/views/modules/relatives/tab.phtml +++ b/resources/views/modules/relatives/tab.phtml @@ -20,14 +20,14 @@ <tbody> <tr> <td> - <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'M'])) ?>"> + <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'gender' => 'M'])) ?>"> <?= I18N::translate('Add a father') ?> </a> </td> </tr> <tr> <td> - <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'F'])) ?>"> + <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'gender' => 'F'])) ?>"> <?= I18N::translate('Add a mother') ?> </a> </td> @@ -87,7 +87,7 @@ <?php if (count($spouse_families) > 1) : ?> <tr> <td> - <a href="<?= e(route('reorder-spouses', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('reorder-spouses', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Re-order families') ?> </a> </td> @@ -95,7 +95,7 @@ <?php endif ?> <tr> <td> - <a href="<?= e(route('link-child-to-family', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('link-child-to-family', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?= I18N::translate('Link this individual to an existing family as a child') ?> </a> </td> @@ -103,7 +103,7 @@ <tr> <td> - <a href="<?= e(route('add-spouse-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('add-spouse-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?php if ($individual->getSex() !== 'F') : ?> <?= I18N::translate('Add a wife') ?> <?php else : ?> @@ -115,7 +115,7 @@ <tr> <td> - <a href="<?= e(route('link-spouse-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('link-spouse-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> <?php if ($individual->getSex() !== 'F') : ?> <?= I18N::translate('Add a wife using an existing individual') ?> <?php else : ?> @@ -127,7 +127,7 @@ <tr> <td> - <a href="<?= e(route('add-child-to-individual', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'gender' => 'U'])) ?>"> + <a href="<?= e(route('add-child-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'gender' => 'U'])) ?>"> <?= I18N::translate('Add a child to create a one-parent family') ?> </a> </td> diff --git a/resources/views/modules/sources_tab/tab.phtml b/resources/views/modules/sources_tab/tab.phtml index 7bb486123a..5beb995847 100644 --- a/resources/views/modules/sources_tab/tab.phtml +++ b/resources/views/modules/sources_tab/tab.phtml @@ -32,7 +32,7 @@ <?= I18N::translate('Source') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->getName(), 'xref' => $individual->getXref(), 'fact' => 'SOUR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'fact' => 'SOUR'])) ?>"> <?= I18N::translate('Add a source citation') ?> </a> </td> diff --git a/resources/views/modules/stories/config.phtml b/resources/views/modules/stories/config.phtml index 82026dd0a8..2bc0b1e5c0 100644 --- a/resources/views/modules/stories/config.phtml +++ b/resources/views/modules/stories/config.phtml @@ -14,14 +14,14 @@ <?= I18N::translate('Family tree') ?> </label> - <?= Bootstrap4::select($tree_names, $tree->getName(), ['id' => 'ged', 'name' => 'ged']) ?> + <?= Bootstrap4::select($tree_names, $tree->name(), ['id' => 'ged', 'name' => 'ged']) ?> <button type="submit" class="btn btn-primary"> <?= I18N::translate('show') ?> </button> </form> <p> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName()])) ?>" class="btn btn-link"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->name()])) ?>" class="btn btn-link"> <?= view('icons/add') ?> <?= I18N::translate('Add a story') ?> </a> @@ -52,13 +52,13 @@ <?= e($story->title) ?> </td> <td> - <a class="btn btn-primary" href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>"> + <a class="btn btn-primary" href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'ged' => $tree->name(), 'block_id' => $story->block_id])) ?>"> <?= view('icons/edit') ?> <?= I18N::translate('Edit') ?> </a> </td> <td> - <form action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminDelete', 'ged' => $tree->getName(), 'block_id' => $story->block_id])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminDelete', 'ged' => $tree->name(), 'block_id' => $story->block_id])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-danger" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', e($story->title)) ?>" onclick="return confirm(this.dataset.confirm);"> <?= view('icons/delete') ?> diff --git a/resources/views/modules/stories/edit.phtml b/resources/views/modules/stories/edit.phtml index 7265dd04cc..991c719412 100644 --- a/resources/views/modules/stories/edit.phtml +++ b/resources/views/modules/stories/edit.phtml @@ -1,11 +1,11 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\I18N; ?> -<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-modules') => I18N::translate('Modules'), route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->getName()]) => I18N::translate('Stories'), $title]]) ?> +<?= view('components/breadcrumbs', ['links' => [route('admin-control-panel') => I18N::translate('Control panel'), route('admin-modules') => I18N::translate('Modules'), route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->name()]) => I18N::translate('Stories'), $title]]) ?> <h1><?= $title ?></h1> -<form class="form-horizontal" method="post" action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $block_id, 'ged' => $tree->getName()])) ?>"> +<form class="form-horizontal" method="post" action="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $block_id, 'ged' => $tree->name()])) ?>"> <?= csrf_field() ?> <div class="row form-group"> @@ -51,7 +51,7 @@ <?= I18N::translate('save') ?> </button> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->getName()])) ?>" class="btn btn-secondary"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'Admin', 'ged' => $tree->name()])) ?>" class="btn btn-secondary"> <?= view('icons/cancel') ?> <?= I18N::translate('cancel') ?> </a> diff --git a/resources/views/modules/stories/tab.phtml b/resources/views/modules/stories/tab.phtml index f22a01abce..14817994ae 100644 --- a/resources/views/modules/stories/tab.phtml +++ b/resources/views/modules/stories/tab.phtml @@ -10,7 +10,7 @@ </div> <?php if ($is_admin) : ?> <div class="story_edit"> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $story->block_id, 'ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'block_id' => $story->block_id, 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit the story') ?> </a> </div> @@ -19,7 +19,7 @@ <?php if ($is_admin && empty($stories)) : ?> <div> - <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'xref' => $individual->getXref(), 'ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'xref' => $individual->getXref(), 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Add a story') ?> </a> </div> diff --git a/resources/views/modules/user_blog/edit.phtml b/resources/views/modules/user_blog/edit.phtml index 1998d123d7..642a8db6eb 100644 --- a/resources/views/modules/user_blog/edit.phtml +++ b/resources/views/modules/user_blog/edit.phtml @@ -37,7 +37,7 @@ <?= I18N::translate('save') ?> </button> - <a class="btn btn-secondary" href="<?= e(route('user-page', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('user-page', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('cancel') ?> </a> </td> diff --git a/resources/views/modules/user_blog/list.phtml b/resources/views/modules/user_blog/list.phtml index 10115ce0b3..e60e26f8a7 100644 --- a/resources/views/modules/user_blog/list.phtml +++ b/resources/views/modules/user_blog/list.phtml @@ -22,9 +22,9 @@ <?php if (Auth::isManager($tree)) : ?> <hr> - <form action="<?= e(route('module', ['module' => 'user_blog', 'action' => 'DeleteJournal', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'user_blog', 'action' => 'DeleteJournal', 'news_id' => $article->news_id, 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> - <a class="btn btn-link" href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'news_id' => $article->news_id, 'ged' => $tree->getName()])) ?>"> + <a class="btn btn-link" href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'news_id' => $article->news_id, 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Edit') ?> </a> | @@ -41,7 +41,7 @@ <?php endif ?> <p> - <a href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('module', ['module' => 'user_blog', 'action' => 'EditJournal', 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Add a news article') ?> </a> </p> diff --git a/resources/views/modules/user_favorites/favorites.phtml b/resources/views/modules/user_favorites/favorites.phtml index fb32842a35..437de77802 100644 --- a/resources/views/modules/user_favorites/favorites.phtml +++ b/resources/views/modules/user_favorites/favorites.phtml @@ -17,7 +17,7 @@ </div> </div> - <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->getName(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'DeleteFavorite', 'ged' => $tree->name(), 'favorite_id' => $favorite->favorite_id])) ?>" method="post"> <?= csrf_field() ?> <button type="submit" class="btn btn-link btn-sm" data-confirm="<?= I18N::translate('Are you sure you want to remove this item from your list of favorites?') ?>" onclick="return confirm(this.dataset.confirm);"> <?= I18N::translate('Remove') ?> @@ -32,7 +32,7 @@ </a> </div> <div id="add_fav<?= e($block_id) ?>" style="display: none;"> - <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'AddFavorite', 'ged' => $tree->getName()])) ?>" method="post"> + <form action="<?= e(route('module', ['module' => 'user_favorites', 'action' => 'AddFavorite', 'ged' => $tree->name()])) ?>" method="post"> <?= csrf_field() ?> <div class="add_fav_ref"> <input type="radio" name="fav_category" value="record" checked onclick="$('#xref<?= e($block_id) ?>').removeAttr('disabled'); $('#url, #title').attr('disabled','disabled').val('');"> diff --git a/resources/views/note-page-menu.phtml b/resources/views/note-page-menu.phtml index 04d671aa70..c8ed01d7ae 100644 --- a/resources/views/note-page-menu.phtml +++ b/resources/views/note-page-menu.phtml @@ -8,14 +8,14 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-note-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-note-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-note-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-note-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/note-page.phtml b/resources/views/note-page.phtml index 8581f1d304..cf69fe5992 100644 --- a/resources/views/note-page.phtml +++ b/resources/views/note-page.phtml @@ -7,13 +7,13 @@ <?php if ($note->isPendingDeletion()) : ?> <?php if (Auth::isModerator($note->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This note has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This note has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($note->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This note has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($note->isPendingAddition()) : ?> <?php if (Auth::isModerator($note->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This note has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This note has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($note->getXref()) . '\', \'' . e($note->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($note->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This note has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> @@ -75,7 +75,7 @@ <?= I18N::translate('Shared note') ?> <?php if (Auth::isEditor($note->getTree())) : ?> <div class="editfacts"> - <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => route('edit-note-object', ['xref' => $note->getXref(), 'ged' => $note->getTree()->getName()])]) ?> + <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => route('edit-note-object', ['xref' => $note->getXref(), 'ged' => $note->getTree()->name()])]) ?> </div> <?php endif ?> </th> diff --git a/resources/views/pedigree-page.phtml b/resources/views/pedigree-page.phtml index ec6faa6a9e..b8677d4374 100644 --- a/resources/views/pedigree-page.phtml +++ b/resources/views/pedigree-page.phtml @@ -8,7 +8,7 @@ <form class="wt-page-options wt-page-options-pedigree-chart d-print-none"> <input type="hidden" name="route" value="pedigree"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref"> @@ -45,4 +45,4 @@ </div> </form> -<div class="wt-ajax-load wt-page-content wt-chart wt-pedigree-chart" data-ajax-url="<?= e(route('pedigree-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName(), 'generations' => $generations, 'orientation' => $orientation])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-pedigree-chart" data-ajax-url="<?= e(route('pedigree-chart', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'orientation' => $orientation])) ?>"></div> diff --git a/resources/views/pending-changes-page.phtml b/resources/views/pending-changes-page.phtml index 20829a3725..728d46b9bf 100644 --- a/resources/views/pending-changes-page.phtml +++ b/resources/views/pending-changes-page.phtml @@ -95,14 +95,14 @@ <?php endforeach ?> <div class="d-flex justify-content-between"> - <form action="<?= e(route('accept-all-changes', ['ged' => $tree->getName(), 'url' => $url])) ?>" method="POST"> + <form action="<?= e(route('accept-all-changes', ['ged' => $tree->name(), 'url' => $url])) ?>" method="POST"> <?= csrf_field() ?> <button class="btn btn-primary" type="submit"> <?= I18N::translate('Accept all changes') ?> </button> </form> - <form action="<?= e(route('reject-all-changes', ['ged' => $tree->getName(), 'url' => $url])) ?>" method="POST"> + <form action="<?= e(route('reject-all-changes', ['ged' => $tree->name(), 'url' => $url])) ?>" method="POST"> <?= csrf_field() ?> <button class="btn btn-secondary" type="submit" data-confirm="<?= I18N::translate('Are you sure you want to reject all the changes to this family tree?') ?>" onclick="return confirm(this.dataset.confirm);"> <?= I18N::translate('Reject all changes') ?> diff --git a/resources/views/places-page.phtml b/resources/views/places-page.phtml index 06e1e3e1da..24796556c8 100644 --- a/resources/views/places-page.phtml +++ b/resources/views/places-page.phtml @@ -5,7 +5,7 @@ <h4><?= $title ?></h4> <h5 class="center"> <?php if ($current) : ?> - <a href="<?= e(route('place-hierarchy', ['ged' => $tree->getName()])) ?>"> + <a href="<?= e(route('place-hierarchy', ['ged' => $tree->name()])) ?>"> <?= I18N::translate('World') ?> </a> <?php else : ?> @@ -29,13 +29,13 @@ <?= $content ?> <div class="center"> <?php if ($showeventslink) : ?> - <a class="formField" href= <?= e(route('place-hierarchy', ['ged' => $tree->getName(), 'parent' => $parent, 'action' => 'hierarchy-e'])) ?>> + <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) ?> </a> | <?php endif ?> - <a href="<?= e(route('place-hierarchy', ['ged' => $tree->getName(), 'action' => key($nextaction)])) ?>"> + <a href="<?= e(route('place-hierarchy', ['ged' => $tree->name(), 'action' => key($nextaction)])) ?>"> <?= current($nextaction) ?> </a> </div> diff --git a/resources/views/register-page.phtml b/resources/views/register-page.phtml index 6df8c44f53..0117870a68 100644 --- a/resources/views/register-page.phtml +++ b/resources/views/register-page.phtml @@ -13,7 +13,7 @@ <form autocomplete="off" class="wt-page-options wt-page-options-register" method="post" action="<?= e(route('register')) ?>"> <?= csrf_field() ?> - <input name="ged" type="hidden" value="<?= e($tree->getName()) ?>"> + <input name="ged" type="hidden" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label wt-page-options-label" for="realname"> diff --git a/resources/views/relationships-page.phtml b/resources/views/relationships-page.phtml index 9756829d6a..d43d5a8486 100644 --- a/resources/views/relationships-page.phtml +++ b/resources/views/relationships-page.phtml @@ -9,7 +9,7 @@ <form class="wt-page-options wt-page-options-relationships-chart d-print-none"> <input type="hidden" name="route" value="relationships"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="xref1"> @@ -82,7 +82,7 @@ <div class="wt-ajax-load wt-page-content wt-chart wt-relationships-chart" data-ajax-url="<?= e(route('relationships-chart', [ 'xref1' => $individual1->getXref(), 'xref2' => $individual2->getXref(), - 'ged' => $individual2->getTree()->getName(), + 'ged' => $individual2->getTree()->name(), 'recursion' => $recursion, 'ancestors' => $ancestors, ])) ?>"></div> diff --git a/resources/views/report-select-page.phtml b/resources/views/report-select-page.phtml index 31fcbbeaee..dd3bdb382d 100644 --- a/resources/views/report-select-page.phtml +++ b/resources/views/report-select-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-report-select"> <input type="hidden" name="route" value="report-setup"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="report"> <?= I18N::translate('Report') ?> diff --git a/resources/views/report-setup-page.phtml b/resources/views/report-setup-page.phtml index 117c77962c..4b57f51a2c 100644 --- a/resources/views/report-setup-page.phtml +++ b/resources/views/report-setup-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-report-setup"> <input type="hidden" name="route" value="report-run"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="report" value="<?= e($report) ?>"> <div class="row form-group"> diff --git a/resources/views/repository-page-menu.phtml b/resources/views/repository-page-menu.phtml index 385bb9d66c..5d2fdef2b1 100644 --- a/resources/views/repository-page-menu.phtml +++ b/resources/views/repository-page-menu.phtml @@ -8,14 +8,14 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-repo-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-repo-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-repo-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-repo-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/repository-page.phtml b/resources/views/repository-page.phtml index 41ae46c090..70010496ce 100644 --- a/resources/views/repository-page.phtml +++ b/resources/views/repository-page.phtml @@ -6,13 +6,13 @@ <?php if ($repository->isPendingDeletion()) : ?> <?php if (Auth::isModerator($repository->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This repository has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This repository has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($repository->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This repository has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($repository->isPendingAddition()) : ?> <?php if (Auth::isModerator($repository->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This repository has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $repository->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This repository has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($repository->getXref()) . '\', \'' . e($repository->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $repository->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($repository->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This repository has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> diff --git a/resources/views/search-general-page.phtml b/resources/views/search-general-page.phtml index bf682c0e1d..060b7c2315 100644 --- a/resources/views/search-general-page.phtml +++ b/resources/views/search-general-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-search hidden-print mb-4" name="searchform"> <input type="hidden" name="route" value="search-general"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="query"> <?= I18N::translate('Search for') ?> @@ -74,7 +74,7 @@ <?php foreach ($all_trees as $tree) : ?> <div class="col px-0"> <label class="form-check-label"> - <input class="form-check form-check-input" type="checkbox" <?= in_array($tree, $search_trees) ? 'checked' : '' ?> value="<?= ($tree->getName()) ?>" name="search_trees[]"> + <input class="form-check form-check-input" type="checkbox" <?= in_array($tree, $search_trees) ? 'checked' : '' ?> value="<?= $tree->name() ?>" name="search_trees[]"> <?= e($tree->getTitle()) ?> </label> </div> diff --git a/resources/views/search-phonetic-page.phtml b/resources/views/search-phonetic-page.phtml index 4d32a0e4a5..c78a0568fc 100644 --- a/resources/views/search-phonetic-page.phtml +++ b/resources/views/search-phonetic-page.phtml @@ -6,7 +6,7 @@ <form class="wt-page-options wt-page-options-ancestors-chart hidden-print mb-4" name="searchform"> <input type="hidden" name="route" value="search-phonetic"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="row form-group"> <label class="col-sm-3 col-form-label wt-page-options-label" for="firstname"> <?= I18N::translate('Given name') ?> @@ -74,7 +74,7 @@ <?php foreach ($all_trees as $tree) : ?> <div class="col px-0"> <label class="form-check-label"> - <input class="form-check form-check-input" type="checkbox" <?= in_array($tree, $search_trees) ? 'checked' : '' ?> value="<?= ($tree->getName()) ?>" name="search_trees[]"> + <input class="form-check form-check-input" type="checkbox" <?= in_array($tree, $search_trees) ? 'checked' : '' ?> value="<?= $tree->name() ?>" name="search_trees[]"> <?= e($tree->getTitle()) ?> </label> </div> diff --git a/resources/views/search-replace-page.phtml b/resources/views/search-replace-page.phtml index 0a379e7825..575ece5c01 100644 --- a/resources/views/search-replace-page.phtml +++ b/resources/views/search-replace-page.phtml @@ -5,7 +5,7 @@ <?= $title ?> </h2> -<form class="wt-page-options wt-page-options-ancestors-chart hidden-print" method="post" action="<?= e(route('search-replace', ['ged' => $tree->getName()])) ?>"> +<form class="wt-page-options wt-page-options-ancestors-chart hidden-print" method="post" action="<?= e(route('search-replace', ['ged' => $tree->name()])) ?>"> <?= csrf_field() ?> <div class="row form-group"> diff --git a/resources/views/source-page-menu.phtml b/resources/views/source-page-menu.phtml index 570d1287bf..0f62a493c7 100644 --- a/resources/views/source-page-menu.phtml +++ b/resources/views/source-page-menu.phtml @@ -8,14 +8,14 @@ <?= I18N::translate('edit') ?> </button> <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu"> - <a class="dropdown-item menu-sour-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->getName()) ?>');"> + <a class="dropdown-item menu-sour-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->getXref()) ?>', '<?= e($record->getTree()->name()) ?>');"> <?= I18N::translate('Delete') ?> </a> <?php if (Auth::isAdmin() || $record->getTree()->getPreference('SHOW_GEDCOM_RECORD')) : ?> <div class="dropdown-divider"></div> - <a class="dropdown-item menu-sour-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->getName(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-sour-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->getXref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/source-page.phtml b/resources/views/source-page.phtml index e2d9c34937..4726389448 100644 --- a/resources/views/source-page.phtml +++ b/resources/views/source-page.phtml @@ -6,13 +6,13 @@ <?php if ($source->isPendingDeletion()) : ?> <?php if (Auth::isModerator($source->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been deleted. You should review the deletion and then %1$s or %2$s it.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->name()) . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($source->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This source has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> <?php elseif ($source->isPendingAddition()) : ?> <?php if (Auth::isModerator($source->getTree())) : ?> - <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->getName()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> + <?= view('components/alert-warning-dismissible', ['alert' => /* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate('This source has been edited. You should review the changes and then %1$s or %2$s them.', '<a href="#" class="alert-link" onclick="accept_changes(\'' . e($source->getXref()) . '\', \'' . e($source->getTree()->name()) . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" onclick="reject_changes(\'' . $source->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php elseif (Auth::isEditor($source->getTree())) : ?> <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This source has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes')]) ?> <?php endif ?> @@ -75,7 +75,7 @@ <?= I18N::translate('Media object') ?> </th> <td> - <a href="<?= e(route('add-fact', ['ged' => $source->getTree()->getName(), 'xref' => $source->getXref(), 'fact' => 'OBJE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $source->getTree()->name(), 'xref' => $source->getXref(), 'fact' => 'OBJE'])) ?>"> <?= I18N::translate('Add a media object') ?> </a> </td> diff --git a/resources/views/statistics-chart-custom.phtml b/resources/views/statistics-chart-custom.phtml index 54f4b222a3..0e53a565e3 100644 --- a/resources/views/statistics-chart-custom.phtml +++ b/resources/views/statistics-chart-custom.phtml @@ -89,7 +89,7 @@ use Fisharebest\Webtrees\I18N; </h3> <form id="own-stats-form" action="<?= e(route('statistics-chart')) ?>" onsubmit="return loadCustomChart();" class="wt-page-options wt-page-options-statistics"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <div class="form-group row"> <div class="col-sm-2 wt-page-options-label"> <?= I18N::translate('Chart type') ?> diff --git a/resources/views/statistics-page.phtml b/resources/views/statistics-page.phtml index 6c713abdff..1dde58378e 100644 --- a/resources/views/statistics-page.phtml +++ b/resources/views/statistics-page.phtml @@ -8,22 +8,22 @@ <div class="wt-page-content wt-chart wt-statistics-chart" id="statistics-tabs"> <ul class="nav nav-tabs" role="tablist"> <li class="nav-item"> - <a class="nav-link" href="#individual-statistics" data-toggle="tab" data-href="<?= e(route('statistics-individuals', ['ged' => $tree->getName()])) ?>" role="tab"> + <a class="nav-link" href="#individual-statistics" data-toggle="tab" data-href="<?= e(route('statistics-individuals', ['ged' => $tree->name()])) ?>" role="tab"> <?= I18N::translate('Individuals') ?> </a> </li> <li class="nav-item"> - <a class="nav-link" href="#family-statistics" data-toggle="tab" data-href="<?= e(route('statistics-families', ['ged' => $tree->getName()])) ?>" role="tab"> + <a class="nav-link" href="#family-statistics" data-toggle="tab" data-href="<?= e(route('statistics-families', ['ged' => $tree->name()])) ?>" role="tab"> <?= I18N::translate('Families') ?> </a> </li> <li class="nav-item"> - <a class="nav-link" href="#other-statistics" data-toggle="tab" data-href="<?= e(route('statistics-other', ['ged' => $tree->getName()])) ?>" role="tab"> + <a class="nav-link" href="#other-statistics" data-toggle="tab" data-href="<?= e(route('statistics-other', ['ged' => $tree->name()])) ?>" role="tab"> <?= I18N::translate('Others') ?> </a> </li> <li class="nav-item"> - <a class="nav-link" href="#custom-statistics" data-toggle="tab" data-href="<?= e(route('statistics-options', ['ged' => $tree->getName()])) ?>" role="tab"> + <a class="nav-link" href="#custom-statistics" data-toggle="tab" data-href="<?= e(route('statistics-options', ['ged' => $tree->name()])) ?>" role="tab"> <?= I18N::translate('Custom') ?> </a> </li> diff --git a/resources/views/timeline-page.phtml b/resources/views/timeline-page.phtml index 3daf2b6c6d..5231fa0859 100644 --- a/resources/views/timeline-page.phtml +++ b/resources/views/timeline-page.phtml @@ -7,7 +7,7 @@ <form class="wt-page-options wt-page-options-timeline-chart d-print-none"> <input type="hidden" name="route" value="timeline"> - <input type="hidden" name="ged" value="<?= e($tree->getName()) ?>"> + <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> <input type="hidden" name="scale" value="<?= e($scale) ?>"> <?php foreach ($individuals as $individual) : ?> @@ -31,7 +31,7 @@ <div class="col-sm-9 wt-page-options-value"> <input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */ I18N::translate('add') ?>"> - <a class="btn btn-secondary" href="<?= e(route('timeline', ['ged' => $tree->getName()])) ?>"> + <a class="btn btn-secondary" href="<?= e(route('timeline', ['ged' => $tree->name()])) ?>"> <?= /* I18N: A button label. */ I18N::translate('reset') ?> </a> </div> diff --git a/resources/views/tree-page-block.phtml b/resources/views/tree-page-block.phtml index 5f9f973758..45d0aab484 100644 --- a/resources/views/tree-page-block.phtml +++ b/resources/views/tree-page-block.phtml @@ -1,5 +1,5 @@ <?php if ($block->loadAjax()) : ?> - <div class="wt-ajax-load" data-ajax-url="<?= e(route('tree-page-block', ['ged' => $tree->getName(), 'block_id' => $block_id])) ?>"> + <div class="wt-ajax-load" data-ajax-url="<?= e(route('tree-page-block', ['ged' => $tree->name(), 'block_id' => $block_id])) ?>"> </div> <?php else : ?> <?= $block->getBlock($tree, $block_id) ?> diff --git a/resources/views/user-page-block.phtml b/resources/views/user-page-block.phtml index 51e8838bbc..7a711f8b62 100644 --- a/resources/views/user-page-block.phtml +++ b/resources/views/user-page-block.phtml @@ -1,5 +1,5 @@ <?php if ($block->loadAjax()) : ?> - <div class="wt-ajax-load" data-ajax-url="<?= e(route('user-page-block', ['ged' => $tree->getName(), 'block_id' => $block_id])) ?>"> + <div class="wt-ajax-load" data-ajax-url="<?= e(route('user-page-block', ['ged' => $tree->name(), 'block_id' => $block_id])) ?>"> </div> <?php else : ?> <?= $block->getBlock($tree, $block_id) ?> |