@@ -345,10 +345,10 @@ |
||
| 345 | 345 | } |
| 346 | 346 | // print gedcom ages |
| 347 | 347 | foreach ([ |
| 348 | - I18N::translate('Age') => $fact_age, |
|
| 349 | - I18N::translate('Husband') => $husb_age, |
|
| 350 | - I18N::translate('Wife') => $wife_age, |
|
| 351 | - ] as $label => $age) { |
|
| 348 | + I18N::translate('Age') => $fact_age, |
|
| 349 | + I18N::translate('Husband') => $husb_age, |
|
| 350 | + I18N::translate('Wife') => $wife_age, |
|
| 351 | + ] as $label => $age) { |
|
| 352 | 352 | if ($age != '') { |
| 353 | 353 | $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>'; |
| 354 | 354 | } |
@@ -840,9 +840,9 @@ |
||
| 840 | 840 | } |
| 841 | 841 | |
| 842 | 842 | foreach ([ |
| 843 | - 'main' => $main_blocks, |
|
| 844 | - 'side' => $side_blocks, |
|
| 845 | - ] as $location => $updated_blocks) { |
|
| 843 | + 'main' => $main_blocks, |
|
| 844 | + 'side' => $side_blocks, |
|
| 845 | + ] as $location => $updated_blocks) { |
|
| 846 | 846 | foreach ($updated_blocks as $block_order => $block_id) { |
| 847 | 847 | if (is_numeric($block_id)) { |
| 848 | 848 | // Updated block |
@@ -224,10 +224,10 @@ |
||
| 224 | 224 | $src = $this->imageUrl($width, $height, $fit); |
| 225 | 225 | $srcset = []; |
| 226 | 226 | foreach ([ |
| 227 | - 2, |
|
| 228 | - 3, |
|
| 229 | - 4, |
|
| 230 | - ] as $x) { |
|
| 227 | + 2, |
|
| 228 | + 3, |
|
| 229 | + 4, |
|
| 230 | + ] as $x) { |
|
| 231 | 231 | $srcset[] = $this->imageUrl($width * $x, $height * $x, $fit) . ' ' . $x . 'x'; |
| 232 | 232 | } |
| 233 | 233 | } |
@@ -190,8 +190,8 @@ discard block |
||
| 190 | 190 | foreach ($person->getChildFamilies() as $cfamily) { |
| 191 | 191 | foreach ($cfamily->getSpouses() as $parent) { |
| 192 | 192 | echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->tree()->name(), |
| 193 | - 'xref' => $parent->xref(), |
|
| 194 | - 'generations' => $generations, |
|
| 193 | + 'xref' => $parent->xref(), |
|
| 194 | + 'generations' => $generations, |
|
| 195 | 195 | ]), |
| 196 | 196 | ]); |
| 197 | 197 | // only show the arrow for one of the parents |
@@ -273,8 +273,8 @@ discard block |
||
| 273 | 273 | foreach ($spouse->getChildFamilies() as $cfamily) { |
| 274 | 274 | foreach ($cfamily->getSpouses() as $parent) { |
| 275 | 275 | echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->tree()->name(), |
| 276 | - 'xref' => $parent->xref(), |
|
| 277 | - 'generations' => $generations, |
|
| 276 | + 'xref' => $parent->xref(), |
|
| 277 | + 'generations' => $generations, |
|
| 278 | 278 | ]), |
| 279 | 279 | ]); |
| 280 | 280 | // only show the arrow for one of the parents |
@@ -399,19 +399,19 @@ |
||
| 399 | 399 | private function faqsExist(Tree $tree, string $language): bool |
| 400 | 400 | { |
| 401 | 401 | return DB::table('block') |
| 402 | - ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
| 403 | - ->where('module_name', '=', $this->name()) |
|
| 404 | - ->where('setting_name', '=', 'languages') |
|
| 405 | - ->where(function (Builder $query) use ($tree): void { |
|
| 406 | - $query |
|
| 407 | - ->whereNull('gedcom_id') |
|
| 408 | - ->orWhere('gedcom_id', '=', $tree->id()); |
|
| 409 | - }) |
|
| 410 | - ->select(['setting_value AS languages']) |
|
| 411 | - ->get() |
|
| 412 | - ->filter(function (stdClass $faq) use ($language): bool { |
|
| 413 | - return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
| 414 | - }) |
|
| 402 | + ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
| 403 | + ->where('module_name', '=', $this->name()) |
|
| 404 | + ->where('setting_name', '=', 'languages') |
|
| 405 | + ->where(function (Builder $query) use ($tree): void { |
|
| 406 | + $query |
|
| 407 | + ->whereNull('gedcom_id') |
|
| 408 | + ->orWhere('gedcom_id', '=', $tree->id()); |
|
| 409 | + }) |
|
| 410 | + ->select(['setting_value AS languages']) |
|
| 411 | + ->get() |
|
| 412 | + ->filter(function (stdClass $faq) use ($language): bool { |
|
| 413 | + return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
| 414 | + }) |
|
| 415 | 415 | ->isNotEmpty(); |
| 416 | 416 | } |
| 417 | 417 | } |
@@ -75,10 +75,10 @@ |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
| 78 | - * The default position for this footer. It can be changed in the control panel. |
|
| 79 | - * |
|
| 80 | - * @return int |
|
| 81 | - */ |
|
| 78 | + * The default position for this footer. It can be changed in the control panel. |
|
| 79 | + * |
|
| 80 | + * @return int |
|
| 81 | + */ |
|
| 82 | 82 | public function defaultFooterOrder(): int |
| 83 | 83 | { |
| 84 | 84 | return 2; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | ->on('birth.d_file', '=', 'i_file') |
| 66 | 66 | ->on('birth.d_gid', '=', 'i_id'); |
| 67 | 67 | }) |
| 68 | - ->join('dates AS death', function (JoinClause $join): void { |
|
| 68 | + ->join('dates AS death', function (JoinClause $join): void { |
|
| 69 | 69 | $join |
| 70 | 70 | ->on('death.d_file', '=', 'i_file') |
| 71 | 71 | ->on('death.d_gid', '=', 'i_id'); |
@@ -162,10 +162,10 @@ discard block |
||
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | $chart_url = 'https://chart.googleapis.com/chart?cht=bvg&chs=' . $sizes[0] . 'x' . $sizes[1] |
| 165 | - . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt=' |
|
| 166 | - . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
| 167 | - . rawurlencode($chxl) . '&chdl=' |
|
| 168 | - . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
| 165 | + . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt=' |
|
| 166 | + . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
| 167 | + . rawurlencode($chxl) . '&chdl=' |
|
| 168 | + . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
| 169 | 169 | |
| 170 | 170 | return view( |
| 171 | 171 | 'statistics/other/chart-google', |