diff options
Diffstat (limited to 'resources/views')
52 files changed, 146 insertions, 146 deletions
diff --git a/resources/views/admin/fix-level-0-media-action.phtml b/resources/views/admin/fix-level-0-media-action.phtml index 8d350ad90d..ce74415aeb 100644 --- a/resources/views/admin/fix-level-0-media-action.phtml +++ b/resources/views/admin/fix-level-0-media-action.phtml @@ -5,8 +5,8 @@ data-confirm="<?= I18N::translate('Move the media object?') ?>" data-fact-id="<?= e($fact->getFactId()) ?>" data-tree-id="<?= e($tree->id()) ?>" - data-individual-xref="<?= e($individual->getXref()) ?>" - data-media-xref="<?= e($media->getXref()) ?>" + data-individual-xref="<?= e($individual->xref()) ?>" + data-media-xref="<?= e($media->xref()) ?>" type="button" > <?= $fact->label() ?> diff --git a/resources/views/admin/merge-records-step-2.phtml b/resources/views/admin/merge-records-step-2.phtml index 8ec42b5d69..b934ff0367 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->name(), 'xref1' => $record1->getXref(), 'xref2' => $record2->getXref()])) ?>" method="POST"> +<form action="<?= e(route('merge-records', ['ged' => $tree->name(), 'xref1' => $record1->xref(), 'xref2' => $record2->xref()])) ?>" 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 032ed38649..7d8da4778c 100644 --- a/resources/views/admin/trees-duplicates.phtml +++ b/resources/views/admin/trees-duplicates.phtml @@ -15,12 +15,12 @@ <?php foreach ($duplicates as $record) : ?> — <a href="<?= e($record->url()) ?>"> - <?= $record->getXref() ?> + <?= $record->xref() ?> </a> <?php endforeach ?> <?php if (count($duplicates) === 2) : ?> — - <a href="<?= e(route('merge-records', ['ged' => $tree->name(), 'xref1' => $duplicates[0]->getXref(), 'xref2' => $duplicates[1]->getXref()])) ?>"> + <a href="<?= e(route('merge-records', ['ged' => $tree->name(), 'xref1' => $duplicates[0]->xref(), 'xref2' => $duplicates[1]->xref()])) ?>"> <?= I18N::translate('Merge') ?> </a> <?php endif ?> diff --git a/resources/views/admin/webtrees1-thumbnails-form.phtml b/resources/views/admin/webtrees1-thumbnails-form.phtml index 2c87579cf7..a13045a634 100644 --- a/resources/views/admin/webtrees1-thumbnails-form.phtml +++ b/resources/views/admin/webtrees1-thumbnails-form.phtml @@ -4,7 +4,7 @@ <input type="hidden" name="thumbnail" value="<?= e($thumbnail) ?>"> <?php foreach ($media as $medium) : ?> <input type="hidden" name="ged[]" value="<?= e($medium->getTree()->name()) ?>"> - <input type="hidden" name="xref[]" value="<?= e($medium->getXref()) ?>"> + <input type="hidden" name="xref[]" value="<?= e($medium->xref()) ?>"> <?php endforeach ?> <div class="btn-group"> <?php if (!empty($media)) : ?> diff --git a/resources/views/ancestors-page.phtml b/resources/views/ancestors-page.phtml index 6e902188a5..821d091647 100644 --- a/resources/views/ancestors-page.phtml +++ b/resources/views/ancestors-page.phtml @@ -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()->name(), '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->xref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => $chart_style, 'show_cousins' => $show_cousins])) ?>"></div> diff --git a/resources/views/compact-tree-arrow.phtml b/resources/views/compact-tree-arrow.phtml index 00ab56b5dd..8dd8a186ea 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()->name()])]) ?> + <?= FontAwesome::linkIcon($class, I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->xref(), 'ged' => $individual->getTree()->name()])]) ?> <?php endif; diff --git a/resources/views/compact-tree-page.phtml b/resources/views/compact-tree-page.phtml index aac7831be9..ee486d22e7 100644 --- a/resources/views/compact-tree-page.phtml +++ b/resources/views/compact-tree-page.phtml @@ -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()->name()])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-compact-chart" data-ajax-url="<?= e(route('compact-tree-chart', ['xref' => $individual->xref(), 'ged' => $individual->getTree()->name()])) ?>"></div> diff --git a/resources/views/descendants-page.phtml b/resources/views/descendants-page.phtml index 162c28f8d3..17d64534a6 100644 --- a/resources/views/descendants-page.phtml +++ b/resources/views/descendants-page.phtml @@ -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()->name(), '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->xref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => $chart_style])) ?>"></div> diff --git a/resources/views/edit/add-fact.phtml b/resources/views/edit/add-fact.phtml index 5e7d41c67d..9ec738c5b6 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->name(), 'xref' => $record->getXref()])) ?>" method="post"> +<form class="wt-page-content" action="<?= e(route('update-fact', ['ged' => $tree->name(), 'xref' => $record->xref()])) ?>" 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 ec140cad2e..fd260da695 100644 --- a/resources/views/edit/change-family-members.phtml +++ b/resources/views/edit/change-family-members.phtml @@ -8,7 +8,7 @@ <?= csrf_field() ?> <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> - <input type="hidden" name="xref" value="<?= e($family->getXref()) ?>"> + <input type="hidden" name="xref" value="<?= e($family->xref()) ?>"> <div class="form-group row"> <label class="col-sm-3 col-form-label wt-page-options-label" for="HUSB"> diff --git a/resources/views/edit/edit-fact.phtml b/resources/views/edit/edit-fact.phtml index c8ac5a1c0b..4fc786ee11 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->name(), '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->xref(), '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->name()])) ?>"> + <a class="btn btn-link" href="<?= e(route('edit-raw-fact', ['xref' => $record->xref(), '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 b47dadc331..c67d8451a3 100644 --- a/resources/views/edit/new-individual.phtml +++ b/resources/views/edit/new-individual.phtml @@ -10,10 +10,10 @@ <?php if ($individual !== null) { - $xref = $individual->getXref(); + $xref = $individual->xref(); $cancel_url = $individual->url(); } elseif ($family !== null) { - $xref = $family->getXref(); + $xref = $family->xref(); $cancel_url = $family->url(); } else { $cancel_url = route('admin-trees'); diff --git a/resources/views/edit/raw-gedcom-fact.phtml b/resources/views/edit/raw-gedcom-fact.phtml index cab24087dc..3b2ff9658e 100644 --- a/resources/views/edit/raw-gedcom-fact.phtml +++ b/resources/views/edit/raw-gedcom-fact.phtml @@ -6,7 +6,7 @@ <form class="wt-page-content" method="post"> <?= csrf_field() ?> <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="xref" value="<?= e($fact->record()->xref()) ?>"> <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 eb658d92a3..97219bb18f 100644 --- a/resources/views/edit/raw-gedcom-record.phtml +++ b/resources/views/edit/raw-gedcom-record.phtml @@ -7,7 +7,7 @@ <form class="wt-page-content" method="post"> <?= csrf_field() ?> <input type="hidden" name="ged" value="<?= e($tree->name()) ?>"> - <input type="hidden" name="xref" value="<?= e($record->getXref()) ?>"> + <input type="hidden" name="xref" value="<?= e($record->xref()) ?>"> <p class="text-muted small"> <?= I18N::translate('This page allows you to bypass the usual forms, and edit the underlying data directly. It is an advanced option, and you should not use it unless you understand the GEDCOM format. If you make a mistake here, it can be difficult to fix.') ?> @@ -21,7 +21,7 @@ <?= $record->getFullName() ?> </label> <div class="card-body form-control py-1 px-2"> - <textarea class="card-body form-control py-1 px-2" dir="ltr" id="fact0" rows="1">0 @<?= e($record->getXref()) ?>@ <?= e($record::RECORD_TYPE) ?></textarea> + <textarea class="card-body form-control py-1 px-2" dir="ltr" id="fact0" rows="1">0 @<?= e($record->xref()) ?>@ <?= e($record::RECORD_TYPE) ?></textarea> </div> </div> diff --git a/resources/views/family-book-page.phtml b/resources/views/family-book-page.phtml index 39053b9c8c..815f6a1ed9 100644 --- a/resources/views/family-book-page.phtml +++ b/resources/views/family-book-page.phtml @@ -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()->name(), '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->xref(), '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 e71f6c3606..0cfcffe12c 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()->name(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-change" href="<?= e(route('change-family-members', ['ged' => $record->getTree()->name(), 'xref' => $record->xref()])) ?>"> <?= 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()->name(), '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->xref()])) ?>"> <?= 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()->name(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-orderchil" href="<?= e(route('reorder-children', ['ged' => $record->getTree()->name(), 'xref' => $record->xref()])) ?>"> <?= 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()->name()) ?>');"> + <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->xref()) ?>', '<?= 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()->name(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-fam-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->xref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml index 9cac6c292e..1f44e9e76b 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->name(), 'xref' => $record->getXref(), 'famtag' => 'HUSB'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->name(), 'xref' => $record->xref(), '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()->name(), 'xref' => $record->getXref(), 'famtag' => 'WIFE'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->getTree()->name(), 'xref' => $record->xref(), '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()->name(), 'xref' => $record->getXref(), 'fact' => 'NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->xref(), '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()->name(), 'xref' => $record->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->xref(), '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()->name(), 'xref' => $record->getXref(), 'fact' => 'OBJE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->xref(), '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()->name(), 'xref' => $record->getXref(), 'fact' => 'SOUR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $record->getTree()->name(), 'xref' => $record->xref(), '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 0dc2f482cb..6eb87ce8e9 100644 --- a/resources/views/fan-page.phtml +++ b/resources/views/fan-page.phtml @@ -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()->name(), '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->xref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'chart_style' => $chart_style, 'fan_width' => $fan_width])) ?>"></div> diff --git a/resources/views/gedcom-record-page-menu.phtml b/resources/views/gedcom-record-page-menu.phtml index 3ac9a1385a..233f0e2df4 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()->name()) ?>');"> + <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->xref()) ?>', '<?= 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()->name(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->xref()])) ?>"> <?= 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 a4ccbe7f72..10a7d3fad6 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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 cf6f8111ca..f9fc03f0e1 100644 --- a/resources/views/hourglass-page.phtml +++ b/resources/views/hourglass-page.phtml @@ -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()->name()])) ?>"></div> +<div class="wt-ajax-load wt-page-content wt-chart wt-hourglass-chart" data-ajax-url="<?= e(route('hourglass-chart', ['xref' => $individual->xref(), '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 6c5ed3e8fa..3f7df6cf77 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()->name(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?= I18N::translate('Edit the gender') ?> </a> <?php endif ?> - <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-name', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-name', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?= 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()->name(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('reorder-names', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?= 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()->name(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?= 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()->name()) ?>');"> + <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->xref()) ?>', '<?= 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()->name(), 'xref' => $individual->getXref()])) ?>"> + <a class="dropdown-item menu-indi-editraw" href="<?= e(route('edit-raw-record', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml index 8fb15ee971..0d6b242b25 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()->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'), + 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->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'), + 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->name(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('reorder-media', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?= 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()->name(), 'xref' => $individual->getXref(), 'fact' => 'OBJE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref(), '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()->name(), '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->xref(), 'ged' => $individual->getTree()->name(), 'module' => $tab->getName()])) ?>" href="#<?= $tab->getName() ?>"> <?= $tab->getTitle() ?> </a> </li> diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml index 8fd74ee734..55529c2be9 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()->name()])) ?>" title="<?= I18N::translate('Relationships') ?>" rel="nofollow"> + <a href="<?= e(route('relationships', ['xref1' => $individuals[1]->xref(), 'xref2' => $individual->xref(), 'ged' => $individual->getTree()->name()])) ?>" title="<?= I18N::translate('Relationships') ?>" rel="nofollow"> <?= I18N::number($key) ?> </a> <?php endif ?> @@ -274,7 +274,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <!-- Birth anniversary --> <td class="center" data-sort="<?= -$individual->getEstimatedBirthDate()->julianDay() ?>"> - <?php if (isset($birth_dates[0]) && $birth_dates[0]->gregorianYear() >= 1550 && $birth_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->getXref()])) : ?> + <?php if (isset($birth_dates[0]) && $birth_dates[0]->gregorianYear() >= 1550 && $birth_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->xref()])) : ?> <?php $birt_by_decade[(int) ($birth_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?> <?= Date::getAge($birth_dates[0], null) ?> <?php endif ?> @@ -306,7 +306,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <!-- Death anniversary --> <td class="center" data-sort="<?= -$individual->getEstimatedDeathDate()->julianDay() ?>"> - <?php if (isset($death_dates[0]) && $death_dates[0]->gregorianYear() >= 1550 && $death_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->getXref()])) : ?> + <?php if (isset($death_dates[0]) && $death_dates[0]->gregorianYear() >= 1550 && $death_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->xref()])) : ?> <?php $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?> <?= Date::getAge($death_dates[0], null) ?> <?php endif ?> @@ -316,7 +316,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <?php if (isset($birth_dates[0]) && isset($death_dates[0])) : ?> <?php $age_at_death = I18N::number((int) Date::getAgeYears($birth_dates[0], $death_dates[0])); ?> <?php $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0]); ?> - <?php if (!isset($unique_indis[$individual->getXref()]) && $age_at_death >= 0 && $age_at_death <= $max_age) : ?> + <?php if (!isset($unique_indis[$individual->xref()]) && $age_at_death >= 0 && $age_at_death <= $max_age) : ?> <?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?> <?php endif ?> <?php else : ?> @@ -377,7 +377,7 @@ for ($year = 1550; $year < 2030; $year += 10) { </td> </tr> - <?php $unique_indis[$individual->getXref()] = true ?> + <?php $unique_indis[$individual->xref()] = true ?> <?php endforeach ?> </tbody> </table> diff --git a/resources/views/lists/media-table.phtml b/resources/views/lists/media-table.phtml index 3831379758..f23639630c 100644 --- a/resources/views/lists/media-table.phtml +++ b/resources/views/lists/media-table.phtml @@ -61,18 +61,18 @@ $count_sources = Database::prepare( </td> <!-- Count of linked individuals --> - <td class="center" data-sort="<?= $count_individuals[$media_object->getXref()] ?? 0 ?>"> - <?= I18N::number($count_individuals[$media_object->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_individuals[$media_object->xref()] ?? 0 ?>"> + <?= I18N::number($count_individuals[$media_object->xref()] ?? 0) ?> </td> <!-- Count of linked families --> - <td class="center" data-sort="<?= $count_families[$media_object->getXref()] ?? 0 ?>"> - <?= I18N::number($count_families[$media_object->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_families[$media_object->xref()] ?? 0 ?>"> + <?= I18N::number($count_families[$media_object->xref()] ?? 0) ?> </td> <!-- Count of sources --> - <td class="center" data-sort="<?= $count_sources[$media_object->getXref()] ?? 0 ?>"> - <?= I18N::number($count_sources[$media_object->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_sources[$media_object->xref()] ?? 0 ?>"> + <?= I18N::number($count_sources[$media_object->xref()] ?? 0) ?> </td> <!-- Last change --> diff --git a/resources/views/lists/notes-table.phtml b/resources/views/lists/notes-table.phtml index 08f39d7b36..c76567941d 100644 --- a/resources/views/lists/notes-table.phtml +++ b/resources/views/lists/notes-table.phtml @@ -57,23 +57,23 @@ $count_sources = Database::prepare( </td> <!-- Count of linked individuals --> - <td class="center" data-sort="<?= $count_individuals[$note->getXref()] ?? 0 ?>"> - <?= I18N::number($count_individuals[$note->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_individuals[$note->xref()] ?? 0 ?>"> + <?= I18N::number($count_individuals[$note->xref()] ?? 0) ?> </td> <!-- Count of linked families --> - <td class="center" data-sort="<?= $count_families[$note->getXref()] ?? 0 ?>"> - <?= I18N::number($count_families[$note->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_families[$note->xref()] ?? 0 ?>"> + <?= I18N::number($count_families[$note->xref()] ?? 0) ?> </td> <!-- Count of linked media objects --> - <td class="center" data-sort="<?= $count_media[$note->getXref()] ?? 0 ?>"> - <?= I18N::number($count_media[$note->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_media[$note->xref()] ?? 0 ?>"> + <?= I18N::number($count_media[$note->xref()] ?? 0) ?> </td> <!-- Count of sources --> - <td class="center" data-sort="<?= $count_sources[$note->getXref()] ?? 0 ?>"> - <?= I18N::number($count_sources[$note->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_sources[$note->xref()] ?? 0 ?>"> + <?= I18N::number($count_sources[$note->xref()] ?? 0) ?> </td> <!-- Last change --> diff --git a/resources/views/lists/repositories-table.phtml b/resources/views/lists/repositories-table.phtml index 21aacc911a..f16f1be22b 100644 --- a/resources/views/lists/repositories-table.phtml +++ b/resources/views/lists/repositories-table.phtml @@ -42,8 +42,8 @@ $count_sources = Database::prepare( </td> <!-- Count of linked sources --> - <td class="center" data-sort="<?= $count_sources[$repository->getXref()] ?? 0 ?>"> - <?= I18N::number($count_sources[$repository->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_sources[$repository->xref()] ?? 0 ?>"> + <?= I18N::number($count_sources[$repository->xref()] ?? 0) ?> </td> <!-- Last change --> diff --git a/resources/views/lists/sources-table.phtml b/resources/views/lists/sources-table.phtml index 2961dbcbea..a1dc57ade7 100644 --- a/resources/views/lists/sources-table.phtml +++ b/resources/views/lists/sources-table.phtml @@ -64,23 +64,23 @@ $count_notes = Database::prepare( </td> <!-- Count of linked individuals --> - <td class="center" data-sort="<?= $count_individuals[$source->getXref()] ?? 0 ?>"> - <?= I18N::number($count_individuals[$source->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_individuals[$source->xref()] ?? 0 ?>"> + <?= I18N::number($count_individuals[$source->xref()] ?? 0) ?> </td> <!-- Count of linked families --> - <td class="center" data-sort="<?= $count_families[$source->getXref()] ?? 0 ?>"> - <?= I18N::number($count_families[$source->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_families[$source->xref()] ?? 0 ?>"> + <?= I18N::number($count_families[$source->xref()] ?? 0) ?> </td> <!-- Count of linked media objects --> - <td class="center" data-sort="<?= $count_media[$source->getXref()] ?? 0 ?>"> - <?= I18N::number($count_media[$source->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_media[$source->xref()] ?? 0 ?>"> + <?= I18N::number($count_media[$source->xref()] ?? 0) ?> </td> <!-- Count of linked notes --> - <td class="center" data-sort="<?= $count_notes[$source->getXref()] ?? 0 ?>"> - <?= I18N::number($count_notes[$source->getXref()] ?? 0) ?> + <td class="center" data-sort="<?= $count_notes[$source->xref()] ?? 0 ?>"> + <?= I18N::number($count_notes[$source->xref()] ?? 0) ?> </td> <!-- Last change --> diff --git a/resources/views/media-page-menu.phtml b/resources/views/media-page-menu.phtml index de323b312a..a8e6df21ce 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()->name()) ?>');"> + <a class="dropdown-item menu-obje-link" href="#" onclick="return ilinkitem('<?= e($record->xref()) ?>','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()->name(), '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->xref()])) ?>" 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()->name(), '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->xref()])) ?>" 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()->name(), '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->xref()])) ?>" 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()->name()) ?>');"> + <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->xref()) ?>', '<?= 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()->name(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-obje-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->xref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/media-page.phtml b/resources/views/media-page.phtml index cf47bba253..49d7ba7879 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->name(), '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->xref(), '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()->name()) . '", , "' . 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->xref()) . '", "' . $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()->name(), 'xref' => $media->getXref(), 'fact' => 'SOUR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->name(), 'xref' => $media->xref(), '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()->name(), 'xref' => $media->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->name(), 'xref' => $media->xref(), '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()->name(), 'xref' => $media->getXref(), 'fact' => 'RESN'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $media->getTree()->name(), 'xref' => $media->xref(), '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()->name(), '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->xref()])) ?>" data-target="#wt-ajax-modal" data-toggle="modal"> <?= I18N::translate('Add a media file') ?> </a> </td> diff --git a/resources/views/modals/add-media-file.phtml b/resources/views/modals/add-media-file.phtml index bbfcee1905..bca4c82733 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()->name()])) ?>" enctype="multipart/form-data" method="POST"> +<form action="<?= e(route('add-media-file', ['xref' => $media->xref(), '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/edit-media-file.phtml b/resources/views/modals/edit-media-file.phtml index 9ac91330ca..9eac8880ef 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()->name(), 'fact_id' => $media_file->factId()])) ?>" enctype="multipart/form-data" method="POST"> +<form action="<?= e(route('edit-media-file', ['xref' => $media->xref(), '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 f9d92f22a9..18e8814f22 100644 --- a/resources/views/modals/link-media-to-family.phtml +++ b/resources/views/modals/link-media-to-family.phtml @@ -4,7 +4,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->name()) ?>"> - <input type="hidden" name="xref" value="<?= e($media->getXref()) ?>"> + <input type="hidden" name="xref" value="<?= e($media->xref()) ?>"> <?= 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 31cb2044b5..63df4b3434 100644 --- a/resources/views/modals/link-media-to-individual.phtml +++ b/resources/views/modals/link-media-to-individual.phtml @@ -4,7 +4,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->name()) ?>"> - <input type="hidden" name="xref" value="<?= e($media->getXref()) ?>"> + <input type="hidden" name="xref" value="<?= e($media->xref()) ?>"> <?= 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 d3fe184a3d..3537e2673b 100644 --- a/resources/views/modals/link-media-to-source.phtml +++ b/resources/views/modals/link-media-to-source.phtml @@ -4,7 +4,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->name()) ?>"> - <input type="hidden" name="xref" value="<?= e($media->getXref()) ?>"> + <input type="hidden" name="xref" value="<?= e($media->xref()) ?>"> <?= view('modals/header', ['title' => I18N::translate('Link this media object to a source')]) ?> diff --git a/resources/views/modules/clippings/show.phtml b/resources/views/modules/clippings/show.phtml index 20f4bfdb82..f9404a50d6 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->name(), 'xref' => $record->getXref()])) ?>"> + <form method="post" action="<?= e(route('module', ['module' => 'clippings', 'action' => 'Remove', 'ged' => $tree->name(), 'xref' => $record->xref()])) ?>"> <?= csrf_field() ?> <button type="submit" class="btn btn-link" title="<?= I18N::translate('Remove') ?>"> <i class="icon-remove"></i> diff --git a/resources/views/modules/family_nav/sidebar-family.phtml b/resources/views/modules/family_nav/sidebar-family.phtml index 0eb3a8e188..116fc52ebf 100644 --- a/resources/views/modules/family_nav/sidebar-family.phtml +++ b/resources/views/modules/family_nav/sidebar-family.phtml @@ -16,7 +16,7 @@ <i class="icon-selected"></i> <?php elseif ($spouse->getPrimaryChildFamily() !== null) : ?> <div class="dropdown"> - <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($spouse->getXref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($spouse->xref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <?= Functions::getCloseRelationshipName($individual, $spouse) ?> </a> @@ -59,7 +59,7 @@ <i class="icon-selected"></i> <?php elseif ($child->getSpouseFamilies() !== []) : ?> <div class="dropdown"> - <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($child->getXref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($child->xref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <?= Functions::getCloseRelationshipName($individual, $child) ?> </a> diff --git a/resources/views/modules/notes/tab.phtml b/resources/views/modules/notes/tab.phtml index d746883ff8..fd62e2d29f 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()->name(), 'xref' => $individual->getXref(), 'fact' => 'NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref(), '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()->name(), 'xref' => $individual->getXref(), 'fact' => 'SHARED_NOTE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref(), 'fact' => 'SHARED_NOTE'])) ?>"> <?= I18N::translate('Add a shared note') ?> </a> </td> diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml index c1781d1482..68f6b998b1 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()->name(), 'xref' => $family->getXref(), 'famtag' => 'HUSB'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->name(), 'xref' => $family->xref(), '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()->name(), 'xref' => $family->getXref(), 'famtag' => 'WIFE'])) ?>"> + <a href="<?= e(route('add-spouse-to-family', ['ged' => $family->getTree()->name(), 'xref' => $family->xref(), '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()->name(), 'xref' => $family->getXref(), 'fact' => 'MARR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $family->getTree()->name(), 'xref' => $family->xref(), '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()->name(), 'xref' => $family->getXref()])) ?>"> + <a href="<?= e(route('reorder-children', ['ged' => $family->getTree()->name(), 'xref' => $family->xref()])) ?>"> <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()->name(), 'xref' => $family->getXref()])) ?>"> + <a href="<?= e(route('add-child-to-family', ['gender' => 'U', 'ged' => $family->getTree()->name(), 'xref' => $family->xref()])) ?>"> <?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()->name(), '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->xref()])) ?>" class="icon-sex_m_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> + <a href="<?= e(route('add-child-to-family', ['gender' => 'F', 'ged' => $family->getTree()->name(), 'xref' => $family->xref()])) ?>" 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 2329da77c5..6346bb26b3 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()->name(), 'xref' => $individual->getXref(), 'gender' => 'M'])) ?>"> + <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref(), 'gender' => 'M'])) ?>"> <?= I18N::translate('Add a father') ?> </a> </td> </tr> <tr> <td> - <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->getXref(), 'gender' => 'F'])) ?>"> + <a href="<?= e(route('add-parent-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref(), '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()->name(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('reorder-spouses', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?= 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()->name(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('link-child-to-family', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?= 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()->name(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('add-spouse-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?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()->name(), 'xref' => $individual->getXref()])) ?>"> + <a href="<?= e(route('link-spouse-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref()])) ?>"> <?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()->name(), 'xref' => $individual->getXref(), 'gender' => 'U'])) ?>"> + <a href="<?= e(route('add-child-to-individual', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref(), '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 5beb995847..7ed894de02 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()->name(), 'xref' => $individual->getXref(), 'fact' => 'SOUR'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $individual->getTree()->name(), 'xref' => $individual->xref(), 'fact' => 'SOUR'])) ?>"> <?= I18N::translate('Add a source citation') ?> </a> </td> diff --git a/resources/views/modules/stories/tab.phtml b/resources/views/modules/stories/tab.phtml index 14817994ae..9767de219d 100644 --- a/resources/views/modules/stories/tab.phtml +++ b/resources/views/modules/stories/tab.phtml @@ -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->name()])) ?>"> + <a href="<?= e(route('module', ['module' => 'stories', 'action' => 'AdminEdit', 'xref' => $individual->xref(), 'ged' => $tree->name()])) ?>"> <?= I18N::translate('Add a story') ?> </a> </div> diff --git a/resources/views/note-page-menu.phtml b/resources/views/note-page-menu.phtml index c8ed01d7ae..6e56a244d9 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()->name()) ?>');"> + <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->xref()) ?>', '<?= 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()->name(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-note-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->xref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/note-page.phtml b/resources/views/note-page.phtml index cf69fe5992..ca766aee32 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->name()])]) ?> + <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => route('edit-note-object', ['xref' => $note->xref(), 'ged' => $note->getTree()->name()])]) ?> </div> <?php endif ?> </th> diff --git a/resources/views/pedigree-page.phtml b/resources/views/pedigree-page.phtml index b8677d4374..5f589126a9 100644 --- a/resources/views/pedigree-page.phtml +++ b/resources/views/pedigree-page.phtml @@ -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()->name(), '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->xref(), 'ged' => $individual->getTree()->name(), 'generations' => $generations, 'orientation' => $orientation])) ?>"></div> diff --git a/resources/views/relationships-page.phtml b/resources/views/relationships-page.phtml index d43d5a8486..95508cea07 100644 --- a/resources/views/relationships-page.phtml +++ b/resources/views/relationships-page.phtml @@ -80,8 +80,8 @@ <?php if ($individual1 !== null && $individual2 !== null) : ?> <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(), + 'xref1' => $individual1->xref(), + 'xref2' => $individual2->xref(), 'ged' => $individual2->getTree()->name(), 'recursion' => $recursion, 'ancestors' => $ancestors, diff --git a/resources/views/repository-page-menu.phtml b/resources/views/repository-page-menu.phtml index 5d2fdef2b1..5cbe4f6161 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()->name()) ?>');"> + <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->xref()) ?>', '<?= 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()->name(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-repo-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->xref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/repository-page.phtml b/resources/views/repository-page.phtml index 70010496ce..094d1e35af 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref() . '\');">' . 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/source-page-menu.phtml b/resources/views/source-page-menu.phtml index 0f62a493c7..b98c1f7706 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()->name()) ?>');"> + <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->xref()) ?>', '<?= 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()->name(), 'xref' => $record->getXref()])) ?>"> + <a class="dropdown-item menu-sour-editraw" href="<?= e(route('edit-raw-record', ['ged' => $record->getTree()->name(), 'xref' => $record->xref()])) ?>"> <?= I18N::translate('Edit the raw GEDCOM') ?> </a> <?php endif ?> diff --git a/resources/views/source-page.phtml b/resources/views/source-page.phtml index 4726389448..09c4121e06 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref()) . '\', \'' . 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()->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')]) ?> + <?= 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->xref()) . '\', \'' . 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->xref() . '\');">' . 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()->name(), 'xref' => $source->getXref(), 'fact' => 'OBJE'])) ?>"> + <a href="<?= e(route('add-fact', ['ged' => $source->getTree()->name(), 'xref' => $source->xref(), 'fact' => 'OBJE'])) ?>"> <?= I18N::translate('Add a media object') ?> </a> </td> diff --git a/resources/views/timeline-chart.phtml b/resources/views/timeline-chart.phtml index 50f74144b9..3cc349edeb 100644 --- a/resources/views/timeline-chart.phtml +++ b/resources/views/timeline-chart.phtml @@ -15,14 +15,14 @@ var birthdays = []; <?php foreach ($individuals as $c => $indi) { - if (!empty($birthyears[$indi->getXref()])) { - echo 'birthyears[' . $c . ']=' . $birthyears[$indi->getXref()] . ';'; + if (!empty($birthyears[$indi->xref()])) { + echo 'birthyears[' . $c . ']=' . $birthyears[$indi->xref()] . ';'; } - if (!empty($birthmonths[$indi->getXref()])) { - echo 'birthmonths[' . $c . ']=' . $birthmonths[$indi->getXref()] . ';'; + if (!empty($birthmonths[$indi->xref()])) { + echo 'birthmonths[' . $c . ']=' . $birthmonths[$indi->xref()] . ';'; } - if (!empty($birthdays[$indi->getXref()])) { - echo 'birthdays[' . $c . ']=' . $birthdays[$indi->getXref()] . ';'; + if (!empty($birthdays[$indi->xref()])) { + echo 'birthdays[' . $c . ']=' . $birthdays[$indi->xref()] . ';'; } } ?> @@ -399,7 +399,7 @@ <img src="<?= Theme::theme()->parameter('image-hline') ?>" name="ageline<?= $p ?>" id="ageline<?= $p ?>" width="25" height="3"> </td> <td> - <?php if (!empty($birthyears[$indi->getXref()])) : ?> + <?php if (!empty($birthyears[$indi->xref()])) : ?> <?php $tyear = round(($ageyoffset + ($bheight / 2)) / $scale) + $baseyear; ?> <table class="person<?= $p % 6 ?>" style="cursor: hand;"> <tr> @@ -410,7 +410,7 @@ </span> </td> <td> - (<?= I18N::translate('Age') ?> <span id="ageform<?= $p ?>" class="field"><?= $tyear - $birthyears[$indi->getXref()] ?></span>) + (<?= I18N::translate('Age') ?> <span id="ageform<?= $p ?>" class="field"><?= $tyear - $birthyears[$indi->xref()] ?></span>) </td> </tr> </table> diff --git a/resources/views/timeline-page.phtml b/resources/views/timeline-page.phtml index 5231fa0859..6ff55313de 100644 --- a/resources/views/timeline-page.phtml +++ b/resources/views/timeline-page.phtml @@ -11,7 +11,7 @@ <input type="hidden" name="scale" value="<?= e($scale) ?>"> <?php foreach ($individuals as $individual) : ?> - <input name="xrefs[]" type="hidden" value="<?= e($individual->getXref()) ?>"> + <input name="xrefs[]" type="hidden" value="<?= e($individual->xref()) ?>"> <?php endforeach ?> <div class="row form-group"> @@ -57,7 +57,7 @@ <?= $individual->getAddName() ?> <?php endif ?> </a> - <a href="<?= e($remove_urls[$individual->getXref()]) ?>"> + <a href="<?= e($remove_urls[$individual->xref()]) ?>"> <?= I18N::translate('Remove individual') ?> </a> <?php if ($individual->getBirthDate()->isOK()) : ?> |