@@ -3,7 +3,8 @@ |
||
| 3 | 3 | use Fisharebest\Webtrees\Module\ModuleCustomInterface; |
| 4 | 4 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
| 5 | 5 | |
| 6 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
| 6 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
| 7 | +{ |
|
| 7 | 8 | use ModuleCustomTrait; |
| 8 | 9 | |
| 9 | 10 | /** |
@@ -13,7 +13,8 @@ |
||
| 13 | 13 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
| 14 | 14 | use Fisharebest\Webtrees\View; |
| 15 | 15 | |
| 16 | -return new class extends MinimalTheme implements ModuleCustomInterface { |
|
| 16 | +return new class extends MinimalTheme implements ModuleCustomInterface |
|
| 17 | +{ |
|
| 17 | 18 | use ModuleCustomTrait; |
| 18 | 19 | |
| 19 | 20 | /** |
@@ -326,7 +326,8 @@ discard block |
||
| 326 | 326 | <li class="wt-initials-list-item d-flex"> |
| 327 | 327 | <?php if ($count > 0) : ?> |
| 328 | 328 | <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 329 | - <?php else : ?> |
|
| 329 | + <?php else { |
|
| 330 | + : ?> |
|
| 330 | 331 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 331 | 332 | |
| 332 | 333 | <?php endif ?> |
@@ -380,6 +381,7 @@ discard block |
||
| 380 | 381 | |
| 381 | 382 | if ($show === 'indi' || $show === 'surn') { |
| 382 | 383 | $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families, I18N::locale()); |
| 384 | +} |
|
| 383 | 385 | if ($show === 'surn') { |
| 384 | 386 | // Show the surname list |
| 385 | 387 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | /** |
| 41 | 41 | * Edit the tree preferences. |
| 42 | 42 | */ |
| 43 | -class TreePreferencesAction implements RequestHandlerInterface |
|
| 44 | -{
|
|
| 43 | +class TreePreferencesAction implements RequestHandlerInterface |
|
| 44 | +{ |
|
| 45 | 45 | /** |
| 46 | 46 | * @param ServerRequestInterface $request |
| 47 | 47 | * |
@@ -119,8 +119,8 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | $gedcom = $params['gedcom'] ?? ''; |
| 121 | 121 | |
| 122 | - if ($gedcom !== '' && $gedcom !== $tree->name()) {
|
|
| 123 | - try {
|
|
| 122 | + if ($gedcom !== '' && $gedcom !== $tree->name()) { |
|
| 123 | + try { |
|
| 124 | 124 | DB::table('gedcom')
|
| 125 | 125 | ->where('gedcom_id', '=', $tree->id())
|
| 126 | 126 | ->update(['gedcom_name' => $gedcom]); |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | ->where('setting_name', '=', 'DEFAULT_GEDCOM')
|
| 130 | 130 | ->where('setting_value', '=', $tree->name())
|
| 131 | 131 | ->update(['setting_value' => $gedcom]); |
| 132 | - } catch (Exception $ex) {
|
|
| 132 | + } catch (Exception $ex) { |
|
| 133 | 133 | // Probably a duplicate name. |
| 134 | 134 | } |
| 135 | 135 | } |
@@ -140,11 +140,11 @@ discard block |
||
| 140 | 140 | $all_trees = $params['all_trees'] ?? ''; |
| 141 | 141 | $new_trees = $params['new_trees'] ?? ''; |
| 142 | 142 | |
| 143 | - if ($all_trees === 'on') {
|
|
| 143 | + if ($all_trees === 'on') { |
|
| 144 | 144 | FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.'), 'success');
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - if ($new_trees === 'on') {
|
|
| 147 | + if ($new_trees === 'on') { |
|
| 148 | 148 | FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.'), 'success');
|
| 149 | 149 | } |
| 150 | 150 | |
@@ -26,8 +26,8 @@ discard block |
||
| 26 | 26 | /** |
| 27 | 27 | * Populate the gedcom_setting table |
| 28 | 28 | */ |
| 29 | -class SeedGedcomSettingTable implements SeedInterface |
|
| 30 | -{
|
|
| 29 | +class SeedGedcomSettingTable implements SeedInterface |
|
| 30 | +{ |
|
| 31 | 31 | private const DEFAULT_SETTINGS = [ |
| 32 | 32 | 'ADVANCED_NAME_FACTS' => 'NICK,_AKA', |
| 33 | 33 | 'ADVANCED_PLAC_FACTS' => '', |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | public function run(): void |
| 115 | 115 | {
|
| 116 | 116 | // Set default settings for new trees |
| 117 | - foreach (self::DEFAULT_SETTINGS as $setting_name => $setting_value) {
|
|
| 117 | + foreach (self::DEFAULT_SETTINGS as $setting_name => $setting_value) { |
|
| 118 | 118 | DB::table('gedcom_setting')->updateOrInsert([
|
| 119 | 119 | 'gedcom_id' => -1, |
| 120 | 120 | 'setting_name' => $setting_name, |