Working on adding new GEDCOM tags

1 files changed, 3 insertions, 19 deletions

diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml
index 8a1fb4470a..641d5974d9 100644
--- a/resources/views/family-page.phtml
+++ b/resources/views/family-page.phtml
@@ -6,8 +6,6 @@ use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Functions\FunctionsPrint;
 use Fisharebest\Webtrees\Functions\FunctionsPrintFacts;
 use Fisharebest\Webtrees\Http\RequestHandlers\AddNewFact;
-use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesAcceptRecord;
-use Fisharebest\Webtrees\Http\RequestHandlers\PendingChangesRejectRecord;
 use Fisharebest\Webtrees\I18N;
 use Illuminate\Support\Collection;
 
@@ -19,26 +17,14 @@ use Illuminate\Support\Collection;
 
 ?>
 
-<?php if ($record->isPendingDeletion()) : ?>
-    <?php if (Auth::isModerator($record->tree())) : ?>
-        <?= 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" data-post-url="' . e(route(PendingChangesAcceptRecord::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) . '">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>', '<a href="#" class="alert-link" data-post-url="' . e(route(PendingChangesRejectRecord::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) . '">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>') . ' ' . view('help/link', ['topic' => 'pending_changes'])]) ?>
-    <?php elseif (Auth::isEditor($record->tree())) : ?>
-        <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . view('help/link', ['topic' => 'pending_changes'])]) ?>
-    <?php endif ?>
-<?php elseif ($record->isPendingAddition()) : ?>
-    <?php if (Auth::isModerator($record->tree())) : ?>
-        <?= 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" data-post-url="' . e(route(PendingChangesAcceptRecord::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) . '">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>', '<a href="#" class="alert-link" data-post-url="' . e(route(PendingChangesRejectRecord::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) . '">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>') . ' ' . view('help/link', ['topic' => 'pending_changes'])]) ?>
-    <?php elseif (Auth::isEditor($record->tree())) : ?>
-        <?= view('components/alert-warning-dismissible', ['alert' => I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.') . ' ' . view('help/link', ['topic' => 'pending_changes'])]) ?>
-    <?php endif ?>
-<?php endif ?>
+<?= view('family-page-pending', ['record' => $record]) ?>
 
 <div class="d-flex mb-4">
     <h2 class="wt-page-title mx-auto">
         <?= $record->fullName() ?>
     </h2>
     <?php if ($record->canEdit()) : ?>
-        <?= view('family-page-menu', ['record' => $record]) ?>
+        <?= view('family-page-menu', ['clipboard_facts' => $clipboard_facts, 'record' => $record]) ?>
     <?php endif ?>
 </div>
 
@@ -63,9 +49,7 @@ use Illuminate\Support\Collection;
         <?php endif ?>
 
         <?php if (Auth::isEditor($record->tree())) : ?>
-            <?= view('edit/paste-fact-row', ['record' => $record, 'facts' => $clipboard_facts]) ?>
-
-            <?php FunctionsPrint::printAddNewFact($record, $facts, Family::RECORD_TYPE) ?>
+            <?php FunctionsPrint::printAddNewFact($record) ?>
             <tr>
                 <th scope="row">
                     <?= I18N::translate('Note') ?>