@@ -64,7 +64,7 @@ |
||
| 64 | 64 | { |
| 65 | 65 | use ModuleListTrait; |
| 66 | 66 | |
| 67 | - protected const ROUTE_URL = '/tree/{tree}/branches{/surname}'; |
|
| 67 | + protected const ROUTE_URL = '/tree/{tree}/branches{/surname}'; |
|
| 68 | 68 | |
| 69 | 69 | /** @var ModuleService */ |
| 70 | 70 | protected $module_service; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | use ModuleListTrait; |
| 61 | 61 | |
| 62 | - protected const ROUTE_URL = '/tree/{tree}/individual-list'; |
|
| 62 | + protected const ROUTE_URL = '/tree/{tree}/individual-list'; |
|
| 63 | 63 | |
| 64 | 64 | /** @var LocalizationService */ |
| 65 | 65 | private $localization_service; |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | $alpha = $params['alpha'] ?? ''; |
| 200 | 200 | |
| 201 | 201 | // All individuals with this surname |
| 202 | - $surname = $params['surname'] ?? ''; |
|
| 202 | + $surname = $params['surname'] ?? ''; |
|
| 203 | 203 | |
| 204 | 204 | // All individuals |
| 205 | 205 | $show_all = $params['show_all'] ?? 'no'; |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | 'tree' => $tree->name(), |
| 253 | 253 | 'show_all' => 'yes', |
| 254 | 254 | ]; |
| 255 | - $show = $params['show'] ?? 'surn'; |
|
| 255 | + $show = $params['show'] ?? 'surn'; |
|
| 256 | 256 | } |
| 257 | 257 | } elseif ($surname !== '') { |
| 258 | 258 | $alpha = $this->localization_service->initialLetter($surname, I18N::locale()); // so we can highlight the initial letter |
@@ -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')) { |