@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | $data_filesystem = $request->getAttribute('filesystem.data'); |
| 153 | 153 | assert($data_filesystem instanceof FilesystemInterface); |
| 154 | 154 | |
| 155 | - $files = $request->getQueryParams()['files']; // local|external|unused |
|
| 155 | + $files = $request->getQueryParams()['files']; // local|external|unused |
|
| 156 | 156 | |
| 157 | 157 | // Files within this folder |
| 158 | 158 | $media_folder = $request->getQueryParams()['media_folder']; |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | $create_form = ''; |
| 267 | 267 | foreach ($media_trees as $media_tree => $media_directory) { |
| 268 | 268 | if (str_starts_with($row[0], $media_directory)) { |
| 269 | - $tmp = substr($row[0], strlen($media_directory)); |
|
| 269 | + $tmp = substr($row[0], strlen($media_directory)); |
|
| 270 | 270 | $create_form .= |
| 271 | 271 | '<p><a href="#" data-toggle="modal" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route('create-media-from-file', ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>'; |
| 272 | 272 | } |
@@ -360,8 +360,8 @@ discard block |
||
| 360 | 360 | try { |
| 361 | 361 | // This will work for local filesystems. For remote filesystems, we will |
| 362 | 362 | // need to copy the file locally to work out the image size. |
| 363 | - $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
| 364 | - $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
| 363 | + $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
| 364 | + $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
| 365 | 365 | /* I18N: image dimensions, width × height */ |
| 366 | 366 | $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>'; |
| 367 | 367 | } catch (Throwable $ex) { |
@@ -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')) { |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $anniversary_facts = $this->calendar_service->getCalendarEvents($ged_year->minimumJulianDay(), $ged_year->maximumJulianDay(), $filterev, $tree, $filterof, $filtersx); |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - $anniversaries = Collection::make($anniversary_facts) |
|
| 109 | + $anniversaries = Collection::make($anniversary_facts) |
|
| 110 | 110 | ->unique() |
| 111 | 111 | ->sort(static function (Fact $x, Fact $y): int { |
| 112 | 112 | return $x->date()->minimumJulianDay() <=> $y->date()->minimumJulianDay(); |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | $html = ''; |
| 286 | 286 | |
| 287 | 287 | foreach ($list as $xref => $facts) { |
| 288 | - $tmp = Factory::gedcomRecord()->make((string) $xref, $tree); |
|
| 288 | + $tmp = Factory::gedcomRecord()->make((string) $xref, $tree); |
|
| 289 | 289 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> '; |
| 290 | 290 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
| 291 | 291 | } |