diff options
Diffstat (limited to 'resources/views')
| -rw-r--r-- | resources/views/edit/add-fact-row.phtml | 4 | ||||
| -rw-r--r-- | resources/views/edit/add-fact.phtml | 4 | ||||
| -rw-r--r-- | resources/views/edit/edit-fact.phtml | 2 | ||||
| -rw-r--r-- | resources/views/family-page.phtml | 3 | ||||
| -rw-r--r-- | resources/views/gedcom-record-page.phtml | 2 | ||||
| -rw-r--r-- | resources/views/icons/record.phtml | 14 | ||||
| -rw-r--r-- | resources/views/media-page.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/personal_facts/tab.phtml | 9 | ||||
| -rw-r--r-- | resources/views/modules/recent_changes/changes-table.phtml | 16 | ||||
| -rw-r--r-- | resources/views/note-page.phtml | 3 | ||||
| -rw-r--r-- | resources/views/repository-page.phtml | 3 | ||||
| -rw-r--r-- | resources/views/source-page.phtml | 3 | ||||
| -rw-r--r-- | resources/views/submitter-page.phtml | 3 |
13 files changed, 37 insertions, 31 deletions
diff --git a/resources/views/edit/add-fact-row.phtml b/resources/views/edit/add-fact-row.phtml index cec1c029d9..e2b2533644 100644 --- a/resources/views/edit/add-fact-row.phtml +++ b/resources/views/edit/add-fact-row.phtml @@ -34,7 +34,7 @@ use Fisharebest\Webtrees\Individual; <?php foreach ($add_facts as $fact => $fact_name) : ?> <option value="<?= $fact ?>"><?= $fact_name ?></option> <?php endforeach ?> - <?php if ($record::RECORD_TYPE === Individual::RECORD_TYPE || $record::RECORD_TYPE === Family::RECORD_TYPE) : ?> + <?php if ($record->tag() === Individual::RECORD_TYPE || $record->tag() === Family::RECORD_TYPE) : ?> <option value="FACT"> <?= I18N::translate('Custom fact') ?> </option> @@ -58,7 +58,7 @@ use Fisharebest\Webtrees\Individual; 'xref' => $record->xref(), 'tree' => $tree->name(), ])) ?>"> - <?= GedcomTag::getLabel($record::RECORD_TYPE . ':' . $fact) ?> + <?= GedcomTag::getLabel($record->tag() . ':' . $fact) ?> </a> <?php endforeach ?> </div> diff --git a/resources/views/edit/add-fact.phtml b/resources/views/edit/add-fact.phtml index e4ff68b890..d509d560f0 100644 --- a/resources/views/edit/add-fact.phtml +++ b/resources/views/edit/add-fact.phtml @@ -17,12 +17,12 @@ use Ramsey\Uuid\Uuid; <?php FunctionsEdit::createAddForm($tree, $fact) ?> - <?php if ($record::RECORD_TYPE === 'SOUR' && $fact === 'DATA') : ?> + <?php if ($record->tag() === 'SOUR' && $fact === 'DATA') : ?> <?= view('cards/add-note', ['level' => 2, 'tree' => $tree]) ?> <?= view('cards/add-shared-note', ['level' => 2, 'tree' => $tree]) ?> <?php endif ?> - <?php if (($record::RECORD_TYPE === 'INDI' || $record::RECORD_TYPE === 'FAM') && $fact !== 'OBJE' && $fact !== 'NOTE' && $fact !== 'SHARED_NOTE' && $fact !== 'REPO' && $fact !== 'SOUR' && $fact !== 'SUBM' && $fact !== 'ASSO' && $fact !== 'ALIA' && $fact !== 'SEX') : ?> + <?php if (($record->tag() === 'INDI' || $record->tag() === 'FAM') && $fact !== 'OBJE' && $fact !== 'NOTE' && $fact !== 'SHARED_NOTE' && $fact !== 'REPO' && $fact !== 'SOUR' && $fact !== 'SUBM' && $fact !== 'ASSO' && $fact !== 'ALIA' && $fact !== 'SEX') : ?> <?= view('cards/add-source-citation', [ 'level' => 2, 'full_citations' => $tree->getPreference('FULL_SOURCES'), diff --git a/resources/views/edit/edit-fact.phtml b/resources/views/edit/edit-fact.phtml index 86e87ff323..366f8f251c 100644 --- a/resources/views/edit/edit-fact.phtml +++ b/resources/views/edit/edit-fact.phtml @@ -21,7 +21,7 @@ use Ramsey\Uuid\Uuid; <?php $level1type = $edit_fact->getTag(); - switch ($record::RECORD_TYPE) { + switch ($record->tag()) { case 'SOUR': if ($level1type === 'DATA') { // SOUR:DATA facts may take a NOTE (but the SOUR record may not). diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml index 79b31d5dfd..37566991c1 100644 --- a/resources/views/family-page.phtml +++ b/resources/views/family-page.phtml @@ -1,6 +1,7 @@ <?php use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Functions\FunctionsPrint; use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; use Fisharebest\Webtrees\Http\RequestHandlers\AddNewFact; @@ -65,7 +66,7 @@ use Fisharebest\Webtrees\View; <?php if (Auth::isEditor($record->tree())) : ?> <?= view('edit/paste-fact-row', ['record' => $record, 'facts' => $clipboard_facts]) ?> - <?php FunctionsPrint::printAddNewFact($record, $facts, 'FAM') ?> + <?php FunctionsPrint::printAddNewFact($record, $facts, Family::RECORD_TYPE) ?> <tr> <th scope="row"> <?= I18N::translate('Note') ?> diff --git a/resources/views/gedcom-record-page.phtml b/resources/views/gedcom-record-page.phtml index b9e3e87ed2..516d28d507 100644 --- a/resources/views/gedcom-record-page.phtml +++ b/resources/views/gedcom-record-page.phtml @@ -114,7 +114,7 @@ use Illuminate\Support\Collection; <?php endforeach ?> <?php if ($record->canEdit()) : ?> - <?php FunctionsPrint::printAddNewFact($record, $facts, $record::RECORD_TYPE) ?> + <?php FunctionsPrint::printAddNewFact($record, $facts, $record->tag()) ?> <?php endif ?> </table> </div> diff --git a/resources/views/icons/record.phtml b/resources/views/icons/record.phtml index dac68cf43b..f16efa80e5 100644 --- a/resources/views/icons/record.phtml +++ b/resources/views/icons/record.phtml @@ -13,18 +13,18 @@ use Fisharebest\Webtrees\Submitter; * @var GedcomRecord $record */ ?> -<?php if ($record::RECORD_TYPE === Individual::RECORD_TYPE) : ?> +<?php if ($record->tag() === Individual::RECORD_TYPE) : ?> <?= view('icons/individual') ?> -<?php elseif ($record::RECORD_TYPE === Family::RECORD_TYPE) : ?> +<?php elseif ($record->tag() === Family::RECORD_TYPE) : ?> <?= view('icons/family') ?> -<?php elseif ($record::RECORD_TYPE === Source::RECORD_TYPE) : ?> +<?php elseif ($record->tag() === Source::RECORD_TYPE) : ?> <?= view('icons/source') ?> -<?php elseif ($record::RECORD_TYPE === Repository::RECORD_TYPE) : ?> +<?php elseif ($record->tag() === Repository::RECORD_TYPE) : ?> <?= view('icons/repository') ?> -<?php elseif ($record::RECORD_TYPE === Note::RECORD_TYPE) : ?> +<?php elseif ($record->tag() === Note::RECORD_TYPE) : ?> <?= view('icons/note') ?> -<?php elseif ($record::RECORD_TYPE === Media::RECORD_TYPE) : ?> +<?php elseif ($record->tag() === Media::RECORD_TYPE) : ?> <?= view('icons/media') ?> -<?php elseif ($record::RECORD_TYPE === Submitter::RECORD_TYPE) : ?> +<?php elseif ($record->tag() === Submitter::RECORD_TYPE) : ?> <?= view('icons/submitter') ?> <?php endif; diff --git a/resources/views/media-page.phtml b/resources/views/media-page.phtml index c619454c02..24e9b2a6c8 100644 --- a/resources/views/media-page.phtml +++ b/resources/views/media-page.phtml @@ -159,7 +159,7 @@ use Illuminate\Support\Collection; <?php if ($media->canEdit()) : ?> <?= view('edit/paste-fact-row', ['record' => $media, 'facts' => $clipboard_facts]) ?> - <?php FunctionsPrint::printAddNewFact($media, $facts, 'OBJE') ?> + <?php FunctionsPrint::printAddNewFact($media, $facts, Media::RECORD_TYPE) ?> <tr> <th> <?= I18N::translate('Source') ?> diff --git a/resources/views/modules/personal_facts/tab.phtml b/resources/views/modules/personal_facts/tab.phtml index f2f055c748..e78dae4bd7 100644 --- a/resources/views/modules/personal_facts/tab.phtml +++ b/resources/views/modules/personal_facts/tab.phtml @@ -1,11 +1,12 @@ <?php use Fisharebest\Webtrees\Functions\FunctionsPrint; +use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\View; ?> -<?php use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; ?> -<?php use Fisharebest\Webtrees\I18N; ?> -<?php use Fisharebest\Webtrees\View; ?> <div class="wt-tab-facts py-4"> <table class="table wt-facts-table"> @@ -40,7 +41,7 @@ use Fisharebest\Webtrees\Functions\FunctionsPrint; <?php if ($individual->canEdit()) : ?> <?= view('edit/paste-fact-row', ['record' => $individual, 'facts' => $clipboard_facts]) ?> - <?php FunctionsPrint::printAddNewFact($individual, $facts, 'INDI') ?> + <?php FunctionsPrint::printAddNewFact($individual, $facts, Individual::RECORD_TYPE) ?> <?php endif ?> </tbody> </table> diff --git a/resources/views/modules/recent_changes/changes-table.phtml b/resources/views/modules/recent_changes/changes-table.phtml index 1226841250..aad30bbef5 100644 --- a/resources/views/modules/recent_changes/changes-table.phtml +++ b/resources/views/modules/recent_changes/changes-table.phtml @@ -53,26 +53,26 @@ use Illuminate\Support\Collection; <tbody> <?php foreach ($rows as $row) : ?> <tr> - <td data-sort="<?= $row->record::RECORD_TYPE ?>" class="text-centre wt-side-block-optional"> - <?php if ($row->record::RECORD_TYPE === Individual::RECORD_TYPE) : ?> + <td data-sort="<?= $row->record->tag() ?>" class="text-centre wt-side-block-optional"> + <?php if ($row->record->tag() === Individual::RECORD_TYPE) : ?> <?= view('icons/individual') ?> <span class="sr-only"><?= I18N::translate('Individual') ?></span> - <?php elseif ($row->record::RECORD_TYPE === Family::RECORD_TYPE) : ?> + <?php elseif ($row->record->tag() === Family::RECORD_TYPE) : ?> <?= view('icons/family') ?> <span class="sr-only"><?= I18N::translate('Family') ?></span> - <?php elseif ($row->record::RECORD_TYPE === Media::RECORD_TYPE) : ?> + <?php elseif ($row->record->tag() === Media::RECORD_TYPE) : ?> <?= view('icons/media') ?> <span class="sr-only"><?= I18N::translate('Media') ?></span> - <?php elseif ($row->record::RECORD_TYPE === Note::RECORD_TYPE) : ?> + <?php elseif ($row->record->tag() === Note::RECORD_TYPE) : ?> <?= view('icons/note') ?> <span class="sr-only"><?= I18N::translate('Note') ?></span> - <?php elseif ($row->record::RECORD_TYPE === Source::RECORD_TYPE) : ?> + <?php elseif ($row->record->tag() === Source::RECORD_TYPE) : ?> <?= view('icons/source') ?> <span class="sr-only"><?= I18N::translate('Source') ?></span> - <?php elseif ($row->record::RECORD_TYPE === Submitter::RECORD_TYPE) : ?> + <?php elseif ($row->record->tag() === Submitter::RECORD_TYPE) : ?> <?= view('icons/submitter') ?> <span class="sr-only"><?= I18N::translate('Submitter') ?></span> - <?php elseif ($row->record::RECORD_TYPE === Repository::RECORD_TYPE) : ?> + <?php elseif ($row->record->tag() === Repository::RECORD_TYPE) : ?> <?= view('icons/repository') ?> <span class="sr-only"><?= I18N::translate('Repository') ?></span> <?php endif ?> diff --git a/resources/views/note-page.phtml b/resources/views/note-page.phtml index 0563481bb2..778a40cdb6 100644 --- a/resources/views/note-page.phtml +++ b/resources/views/note-page.phtml @@ -6,6 +6,7 @@ use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesAcceptRecord; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesRejectRecord; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Note; ?> @@ -102,7 +103,7 @@ use Fisharebest\Webtrees\I18N; <?php if ($note->canEdit()) : ?> <?= view('edit/paste-fact-row', ['record' => $note, 'facts' => $clipboard_facts]) ?> - <?php FunctionsPrint::printAddNewFact($note, $facts, 'NOTE') ?> + <?php FunctionsPrint::printAddNewFact($note, $facts, Note::RECORD_TYPE) ?> <?php endif ?> </table> </div> diff --git a/resources/views/repository-page.phtml b/resources/views/repository-page.phtml index 6ffc2e78dc..b0101c9070 100644 --- a/resources/views/repository-page.phtml +++ b/resources/views/repository-page.phtml @@ -6,6 +6,7 @@ use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesAcceptRecord; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesRejectRecord; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Repository; ?> @@ -58,7 +59,7 @@ use Fisharebest\Webtrees\I18N; <?php if ($repository->canEdit()) : ?> <?= view('edit/paste-fact-row', ['record' => $repository, 'facts' => $clipboard_facts]) ?> - <?php FunctionsPrint::printAddNewFact($repository, $facts, 'REPO') ?> + <?php FunctionsPrint::printAddNewFact($repository, $facts, Repository::RECORD_TYPE) ?> <?php endif ?> </table> </div> diff --git a/resources/views/source-page.phtml b/resources/views/source-page.phtml index c9e81d2a63..b7ee0409a5 100644 --- a/resources/views/source-page.phtml +++ b/resources/views/source-page.phtml @@ -7,6 +7,7 @@ use Fisharebest\Webtrees\Http\RequestHandlers\AddNewFact; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesAcceptRecord; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesRejectRecord; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Source; ?> @@ -80,7 +81,7 @@ use Fisharebest\Webtrees\I18N; <?php if ($source->canEdit()) : ?> <?= view('edit/paste-fact-row', ['record' => $source, 'facts' => $clipboard_facts]) ?> - <?php FunctionsPrint::printAddNewFact($source, $facts, 'SOUR') ?> + <?php FunctionsPrint::printAddNewFact($source, $facts, Source::RECORD_TYPE) ?> <?php if ($source->tree()->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($source->tree())) : ?> <tr> diff --git a/resources/views/submitter-page.phtml b/resources/views/submitter-page.phtml index bde828f4cf..b1cc935fb4 100644 --- a/resources/views/submitter-page.phtml +++ b/resources/views/submitter-page.phtml @@ -6,6 +6,7 @@ use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesAcceptRecord; use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesRejectRecord; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Submitter; ?> @@ -63,7 +64,7 @@ use Fisharebest\Webtrees\I18N; <?php endforeach ?> <?php if ($submitter->canEdit()) : ?> - <?php FunctionsPrint::printAddNewFact($submitter, $facts, $submitter::RECORD_TYPE) ?> + <?php FunctionsPrint::printAddNewFact($submitter, $facts, Submitter::RECORD_TYPE) ?> <?php endif ?> </table> </div> |
