diff options
| -rw-r--r-- | resources/views/edit/reorder-children.phtml | 12 | ||||
| -rw-r--r-- | resources/views/edit/reorder-media.phtml | 10 | ||||
| -rw-r--r-- | resources/views/edit/reorder-names.phtml | 4 | ||||
| -rw-r--r-- | resources/views/edit/reorder-spouses.phtml | 22 |
4 files changed, 26 insertions, 22 deletions
diff --git a/resources/views/edit/reorder-children.phtml b/resources/views/edit/reorder-children.phtml index 77129cffb1..d48d4232d3 100644 --- a/resources/views/edit/reorder-children.phtml +++ b/resources/views/edit/reorder-children.phtml @@ -16,10 +16,12 @@ use Fisharebest\Webtrees\View; <?php foreach ($family->facts(['CHIL']) as $fact) : ?> <div class="card mb-2 wt-sortable-item" data-sortbydate="<?= $fact->target()->getBirthDate()->julianDay() ?>"> <input type="hidden" name="order[]" value="<?= $fact->id() ?>"> - <h3 class="card-header"> - <?= view('icons/drag-handle') ?> + <div class="card-header"> + <span class="drag-handle"> + <?= view('icons/drag-handle') ?> + </span> <?= $fact->target()->fullName() ?> - </h3> + </div> <div class="card-body"> <?= $fact->target()->formatFirstMajorFact(Gedcom::BIRTH_EVENTS, 2) ?> <?= $fact->target()->formatFirstMajorFact(Gedcom::DEATH_EVENTS, 2) ?> @@ -48,7 +50,9 @@ use Fisharebest\Webtrees\View; <?php View::push('javascript') ?> <script> - new Sortable(document.querySelector(".wt-sortable-list"), {}); + new Sortable(document.querySelector(".wt-sortable-list"), { + handle: ".drag-handle", + }); $("#btn-default-order").on("click", function() { $(".wt-sortable-list .wt-sortable-item").sort(function(x, y) { diff --git a/resources/views/edit/reorder-media.phtml b/resources/views/edit/reorder-media.phtml index 48e5723e5d..8eaf72ae89 100644 --- a/resources/views/edit/reorder-media.phtml +++ b/resources/views/edit/reorder-media.phtml @@ -8,10 +8,8 @@ use Fisharebest\Webtrees\View; <h2 class="wt-page-title"><?= $title ?></h2> -<form method="post" action="<?= e(route(ReorderMediaAction::class, ['tree' => $tree->name()])) ?>" class="wt-page-content"> +<form method="post" action="<?= e(route(ReorderMediaAction::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(['OBJE']) as $fact) : ?> @@ -45,8 +43,8 @@ use Fisharebest\Webtrees\View; <?php View::push('javascript') ?> <script> - new Sortable(document.querySelector(".wt-sortable-list"), { - handle: '.drag-handle' - }); + new Sortable(document.querySelector(".wt-sortable-list"), { + handle: ".drag-handle", + }); </script> <?php View::endpush() ?> diff --git a/resources/views/edit/reorder-names.phtml b/resources/views/edit/reorder-names.phtml index a11b992cdb..e8018526c6 100644 --- a/resources/views/edit/reorder-names.phtml +++ b/resources/views/edit/reorder-names.phtml @@ -10,10 +10,8 @@ use Fisharebest\Webtrees\View; <h2 class="wt-page-title"><?= $title ?></h2> -<form method="post" action="<?= e(route(ReorderNamesAction::class, ['tree' => $tree->name()])) ?>" class="wt-page-content"> +<form method="post" action="<?= e(route(ReorderNamesAction::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(['NAME']) as $fact) : ?> diff --git a/resources/views/edit/reorder-spouses.phtml b/resources/views/edit/reorder-spouses.phtml index 7cfa19857c..d1c6967696 100644 --- a/resources/views/edit/reorder-spouses.phtml +++ b/resources/views/edit/reorder-spouses.phtml @@ -16,10 +16,12 @@ use Fisharebest\Webtrees\View; <?php foreach ($individual->facts(['FAMS']) as $fact) : ?> <div class="card mb-2 wt-sortable-item" data-sortbydate="<?= $fact->target()->getMarriageDate()->julianDay() ?>"> <input type="hidden" name="order[]" value="<?= $fact->id() ?>"> - <h3 class="card-header"> - <?= view('icons/drag-handle') ?> + <div class="card-header"> + <span class="drag-handle"> + <?= view('icons/drag-handle') ?> + </span> <?= $fact->target()->fullName() ?> - </h3> + </div> <div class="card-body"> <?= $fact->target()->formatFirstMajorFact(Gedcom::MARRIAGE_EVENTS, 2) ?> <?= $fact->target()->formatFirstMajorFact(Gedcom::DIVORCE_EVENTS, 2) ?> @@ -48,12 +50,14 @@ use Fisharebest\Webtrees\View; <?php View::push('javascript') ?> <script> - new Sortable(document.querySelector(".wt-sortable-list"), {}); + new Sortable(document.querySelector(".wt-sortable-list"), { + handle: ".drag-handle", + }); - $("#btn-default-order").on("click", function() { - $(".wt-sortable-list .wt-sortable-item").sort(function(x, y) { - return Math.sign(x.dataset.sortbydate - y.dataset.sortbydate); - }).appendTo(".wt-sortable-list"); - }); + $("#btn-default-order").on("click", function() { + $(".wt-sortable-list .wt-sortable-item").sort(function(x, y) { + return Math.sign(x.dataset.sortbydate - y.dataset.sortbydate); + }).appendTo(".wt-sortable-list"); + }); </script> <?php View::endpush() ?> |