diff options
Diffstat (limited to 'resources/views/edit')
| -rw-r--r-- | resources/views/edit/add-fact.phtml | 3 | ||||
| -rw-r--r-- | resources/views/edit/change-family-members.phtml | 9 | ||||
| -rw-r--r-- | resources/views/edit/edit-fact.phtml | 3 | ||||
| -rw-r--r-- | resources/views/edit/link-child-to-family.phtml | 6 | ||||
| -rw-r--r-- | resources/views/edit/link-spouse-to-individual.phtml | 2 | ||||
| -rw-r--r-- | resources/views/edit/new-individual.phtml | 1 |
6 files changed, 9 insertions, 15 deletions
diff --git a/resources/views/edit/add-fact.phtml b/resources/views/edit/add-fact.phtml index 32d5a9a316..dc3597c780 100644 --- a/resources/views/edit/add-fact.phtml +++ b/resources/views/edit/add-fact.phtml @@ -1,5 +1,4 @@ <?php use Fisharebest\Webtrees\Auth; ?> -<?php use Fisharebest\Webtrees\Bootstrap4; ?> <?php use Fisharebest\Webtrees\Config; ?> <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\GedcomTag; ?> @@ -63,7 +62,7 @@ <?= I18N::translate('Last change') ?> </label> <div class="col-sm-9"> - <?= Bootstrap4::checkbox(I18N::translate('Keep the existing “last change” information'), true, ['name' => 'keep_chan', 'checked' => (bool) $tree->getPreference('NO_UPDATE_CHAN')]) ?> + <?= view('components/checkbox-inline', ['label' => I18N::translate('Keep the existing “last change” information'), 'name' => 'keep_chan', 'checked' => (bool) $tree->getPreference('NO_UPDATE_CHAN')]) ?> <?= GedcomTag::getLabelValue('DATE', view('components/datetime', ['timestamp' => $record->lastChangeTimestamp()])) ?> <?= GedcomTag::getLabelValue('_WT_USER', e($record->lastChangeUser())) ?> </div> diff --git a/resources/views/edit/change-family-members.phtml b/resources/views/edit/change-family-members.phtml index 2c3be8b9e5..37cd116ceb 100644 --- a/resources/views/edit/change-family-members.phtml +++ b/resources/views/edit/change-family-members.phtml @@ -1,4 +1,3 @@ -<?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\I18N; ?> <h2 class="wt-page-title"><?= $title ?></h2> @@ -20,7 +19,7 @@ <?php endif ?> </label> <div class="col-sm-9 wt-page-options-value"> - <?= FunctionsEdit::formControlIndividual($tree, $father, ['id' => 'HUSB', 'name' => 'HUSB']) ?> + <?= view('components/select-individual', ['name' => 'HUSB', 'individual' => $father, 'tree' => $tree]) ?> </div> </div> @@ -35,7 +34,7 @@ <?php endif ?> </label> <div class="col-sm-9 wt-page-options-value"> - <?= FunctionsEdit::formControlIndividual($tree, $mother, ['id' => 'WIFE', 'name' => 'WIFE']) ?> + <?= view('components/select-individual', ['name' => 'WIFE', 'individual' => $mother, 'tree' => $tree]) ?> </div> </div> @@ -51,7 +50,7 @@ <?php endif ?> </label> <div class="col-sm-9 wt-page-options-value"> - <?= FunctionsEdit::formControlIndividual($tree, $child, ['id' => 'CHIL' . $n, 'name' => 'CHIL[]']) ?> + <?= view('components/select-individual', ['name' => 'CHIL[]', 'id' => 'CHIL' . $n, 'individual' => $child, 'tree' => $tree]) ?> </div> </div> <?php endforeach ?> @@ -61,7 +60,7 @@ <?= I18N::translate('Child') ?> </label> <div class="col-sm-9 wt-page-options-value"> - <?= FunctionsEdit::formControlIndividual($tree, null, ['id' => 'CHIL[]' . (count($children) + 1), 'name' => 'CHIL[]']) ?> + <?= view('components/select-individual', ['name' => 'CHIL[]', 'id' => 'CHIL' . (count($children) + 1), 'tree' => $tree]) ?> </div> </div> diff --git a/resources/views/edit/edit-fact.phtml b/resources/views/edit/edit-fact.phtml index c11c84c254..d8b0f150c4 100644 --- a/resources/views/edit/edit-fact.phtml +++ b/resources/views/edit/edit-fact.phtml @@ -1,5 +1,4 @@ <?php use Fisharebest\Webtrees\Auth; ?> -<?php use Fisharebest\Webtrees\Bootstrap4; ?> <?php use Fisharebest\Webtrees\Config; ?> <?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\GedcomTag; ?> @@ -77,7 +76,7 @@ <?= I18N::translate('Last change') ?> </label> <div class="col-sm-9"> - <?= Bootstrap4::checkbox(I18N::translate('Keep the existing “last change” information'), true, ['name' => 'keep_chan', 'checked' => (bool) $tree->getPreference('NO_UPDATE_CHAN')]) ?> + <?= view('components/checkbox-inline', ['label' => I18N::translate('Keep the existing “last change” information'), 'name' => 'keep_chan', 'checked' => (bool) $tree->getPreference('NO_UPDATE_CHAN')]) ?> <?= GedcomTag::getLabelValue('DATE', view('components/datetime', ['timestamp' => $record->lastChangeTimestamp()])) ?> <?= GedcomTag::getLabelValue('_WT_USER', e($record->lastChangeUser())) ?> </div> diff --git a/resources/views/edit/link-child-to-family.phtml b/resources/views/edit/link-child-to-family.phtml index 76aeec84b2..cc8b63d997 100644 --- a/resources/views/edit/link-child-to-family.phtml +++ b/resources/views/edit/link-child-to-family.phtml @@ -1,5 +1,3 @@ -<?php use Fisharebest\Webtrees\Bootstrap4; ?> -<?php use Fisharebest\Webtrees\Functions\FunctionsEdit; ?> <?php use Fisharebest\Webtrees\GedcomCode\GedcomCodePedi; ?> <?php use Fisharebest\Webtrees\I18N; ?> @@ -13,7 +11,7 @@ <?= I18N::translate('Family') ?> </label> <div class="col-sm-9"> - <?= FunctionsEdit::formControlFamily($tree, null, ['id' => 'famid', 'name' => 'famid']) ?> + <?= view('components/select-family', ['name' => 'famid', 'tree' => $tree]) ?> </div> </div> @@ -22,7 +20,7 @@ <?= I18N::translate('Pedigree') ?> </label> <div class="col-sm-9"> - <?= Bootstrap4::select(GedcomCodePedi::getValues($individual), '', ['id' => 'PEDI', 'name' => 'PEDI']) ?> + <?= view('components/select', ['name' => 'PEDI', 'selected' => '', 'values' => GedcomCodePedi::getValues($individual)]) ?> <p class="small text-muted"> <?= I18N::translate('A child may have more than one set of parents. The relationship between the child and the parents can be biological, legal, or based on local culture and tradition. If no pedigree is specified, then a biological relationship will be assumed.') ?> </p> diff --git a/resources/views/edit/link-spouse-to-individual.phtml b/resources/views/edit/link-spouse-to-individual.phtml index bc31e460b2..42600075ed 100644 --- a/resources/views/edit/link-spouse-to-individual.phtml +++ b/resources/views/edit/link-spouse-to-individual.phtml @@ -11,7 +11,7 @@ <?= $label ?> </label> <div class="col-sm-9"> - <?= FunctionsEdit::formControlIndividual($tree, null, ['id' => 'spouse', 'name' => 'spid']) ?> + <?= view('components/select-individual', ['name' => 'spid', 'id' => 'spouse', 'tree' => $tree]) ?> </div> </div> diff --git a/resources/views/edit/new-individual.phtml b/resources/views/edit/new-individual.phtml index 17dff32b9f..33cc0563d9 100644 --- a/resources/views/edit/new-individual.phtml +++ b/resources/views/edit/new-individual.phtml @@ -1,7 +1,6 @@ <?php use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\Config; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Functions\FunctionsEdit; use Fisharebest\Webtrees\Gedcom; |