@@ -135,7 +135,7 @@ |
||
| 135 | 135 | $decades .= '|' . I18N::number($i); |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|'; |
|
| 138 | + $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|'; |
|
| 139 | 139 | $title = I18N::translate('Average age related to death century'); |
| 140 | 140 | |
| 141 | 141 | if (\count($rows) > 6 || mb_strlen($title) < 30) { |
@@ -479,7 +479,7 @@ |
||
| 479 | 479 | 'age' => $age, |
| 480 | 480 | ]; |
| 481 | 481 | |
| 482 | - $dist[] = $fam->family; |
|
| 482 | + $dist[] = $fam->family; |
|
| 483 | 483 | } |
| 484 | 484 | } elseif (!$one && $child1->canShow() && $child2->canShow()) { |
| 485 | 485 | $top10[] = [ |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | /** |
| 30 | 30 | * Where are our CSS, JS and other assets? |
| 31 | 31 | */ |
| 32 | - public const ASSET_DIR = 'themes/fab/css-2.0.0/'; |
|
| 32 | + public const ASSET_DIR = 'themes/fab/css-2.0.0/'; |
|
| 33 | 33 | |
| 34 | 34 | protected const PERSON_BOX_CLASSES = [ |
| 35 | 35 | 'M' => 'person_box', |
@@ -322,14 +322,14 @@ discard block |
||
| 322 | 322 | case 'sis': |
| 323 | 323 | case 'sib': |
| 324 | 324 | $table[$x + 1][$y] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class)->parameter('image-hline') . ') repeat-x center; width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . view('icons/arrow-end') . '</div></div>'; |
| 325 | - $x += 2; |
|
| 325 | + $x += 2; |
|
| 326 | 326 | break; |
| 327 | 327 | case 'son': |
| 328 | 328 | case 'dau': |
| 329 | 329 | case 'chi': |
| 330 | 330 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
| 331 | 331 | $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . view('icons/arrow-down') . '</div></div>'; |
| 332 | - $x += 2; |
|
| 332 | + $x += 2; |
|
| 333 | 333 | } else { |
| 334 | 334 | $table[$x][$y - 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class) |
| 335 | 335 | ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>'; |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | case 'par': |
| 342 | 342 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
| 343 | 343 | $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . view('icons/arrow-down') . '</div></div>'; |
| 344 | - $x += 2; |
|
| 344 | + $x += 2; |
|
| 345 | 345 | } else { |
| 346 | 346 | $table[$x][$y + 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class) |
| 347 | 347 | ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>'; |
@@ -482,17 +482,17 @@ discard block |
||
| 482 | 482 | */ |
| 483 | 483 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
| 484 | 484 | { |
| 485 | - $spouse_codes = [ |
|
| 485 | + $spouse_codes = [ |
|
| 486 | 486 | 'M' => 'hus', |
| 487 | 487 | 'F' => 'wif', |
| 488 | 488 | 'U' => 'spo', |
| 489 | 489 | ]; |
| 490 | - $parent_codes = [ |
|
| 490 | + $parent_codes = [ |
|
| 491 | 491 | 'M' => 'fat', |
| 492 | 492 | 'F' => 'mot', |
| 493 | 493 | 'U' => 'par', |
| 494 | 494 | ]; |
| 495 | - $child_codes = [ |
|
| 495 | + $child_codes = [ |
|
| 496 | 496 | 'M' => 'son', |
| 497 | 497 | 'F' => 'dau', |
| 498 | 498 | 'U' => 'chi', |