9 files changed, 57 insertions, 33 deletions
diff --git a/resources/views/edit/reorder-children.phtml b/resources/views/edit/reorder-children.phtml
index 27df60489b..77129cffb1 100644
--- a/resources/views/edit/reorder-children.phtml
+++ b/resources/views/edit/reorder-children.phtml
@@ -1,13 +1,16 @@
-<?php use Fisharebest\Webtrees\Gedcom; ?>
-<?php use Fisharebest\Webtrees\I18N; ?>
-<?php use Fisharebest\Webtrees\View; ?>
+<?php
+
+use Fisharebest\Webtrees\Gedcom;
+use Fisharebest\Webtrees\Http\RequestHandlers\ReorderChildrenAction;
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\View;
+
+?>
 
 <h2 class="wt-page-title"><?= $title ?></h2>
 
-<form method="post" action="<?= e(route('reorder-children-action', ['tree' => $tree->name()])) ?>" class="wt-page-content">
+<form method="post" action="<?= e(route(ReorderChildrenAction::class, ['tree' => $tree->name(), 'xref' => $family->xref()])) ?>" class="wt-page-content">
     <?= csrf_field() ?>
-    <input type="hidden" name="tree" value="<?= e($family->tree()->name()) ?>">
-    <input type="hidden" name="xref" value="<?= e($family->xref()) ?>">
 
     <div class="wt-sortable-list">
         <?php foreach ($family->facts(['CHIL']) as $fact) : ?>
diff --git a/resources/views/edit/reorder-media.phtml b/resources/views/edit/reorder-media.phtml
index 345891621e..48e5723e5d 100644
--- a/resources/views/edit/reorder-media.phtml
+++ b/resources/views/edit/reorder-media.phtml
@@ -1,9 +1,14 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
-<?php use Fisharebest\Webtrees\View; ?>
+<?php
+
+use Fisharebest\Webtrees\Http\RequestHandlers\ReorderMediaAction;
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\View;
+
+?>
 
 <h2 class="wt-page-title"><?= $title ?></h2>
 
-<form method="post" action="<?= e(route('reorder-media-action', ['tree' => $tree->name()])) ?>" class="wt-page-content">
+<form method="post" action="<?= e(route(ReorderMediaAction::class, ['tree' => $tree->name()])) ?>" class="wt-page-content">
     <?= csrf_field() ?>
     <input type="hidden" name="tree" value="<?= e($individual->tree()->name()) ?>">
     <input type="hidden" name="xref" value="<?= e($individual->xref()) ?>">
diff --git a/resources/views/edit/reorder-names.phtml b/resources/views/edit/reorder-names.phtml
index 558082707b..a11b992cdb 100644
--- a/resources/views/edit/reorder-names.phtml
+++ b/resources/views/edit/reorder-names.phtml
@@ -1,14 +1,16 @@
-<?php use Fisharebest\Webtrees\GedcomCode\GedcomCodeName;
+<?php
+
+use Fisharebest\Webtrees\GedcomCode\GedcomCodeName;
 use Fisharebest\Webtrees\GedcomTag;
+use Fisharebest\Webtrees\Http\RequestHandlers\ReorderNamesAction;
 use Fisharebest\Webtrees\I18N;
-use Fisharebest\Webtrees\View; ?>
-<?php ?>
-<?php ?>
-<?php ?>
+use Fisharebest\Webtrees\View;
+
+?>
 
 <h2 class="wt-page-title"><?= $title ?></h2>
 
-<form method="post" action="<?= e(route('reorder-names-action', ['tree' => $tree->name()])) ?>" class="wt-page-content">
+<form method="post" action="<?= e(route(ReorderNamesAction::class, ['tree' => $tree->name()])) ?>" class="wt-page-content">
     <?= csrf_field() ?>
     <input type="hidden" name="tree" value="<?= e($individual->tree()->name()) ?>">
     <input type="hidden" name="xref" value="<?= e($individual->xref()) ?>">
