diff options
| -rw-r--r-- | app/Http/Controllers/AdminTreesController.php | 9 | ||||
| -rw-r--r-- | resources/views/admin/control-panel-manager.phtml | 73 | ||||
| -rw-r--r-- | resources/views/admin/control-panel-tree-list.phtml | 2 | ||||
| -rw-r--r-- | resources/views/admin/control-panel.phtml | 6 | ||||
| -rw-r--r-- | resources/views/admin/trees.phtml | 10 |
5 files changed, 6 insertions, 94 deletions
diff --git a/app/Http/Controllers/AdminTreesController.php b/app/Http/Controllers/AdminTreesController.php index ded88fb5b1..47236c9c31 100644 --- a/app/Http/Controllers/AdminTreesController.php +++ b/app/Http/Controllers/AdminTreesController.php @@ -624,7 +624,8 @@ class AdminTreesController extends AbstractBaseController */ public function index(ServerRequestInterface $request): ResponseInterface { - $tree = $request->getAttribute('tree'); + $default = Site::getPreference('DEFAULT_GEDCOM'); + $tree = $this->tree_service->findByName($request->getQueryParams()['tree'] ?? $default); $multiple_tree_threshold = (int) Site::getPreference('MULTIPLE_TREE_THRESHOLD', self::MULTIPLE_TREE_THRESHOLD); $gedcom_files = $this->gedcomFiles(WT_DATA_DIR); @@ -634,8 +635,8 @@ class AdminTreesController extends AbstractBaseController // On sites with hundreds or thousands of trees, this page becomes very large. // Just show the current tree, the default tree, and unimported trees if ($all_trees->count() >= $multiple_tree_threshold) { - $all_trees = $all_trees->filter(static function (Tree $x) use ($tree): bool { - return $x->getPreference('imported') === '0' || $tree->id() === $x->id() || $x->name() === Site::getPreference('DEFAULT_GEDCOM'); + $all_trees = $all_trees->filter(static function (Tree $x) use ($tree, $default): bool { + return $x->getPreference('imported') === '0' || $tree->id() === $x->id() || $x->name() === $default; }); } @@ -649,7 +650,7 @@ class AdminTreesController extends AbstractBaseController 'gedcom_files' => $gedcom_files, 'multiple_tree_threshold' => $multiple_tree_threshold, 'title' => $title, - 'tree' => $this->tree_service->all()->first(), + 'tree' => $tree, ]); } diff --git a/resources/views/admin/control-panel-manager.phtml b/resources/views/admin/control-panel-manager.phtml deleted file mode 100644 index 14ece441a9..0000000000 --- a/resources/views/admin/control-panel-manager.phtml +++ /dev/null @@ -1,73 +0,0 @@ -<?php use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Webtrees; ?> -<?php ?> - -<h1><?= $title ?></h1> - -<!-- WEBTREES VERSION --> -<div class="card mb-4"> - <div class="card-header"> - <h2 class="mb-0"> - <?= e(Webtrees::NAME) ?> - <span class="badge badge-secondary"> - <?= e(Webtrees::VERSION) ?> - </span> - </h2> - </div> - <div class="card-body"> - <p> - <?= /* I18N: %s is a URL/link to the project website */ - I18N::translate('Support and documentation can be found at %s.', '<a href="https://webtrees.net/">webtrees.net</a>') ?> - </p> - </div> -</div> - -<!-- FAMILY TREES --> -<div class="card mb-4 <?= array_sum($changes) ? 'card-outline-danger' : '' ?>"> - <div class="card-header"> - <h2 class="mb-0"> - <?= I18N::translate('Family trees') ?> - <span class="badge badge-secondary"> - <?= I18N::number(count($all_trees)) ?> - </span> - </h2> - </div> - <div class="card-body"> - <table class="table table-sm"> - <caption class="sr-only"> - <?= I18N::translate('Family trees') ?> - </caption> - <thead> - <tr> - <th><?= I18N::translate('Family tree') ?></th> - <th><span class="sr-only"><?= I18N::translate('Manage family trees') ?></span></th> - <th class="text-right"><?= I18N::translate('Pending changes') ?></th> - <th class="d-none d-sm-table-cell text-right"><?= I18N::translate('Individuals') ?></th> - <th class="d-none d-lg-table-cell text-right"><?= I18N::translate('Families') ?></th> - <th class="d-none d-sm-table-cell text-right"><?= I18N::translate('Sources') ?></th> - <th class="d-none d-lg-table-cell text-right"><?= I18N::translate('Repositories') ?></th> - <th class="d-none d-sm-table-cell text-right"><?= I18N::translate('Media') ?></th> - <th class="d-none d-lg-table-cell text-right"><?= I18N::translate('Notes') ?></th> - </tr> - </thead> - <tbody> - <?= view('admin/control-panel-tree-list', [ - 'all_trees' => $all_trees, - 'changes' => $changes, - 'families' => $families, - 'individuals' => $individuals, - 'media' => $media, - 'notes' => $notes, - 'repositories' => $repositories, - 'sources' => $sources, - 'family_list_module' => $family_list_module, - 'individual_list_module' => $individual_list_module, - 'media_list_module' => $media_list_module, - 'note_list_module' => $note_list_module, - 'repository_list_module' => $repository_list_module, - 'source_list_module' => $source_list_module, - ]) ?> - </tbody> - </table> - </div> -</div> diff --git a/resources/views/admin/control-panel-tree-list.phtml b/resources/views/admin/control-panel-tree-list.phtml index ea1780a55f..acc0bb4b73 100644 --- a/resources/views/admin/control-panel-tree-list.phtml +++ b/resources/views/admin/control-panel-tree-list.phtml @@ -21,7 +21,7 @@ use Fisharebest\Webtrees\Module\SourceListModule; </a> </th> <td> - <a href="<?= e(route('admin-trees-preferences', ['tree' => $tree->name()])) ?>" title="<?= I18N::translate('Preferences') ?>"> + <a href="<?= e(route('manage-trees', ['tree' => $tree->name()])) ?>" title="<?= I18N::translate('Manage family trees') ?>"> <?= view('icons/preferences') ?> </a> </td> diff --git a/resources/views/admin/control-panel.phtml b/resources/views/admin/control-panel.phtml index 36074337e6..35a78e3f80 100644 --- a/resources/views/admin/control-panel.phtml +++ b/resources/views/admin/control-panel.phtml @@ -123,12 +123,6 @@ use Illuminate\Support\Collection; </a> </li> <li> - <span class="fa-li"><?= view('icons/preferences') ?></span> - <a href="<?= e(route('manage-trees')) ?>"> - <?= I18N::translate('Manage family trees') ?> - </a> - </li> - <li> <span class="fa-li"><?= view('icons/block') ?></span> <a href="<?= e(route('tree-page-default-edit')) ?>"> <?= I18N::translate('Set the default blocks for new family trees') ?> diff --git a/resources/views/admin/trees.phtml b/resources/views/admin/trees.phtml index 6617b434c4..3a57e16121 100644 --- a/resources/views/admin/trees.phtml +++ b/resources/views/admin/trees.phtml @@ -77,16 +77,6 @@ use Illuminate\Database\Capsule\Manager as DB; </span> </a> </li> - <!-- HOME PAGE BLOCKS--> - <li> - <span class="fa-li"><?= view('icons/block') ?></span> - <a href="<?= e(route('tree-page-edit', ['tree' => $managed_tree->name()])) ?>"> - <?= I18N::translate('Change the “Home page” blocks') ?> - <span class="sr-only"> - <?= e($managed_tree->title()) ?> - </span> - </a> - </li> <!-- DELETE --> <?php if (count($all_trees) > 1 && Auth::isAdmin()) : ?> <li> |