diff options
Diffstat (limited to 'app/Module')
27 files changed, 37 insertions, 88 deletions
diff --git a/app/Module/AhnentafelReportModule.php b/app/Module/AhnentafelReportModule.php index 7f8fc53e86..bbeb21e50a 100644 --- a/app/Module/AhnentafelReportModule.php +++ b/app/Module/AhnentafelReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class AhnentafelReportModule diff --git a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php index dbd5ef8746..8cdcb216fc 100644 --- a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php +++ b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php @@ -18,9 +18,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module\BatchUpdate; use Fisharebest\Algorithm\MyersDiff; -use Fisharebest\Webtrees\Bootstrap4; use Fisharebest\Webtrees\GedcomRecord; -use Fisharebest\Webtrees\I18N; use Symfony\Component\HttpFoundation\Request; /** @@ -28,9 +26,6 @@ use Symfony\Component\HttpFoundation\Request; */ abstract class BatchUpdateBasePlugin { - /** @var bool User option; update change record */ - public $chan = false; - /** * @param GedcomRecord $record * @@ -64,7 +59,6 @@ abstract class BatchUpdateBasePlugin */ public function getOptions(Request $request): void { - $this->chan = (bool) $request->get('chan'); } /** @@ -74,15 +68,7 @@ abstract class BatchUpdateBasePlugin */ public function getOptionsForm(): string { - return - '<div class="row form-group">' . - '<label class="col-sm-3 col-form-label">' . I18N::translate('Keep the existing “last change” information') . '</label>' . - '<div class="col-sm-9">' . - Bootstrap4::radioButtons('chan', [ - 0 => I18N::translate('no'), - 1 => I18N::translate('yes'), - ], ($this->chan ? 1 : 0), true, ['onchange' => 'this.form.submit();']) . - '</div></div>'; + return ''; } /** diff --git a/app/Module/BatchUpdate/BatchUpdateMarriedNamesPlugin.php b/app/Module/BatchUpdate/BatchUpdateMarriedNamesPlugin.php index b095b1dc29..5fb6ad1375 100644 --- a/app/Module/BatchUpdate/BatchUpdateMarriedNamesPlugin.php +++ b/app/Module/BatchUpdate/BatchUpdateMarriedNamesPlugin.php @@ -192,7 +192,7 @@ class BatchUpdateMarriedNamesPlugin extends BatchUpdateBasePlugin '<div class="row form-group">' . '<label class="col-sm-3 col-form-label">' . I18N::translate('Surname option') . '</label>' . '<div class="col-sm-9">' . - '<select class="form-control" name="surname" onchange="this.form.submit();">' . + '<select class="form-control" name="surname">' . '<option value="replace" ' . ($this->surname == 'replace' ? 'selected' : '') . '">' . I18N::translate('Wife’s surname replaced by husband’s surname') . '</option><option value="add" ' . diff --git a/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php b/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php index 1afc8e4a07..ee6e188860 100644 --- a/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php +++ b/app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php @@ -17,7 +17,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module\BatchUpdate; -use Fisharebest\Webtrees\Bootstrap4; use Fisharebest\Webtrees\GedcomRecord; use Fisharebest\Webtrees\I18N; use Symfony\Component\HttpFoundation\Request; @@ -183,19 +182,17 @@ class BatchUpdateSearchReplacePlugin extends BatchUpdateBasePlugin '<div class="row form-group">' . '<label class="col-sm-3 col-form-label">' . I18N::translate('Search text/pattern') . '</label>' . '<div class="col-sm-9">' . - '<input class="form-control" name="search" size="40" value="' . e($this->search) . - '" onchange="this.form.submit();">' . + '<input class="form-control" name="search" size="40" value="' . e($this->search) . '">' . '</div></div>' . '<div class="row form-group">' . '<label class="col-sm-3 col-form-label">' . I18N::translate('Replacement text') . '</label>' . '<div class="col-sm-9">' . - '<input class="form-control" name="replace" size="40" value="' . e($this->replace) . - '" onchange="this.form.submit();"></td></tr>' . + '<input class="form-control" name="replace" size="40" value="' . e($this->replace) . '"></td></tr>' . '</div></div>' . '<div class="row form-group">' . '<label class="col-sm-3 col-form-label">' . I18N::translate('Search method') . '</label>' . '<div class="col-sm-9">' . - '<select class="form-control" name="method" onchange="this.form.submit();">' . + '<select class="form-control" name="method">' . '<option value="exact" ' . ($this->method == 'exact' ? 'selected' : '') . '>' . I18N::translate('Exact text') . '</option>' . '<option value="words" ' . ($this->method == 'words' ? 'selected' : '') . '>' . I18N::translate('Whole words only') . '</option>' . '<option value="wildcards" ' . ($this->method == 'wildcards' ? 'selected' : '') . '>' . I18N::translate('Wildcards') . '</option>' . @@ -206,10 +203,10 @@ class BatchUpdateSearchReplacePlugin extends BatchUpdateBasePlugin '<div class="row form-group">' . '<label class="col-sm-3 col-form-label">' . I18N::translate('Case insensitive') . '</label>' . '<div class="col-sm-9">' . - Bootstrap4::radioButtons('case', [ + view('components/radios-inline', ['name' => 'case', 'selected' => $this->case, 'options' => [ '' => I18N::translate('no'), 'i' => I18N::translate('yes'), - ], ($this->case ? 'i' : ''), true, ['onchange' => 'this.form.submit();']) . + ]]) . '<p class="small text-muted">' . /* I18N: Help text for "Case insensitive" searches */ I18N::translate('Match both upper and lower case letters.') . '</p>' . diff --git a/app/Module/BatchUpdateModule.php b/app/Module/BatchUpdateModule.php index 2ead52516b..38ac14e3ab 100644 --- a/app/Module/BatchUpdateModule.php +++ b/app/Module/BatchUpdateModule.php @@ -185,7 +185,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface $record = $this->getRecord($all_data[$xref], $tree); if ($plugin->doesRecordNeedUpdate($record)) { $new_gedcom = $plugin->updateRecord($record); - $record->updateRecord($new_gedcom, !$plugin->chan); + $record->updateRecord($new_gedcom, false); } $parameters['xref'] = $this->findNextXref($plugin, $xref, $all_data, $tree); @@ -196,7 +196,7 @@ class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface $record = $this->getRecord($value, $tree); if ($plugin->doesRecordNeedUpdate($record)) { $new_gedcom = $plugin->updateRecord($record); - $record->updateRecord($new_gedcom, !$plugin->chan); + $record->updateRecord($new_gedcom, false); } } $parameters['xref'] = ''; diff --git a/app/Module/BirthDeathMarriageReportModule.php b/app/Module/BirthDeathMarriageReportModule.php index 5cdb188fb6..d359b7a23c 100644 --- a/app/Module/BirthDeathMarriageReportModule.php +++ b/app/Module/BirthDeathMarriageReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class BirthDeathMarriageReportModule diff --git a/app/Module/BirthReportModule.php b/app/Module/BirthReportModule.php index 415aefcc33..063e213ce7 100644 --- a/app/Module/BirthReportModule.php +++ b/app/Module/BirthReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class BirthReportModule diff --git a/app/Module/CemeteryReportModule.php b/app/Module/CemeteryReportModule.php index a38f077bff..14a1b1c5ec 100644 --- a/app/Module/CemeteryReportModule.php +++ b/app/Module/CemeteryReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class CemeteryReportModule diff --git a/app/Module/CensusAssistantModule.php b/app/Module/CensusAssistantModule.php index 977b0b7830..0e7aab7c1c 100644 --- a/app/Module/CensusAssistantModule.php +++ b/app/Module/CensusAssistantModule.php @@ -209,7 +209,7 @@ class CensusAssistantModule extends AbstractModule */ public function censusTableEmptyRow(CensusInterface $census): string { - return '<tr class="wt-census-assistant-row"><td hidden></td>' . str_repeat('<td class="wt-census-assistant-field"><input type="text" class="form-control wt-census-assistant-form-control"></td>', count($census->columns())) . '<td><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>'; + return '<tr class="wt-census-assistant-row"><td hidden></td>' . str_repeat('<td class="wt-census-assistant-field p-0"><input type="text" class="form-control wt-census-assistant-form-control p-0"></td>', count($census->columns())) . '<td><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>'; } /** @@ -227,7 +227,7 @@ class CensusAssistantModule extends AbstractModule { $html = ''; foreach ($census->columns() as $column) { - $html .= '<td class="wt-census-assistant-field"><input class="form-control wt-census-assistant-form-control" type="text" value="' . $column->generate($individual, $head) . '" name="ca_individuals[' . $individual->xref() . '][]"></td>'; + $html .= '<td class="wt-census-assistant-field p-0"><input class="form-control wt-census-assistant-form-control p-0" type="text" value="' . $column->generate($individual, $head) . '" name="ca_individuals[' . $individual->xref() . '][]"></td>'; } return '<tr class="wt-census-assistant-row"><td class="wt-census-assistant-field" hidden>' . $individual->xref() . '</td>' . $html . '<td class="wt-census-assistant-field"><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>'; diff --git a/app/Module/ChangeReportModule.php b/app/Module/ChangeReportModule.php index 1e37b13775..b846ea8c81 100644 --- a/app/Module/ChangeReportModule.php +++ b/app/Module/ChangeReportModule.php @@ -19,8 +19,6 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class ChangeReportModule diff --git a/app/Module/DeathReportModule.php b/app/Module/DeathReportModule.php index 5817900018..fef0a72f11 100644 --- a/app/Module/DeathReportModule.php +++ b/app/Module/DeathReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class DeathReportModule diff --git a/app/Module/DescendancyReportModule.php b/app/Module/DescendancyReportModule.php index 5bab0aabcc..19e2fa6748 100644 --- a/app/Module/DescendancyReportModule.php +++ b/app/Module/DescendancyReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class DescendancyReportModule diff --git a/app/Module/FactSourcesReportModule.php b/app/Module/FactSourcesReportModule.php index f7b1fb1bc8..a3fee3b5fd 100644 --- a/app/Module/FactSourcesReportModule.php +++ b/app/Module/FactSourcesReportModule.php @@ -19,8 +19,6 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class FactSourcesReportModule diff --git a/app/Module/FanChartModule.php b/app/Module/FanChartModule.php index e6f1335cbe..7045c283a6 100644 --- a/app/Module/FanChartModule.php +++ b/app/Module/FanChartModule.php @@ -343,16 +343,12 @@ class FanChartModule extends AbstractModule implements ModuleChartInterface $areas .= '" href="#' . $person->xref() . '"'; $html .= '<div id="' . $person->xref() . '" class="fan_chart_menu">'; $html .= '<div class="person_box"><div class="details1">'; - $html .= '<a href="' . e($person->url()) . '" class="name1">' . $name; - if ($addname) { - $html .= $addname; - } - $html .= '</a>'; - $html .= '<ul class="charts">'; + $html .= '<div class="charts">'; + $html .= '<a href="' . e($person->url()) . '" class="dropdown-item">' . $name. '</a>'; foreach ($theme->individualBoxMenu($person) as $menu) { - $html .= $menu->getMenuAsList(); + $html .= '<a href="' . e($menu->getLink()) . '" class="dropdown-item p-1 ' . e($menu->getClass()) . '">' . $menu->getLabel() . '</a>'; } - $html .= '</ul>'; + $html .= '</div>'; $html .= '</div></div>'; $html .= '</div>'; $areas .= ' alt="' . strip_tags($person->fullName()) . '" title="' . strip_tags($person->fullName()) . '">'; diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php index 081937994f..0b81d98ee9 100644 --- a/app/Module/FrequentlyAskedQuestionsModule.php +++ b/app/Module/FrequentlyAskedQuestionsModule.php @@ -288,6 +288,8 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon $title = I18N::translate('Edit the FAQ'); } + $tree_names = ['' => I18N::translate('All')] + Tree::getIdList(); + return $this->viewResponse('modules/faq/edit', [ 'block_id' => $block_id, 'block_order' => $block_order, @@ -296,7 +298,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon 'languages' => $languages, 'title' => $title, 'tree' => $tree, - 'tree_names' => Tree::getIdList(), + 'tree_names' => $tree_names, ]); } diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php index 5228fbf8e0..1f3d55de51 100644 --- a/app/Module/HtmlBlockModule.php +++ b/app/Module/HtmlBlockModule.php @@ -161,18 +161,19 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface */ public function editBlockConfiguration(Tree $tree, int $block_id): void { - $templates = [ - I18N::translate('Keyword examples') => view('modules/html/template-keywords', []), - I18N::translate('Narrative description') => view('modules/html/template-narrative', []), - I18N::translate('Statistics') => view('modules/html/template-statistics', []), - ]; - $title = $this->getBlockSetting($block_id, 'title', ''); $html = $this->getBlockSetting($block_id, 'html', ''); $show_timestamp = $this->getBlockSetting($block_id, 'show_timestamp', '0'); $languages = explode(',', $this->getBlockSetting($block_id, 'languages')); $all_trees = Tree::getNameList(); + $templates = [ + $html => I18N::translate('Custom'), + view('modules/html/template-keywords') => I18N::translate('Keyword examples'), + view('modules/html/template-narrative') => I18N::translate('Narrative description'), + view('modules/html/template-statistics') => I18N::translate('Statistics'), + ]; + echo view('modules/html/config', [ 'all_trees' => $all_trees, 'html' => $html, diff --git a/app/Module/IndividualFamiliesReportModule.php b/app/Module/IndividualFamiliesReportModule.php index 1661b938f1..4005f77a88 100644 --- a/app/Module/IndividualFamiliesReportModule.php +++ b/app/Module/IndividualFamiliesReportModule.php @@ -19,8 +19,6 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class IndividualFamiliesReportModule diff --git a/app/Module/IndividualReportModule.php b/app/Module/IndividualReportModule.php index 04cfdea9a3..34798b8406 100644 --- a/app/Module/IndividualReportModule.php +++ b/app/Module/IndividualReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class IndividualReportModule diff --git a/app/Module/LoggedInUsersModule.php b/app/Module/LoggedInUsersModule.php index 98af1cfa56..7ff65ee8c8 100644 --- a/app/Module/LoggedInUsersModule.php +++ b/app/Module/LoggedInUsersModule.php @@ -18,7 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Statistics; use Fisharebest\Webtrees\Tree; use Illuminate\Support\Str; diff --git a/app/Module/MarriageReportModule.php b/app/Module/MarriageReportModule.php index af564c8189..c997dad85e 100644 --- a/app/Module/MarriageReportModule.php +++ b/app/Module/MarriageReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class MarriageReportModule diff --git a/app/Module/MissingFactsReportModule.php b/app/Module/MissingFactsReportModule.php index afb0f3d524..5ccfebe7d8 100644 --- a/app/Module/MissingFactsReportModule.php +++ b/app/Module/MissingFactsReportModule.php @@ -19,8 +19,6 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class MissingFactsReportModule diff --git a/app/Module/ModuleInterface.php b/app/Module/ModuleInterface.php index 7aaeb69b08..4bfb4bdb85 100644 --- a/app/Module/ModuleInterface.php +++ b/app/Module/ModuleInterface.php @@ -18,7 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Tree; -use Symfony\Component\HttpFoundation\Response; /** * Interface ModuleInterface - Classes and libraries for module system diff --git a/app/Module/ModuleLanguageTrait.php b/app/Module/ModuleLanguageTrait.php index d7dbd96715..4cd477c80c 100644 --- a/app/Module/ModuleLanguageTrait.php +++ b/app/Module/ModuleLanguageTrait.php @@ -19,7 +19,6 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Localization\Locale\LocaleEnUs; use Fisharebest\Localization\Locale\LocaleInterface; -use Fisharebest\Webtrees\I18N; /** * Trait ModuleLanguageEventsTrait - default implementation of ModuleLanguageInterface. diff --git a/app/Module/OccupationReportModule.php b/app/Module/OccupationReportModule.php index d9f45e115b..8c51778125 100644 --- a/app/Module/OccupationReportModule.php +++ b/app/Module/OccupationReportModule.php @@ -19,8 +19,6 @@ namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class OccupationReportModule diff --git a/app/Module/PedigreeReportModule.php b/app/Module/PedigreeReportModule.php index 89bf1953e1..d69b8fb301 100644 --- a/app/Module/PedigreeReportModule.php +++ b/app/Module/PedigreeReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class PedigreeReportModule diff --git a/app/Module/RelatedIndividualsReportModule.php b/app/Module/RelatedIndividualsReportModule.php index f41cf2c22a..02cfc4392d 100644 --- a/app/Module/RelatedIndividualsReportModule.php +++ b/app/Module/RelatedIndividualsReportModule.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Module; use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Menu; /** * Class RelatedIndividualsReportModule diff --git a/app/Module/StatisticsChartModule.php b/app/Module/StatisticsChartModule.php index 9c2101fef8..0c10e77587 100644 --- a/app/Module/StatisticsChartModule.php +++ b/app/Module/StatisticsChartModule.php @@ -177,12 +177,12 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa */ public function getIndividualsAction(Statistics $statistics): Response { - $html = view('modules/statistics-chart/individuals', [ + $this->layout = 'layouts/ajax'; + + return $this->viewResponse('modules/statistics-chart/individuals', [ 'show_oldest_living' => Auth::check(), 'stats' => $statistics, ]); - - return new Response($html); } /** @@ -192,11 +192,11 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa */ public function getFamiliesAction(Statistics $stats): Response { - $html = view('modules/statistics-chart/families', [ + $this->layout = 'layouts/ajax'; + + return $this->viewResponse('modules/statistics-chart/families', [ 'stats' => $stats, ]); - - return new Response($html); } /** @@ -206,11 +206,11 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa */ public function getOtherAction(Statistics $stats): Response { - $html = view('modules/statistics-chart/other', [ + $this->layout = 'layouts/ajax'; + + return $this->viewResponse('modules/statistics-chart/other', [ 'stats' => $stats, ]); - - return new Response($html); } /** @@ -220,12 +220,12 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa */ public function getCustomAction(Tree $tree): Response { - $html = view('modules/statistics-chart/custom', [ + $this->layout = 'layouts/ajax'; + + return $this->viewResponse('modules/statistics-chart/custom', [ 'module' => $this, 'tree' => $tree, ]); - - return new Response($html); } /** |