diff --git a/resources/views/edit/reorder-spouses.phtml b/resources/views/edit/reorder-spouses.phtml
index eff6bd3b76..7cfa19857c 100644
--- a/resources/views/edit/reorder-spouses.phtml
+++ b/resources/views/edit/reorder-spouses.phtml
@@ -1,13 +1,16 @@
-<?php use Fisharebest\Webtrees\Gedcom; ?>
-<?php use Fisharebest\Webtrees\I18N; ?>
-<?php use Fisharebest\Webtrees\View; ?>
+<?php
+
+use Fisharebest\Webtrees\Gedcom;
+use Fisharebest\Webtrees\Http\RequestHandlers\ReorderSpousesAction;
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\View;
+
+?>
 
 <h2 class="wt-page-title"><?= $title ?></h2>
 
-<form method="post" action="<?= e(route('reorder-spouses-action', ['tree' => $tree->name()])) ?>" class="wt-page-content">
+<form method="post" action="<?= e(route(ReorderSpousesAction::class, ['tree' => $tree->name(), 'xref' => $individual->xref()])) ?>" class="wt-page-content">
     <?= csrf_field() ?>
-    <input type="hidden" name="tree" value="<?= e($individual->tree()->name()) ?>">
-    <input type="hidden" name="xref" value="<?= e($individual->xref()) ?>">
 
     <div class="wt-sortable-list">
         <?php foreach ($individual->facts(['FAMS']) as $fact) : ?>
diff --git a/resources/views/family-page-children.phtml b/resources/views/family-page-children.phtml
index a56f315ae5..73aeb2e35a 100644
--- a/resources/views/family-page-children.phtml
+++ b/resources/views/family-page-children.phtml
@@ -1,5 +1,6 @@
 <?php
 
+use Fisharebest\Webtrees\Http\RequestHandlers\ReorderChildrenPage;
 use Fisharebest\Webtrees\I18N;
 
 ?>
@@ -35,7 +36,7 @@ use Fisharebest\Webtrees\I18N;
             </a>
             <br>
             <?php if ($family->numberOfChildren() > 1) : ?>
-                <a class="btn btn-link" href="<?= e(route('reorder-children', ['tree' => $family->tree()->name(), 'xref' => $family->xref()])) ?>">
+                <a class="btn btn-link" href="<?= e(route(ReorderChildrenPage::class, ['tree' => $family->tree()->name(), 'xref' => $family->xref()])) ?>">
                     <?= I18N::translate('Re-order children') ?>
                 </a>
             <?php endif ?>
diff --git a/resources/views/family-page-menu.phtml b/resources/views/family-page-menu.phtml
index 1c1b82886d..9c58628f3e 100644
--- a/resources/views/family-page-menu.phtml
+++ b/resources/views/family-page-menu.phtml
@@ -1,5 +1,6 @@
 <?php use Fisharebest\Webtrees\Auth; ?>
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php use Fisharebest\Webtrees\Http\RequestHandlers\ReorderChildrenPage;
+use Fisharebest\Webtrees\I18N; ?>
 
 <div class="dropdown wt-page-menu">
     <button class="btn btn-primary dropdown-toggle wt-page-menu-button" type="button" id="page-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -33,7 +34,7 @@
         </a>
 
         <?php if ($record->numberOfChildren() > 1) : ?>
-            <a class="dropdown-item" href="<?= e(route('reorder-children', ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) ?>">
+            <a class="dropdown-item" href="<?= e(route(ReorderChildrenPage::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref()])) ?>">
                 <?= view('icons/reorder') ?>
                 <?= I18N::translate('Re-order children') ?>
             </a>
diff --git a/resources/views/individual-page-menu.phtml b/resources/views/individual-page-menu.phtml
index b10c5d111d..fd545479a6 100644
--- a/resources/views/individual-page-menu.phtml
+++ b/resources/views/individual-page-menu.phtml
@@ -1,5 +1,12 @@
-<?php use Fisharebest\Webtrees\Auth; ?>
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php
+
+use Fisharebest\Webtrees\Auth;
+use Fisharebest\Webtrees\Http\RequestHandlers\ReorderMediaPage;
+use Fisharebest\Webtrees\Http\RequestHandlers\ReorderNamesPage;
+use Fisharebest\Webtrees\Http\RequestHandlers\ReorderSpousesPage;
+use Fisharebest\Webtrees\I18N;
+
+?>
 
 <div class="dropdown wt-page-menu">
     <button class="btn btn-primary dropdown-toggle wt-page-menu-button" type="button" id="page-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -14,7 +21,7 @@
         </a>
 
         <?php if ($count_names > 1) : ?>
-            <a class="dropdown-item" href="<?= e(route('reorder-names', ['tree' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
+            <a class="dropdown-item" href="<?= e(route(ReorderNamesPage::class, ['tree' => $tree->name(), 'xref' => $individual->xref()])) ?>">
                 <?= view('icons/reorder') ?>
                 <?= I18N::translate('Re-order names') ?>
             </a>
@@ -46,7 +53,7 @@
         <div class="dropdown-divider"></div>
 
         <?php if ($individual->spouseFamilies()->count() > 1) : ?>
-            <a class="dropdown-item" href="<?= e(route('reorder-spouses', ['tree' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
+            <a class="dropdown-item" href="<?= e(route(ReorderSpousesPage::class, ['tree' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
                 <?= view('icons/reorder') ?>
                 <?= I18N::translate('Re-order families') ?>
             </a>
@@ -65,7 +72,7 @@
         </a>
 
         <?php if ($individual->facts(['OBJE'])->count() > 1) : ?>
-            <a class="dropdown-item" href="<?= e(route('reorder-media', ['tree' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
+            <a class="dropdown-item" href="<?= e(route(ReorderMediaPage::class, ['tree' => $tree->name(), 'xref' => $individual->xref()])) ?>">
                 <?= view('icons/reorder') ?>
                 <?= I18N::translate('Re-order media') ?>
             </a>
diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml
index 964d2fb659..bc04d916cd 100644
--- a/resources/views/modules/relatives/family.phtml
+++ b/resources/views/modules/relatives/family.phtml
@@ -2,7 +2,8 @@
 <?php use Fisharebest\Webtrees\Functions\Functions; ?>
 <?php use Fisharebest\Webtrees\Gedcom; ?>
 <?php use Fisharebest\Webtrees\GedcomTag; ?>
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php use Fisharebest\Webtrees\Http\RequestHandlers\ReorderChildrenPage;
+use Fisharebest\Webtrees\I18N; ?>
 <?php use Fisharebest\Webtrees\Individual; ?>
 
 <table class="table table-sm wt-facts-table">
@@ -190,7 +191,7 @@
             <tr>
                 <th scope="row">
                     <?php if ($family->children()->count() > 1) : ?>
-                        <a href="<?= e(route('reorder-children', ['tree' => $family->tree()->name(), 'xref' => $family->xref()])) ?>">
+                        <a href="<?= e(route(ReorderChildrenPage::class, ['tree' => $family->tree()->name(), 'xref' => $family->xref()])) ?>">
                             <?= view('icons/reorder') ?>
                             <?= I18N::translate('Re-order children') ?>
                         </a>
diff --git a/resources/views/modules/relatives/tab.phtml b/resources/views/modules/relatives/tab.phtml
index 4208f578a5..3f8dc043ff 100644
--- a/resources/views/modules/relatives/tab.phtml
+++ b/resources/views/modules/relatives/tab.phtml
@@ -1,4 +1,5 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php use Fisharebest\Webtrees\Http\RequestHandlers\ReorderSpousesPage;
+use Fisharebest\Webtrees\I18N; ?>
 <?php use Fisharebest\Webtrees\View; ?>
 
 <div class="wt-tab-relatives py-4">
@@ -87,7 +88,7 @@
             <?php if ($spouse_families->count() > 1) : ?>
                 <tr>
                     <td>
-                        <a href="<?= e(route('reorder-spouses', ['tree' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
+                        <a href="<?= e(route(ReorderSpousesPage::class, ['tree' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
                             <?= view('icons/reorder') ?>
                             <?= I18N::translate('Re-order families') ?>
                         </a>