Completed
Pull Request — master (#1854)
by Rico
149:06 queued 135:36
created
resources/views/relationships-page.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -17,12 +17,12 @@  discard block
 block discarded – undo
17 17
 		</label>
18 18
 		<div class="col-sm-9 wt-page-options-value">
19 19
 			<?= FunctionsEdit::formControlIndividual($tree, $individual1, [
20
-				'id'   => 'xref1',
21
-				'name' => 'xref1',
22
-			]) ?>
20
+                'id'   => 'xref1',
21
+                'name' => 'xref1',
22
+            ]) ?>
23 23
 			<button class="btn btn-link small" id="btn-swap-individuals" type="button">
24 24
 				<?= /* I18N: Reverse the order of two individuals */
25
-				I18N::translate('Swap individuals') ?>
25
+                I18N::translate('Swap individuals') ?>
26 26
 			</button>
27 27
 		</div>
28 28
 	</div>
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 		</label>
34 34
 		<div class="col-sm-9 wt-page-options-value">
35 35
 			<?= FunctionsEdit::formControlIndividual($tree, $individual2, [
36
-				'id'   => 'xref2',
37
-				'name' => 'xref2',
38
-			]) ?>
36
+                'id'   => 'xref2',
37
+                'name' => 'xref2',
38
+            ]) ?>
39 39
 		</div>
40 40
 	</div>
41 41
 
@@ -73,19 +73,19 @@  discard block
 block discarded – undo
73 73
 		<div class="col-form-label col-sm-3 wt-page-options-label"></div>
74 74
 		<div class="col-sm-9 wt-page-options-value">
75 75
 			<input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */
76
-			I18N::translate('view') ?>">
76
+            I18N::translate('view') ?>">
77 77
 		</div>
78 78
 	</div>
79 79
 </form>
80 80
 
81 81
 <?php if ($individual1 !== null && $individual2 !== null): ?>
82 82
 	<div class="wt-ajax-load wt-page-content wt-chart wt-relationships-chart" data-ajax-url="<?= e(route('relationships-chart', [
83
-		'xref1'     => $individual1->getXref(),
84
-		'xref2'     => $individual2->getXref(),
85
-		'ged'       => $individual2->getTree()->getName(),
86
-		'recursion' => $recursion,
87
-		'ancestors' => $ancestors,
88
-	])) ?>"></div>
83
+        'xref1'     => $individual1->getXref(),
84
+        'xref2'     => $individual2->getXref(),
85
+        'ged'       => $individual2->getTree()->getName(),
86
+        'recursion' => $recursion,
87
+        'ancestors' => $ancestors,
88
+    ])) ?>"></div>
89 89
 <?php endif ?>
90 90
 
91 91
 <?php View::push('javascript') ?>
Please login to merge, or discard this patch.
resources/views/timeline-chart.php 1 patch
Indentation   +132 added lines, -132 removed lines patch added patch discarded remove patch
@@ -14,18 +14,18 @@  discard block
 block discarded – undo
14 14
   var birthmonths = [];
15 15
   var birthdays   = [];
16 16
 	<?php
17
-	foreach ($individuals as $c => $indi) {
18
-		if (!empty($birthyears[$indi->getXref()])) {
19
-			echo 'birthyears[' . $c . ']=' . $birthyears[$indi->getXref()] . ';';
20
-		}
21
-		if (!empty($birthmonths[$indi->getXref()])) {
22
-			echo 'birthmonths[' . $c . ']=' . $birthmonths[$indi->getXref()] . ';';
23
-		}
24
-		if (!empty($birthdays[$indi->getXref()])) {
25
-			echo 'birthdays[' . $c . ']=' . $birthdays[$indi->getXref()] . ';';
26
-		}
27
-	}
28
-	?>
17
+    foreach ($individuals as $c => $indi) {
18
+        if (!empty($birthyears[$indi->getXref()])) {
19
+            echo 'birthyears[' . $c . ']=' . $birthyears[$indi->getXref()] . ';';
20
+        }
21
+        if (!empty($birthmonths[$indi->getXref()])) {
22
+            echo 'birthmonths[' . $c . ']=' . $birthmonths[$indi->getXref()] . ';';
23
+        }
24
+        if (!empty($birthdays[$indi->getXref()])) {
25
+            echo 'birthdays[' . $c . ']=' . $birthdays[$indi->getXref()] . ';';
26
+        }
27
+    }
28
+    ?>
29 29
 
30 30
   var bheight = <?= $bheight ?>;
31 31
   var scale   = <?= $scale ?>;
@@ -255,134 +255,134 @@  discard block
 block discarded – undo
255 255
 		<?= $baseyear ?>
256 256
 	</div>
257 257
 	<?php
258
-	// at a scale of 25 or higher, show every year
259
-	$mod = 25 / $scale;
260
-	if ($mod < 1) {
261
-		$mod = 1;
262
-	}
263
-	for ($i = $baseyear + 1; $i < $topyear; $i++) {
264
-		if ($i % $mod === 0) {
265
-			echo '<div id="scale' . $i . '" style="position:absolute; ' . (I18N::direction() === 'ltr' ? 'left:0;' : 'right:0;') . ' top:' . ((($i - $baseyear) * $scale) - $scale / 2) . 'px; font-size: 7pt; text-align:' . (I18N::direction() === 'ltr' ? 'left' : 'right') . ';">';
266
-			echo $i;
267
-			echo '</div>';
268
-		}
269
-	}
270
-	echo '';
271
-	?>
258
+    // at a scale of 25 or higher, show every year
259
+    $mod = 25 / $scale;
260
+    if ($mod < 1) {
261
+        $mod = 1;
262
+    }
263
+    for ($i = $baseyear + 1; $i < $topyear; $i++) {
264
+        if ($i % $mod === 0) {
265
+            echo '<div id="scale' . $i . '" style="position:absolute; ' . (I18N::direction() === 'ltr' ? 'left:0;' : 'right:0;') . ' top:' . ((($i - $baseyear) * $scale) - $scale / 2) . 'px; font-size: 7pt; text-align:' . (I18N::direction() === 'ltr' ? 'left' : 'right') . ';">';
266
+            echo $i;
267
+            echo '</div>';
268
+        }
269
+    }
270
+    echo '';
271
+    ?>
272 272
 	<div id="scale<?= e($topyear) ?>" style="position:absolute; <?= I18N::direction() === 'ltr' ? 'left' : 'right' ?>:0; top:<?= ($topyear - $baseyear) * $scale ?>px; font-size: 7pt; text-align:<?= I18N::direction() === 'ltr' ? 'left' : 'right' ?>;">
273 273
 		<?= e($topyear) ?>
274 274
 	</div>
275 275
 
276 276
 	<?php foreach ($indifacts as $factcount => $event): ?>
277 277
 		<?php
278
-		$desc     = $event->getValue();
279
-		$gdate    = $event->getDate();
280
-		$date     = $gdate->minimumDate();
281
-		$date     = $date->convertToCalendar('gregorian');
282
-		$year     = $date->y;
283
-		$month    = max(1, $date->m);
284
-		$day      = max(1, $date->d);
285
-		$xoffset  = 0 + 22;
286
-		$yoffset  = 0 + (($year - $baseyear) * $scale) - ($scale);
287
-		$yoffset  = $yoffset + (($month / 12) * $scale);
288
-		$yoffset  = $yoffset + (($day / 30) * ($scale / 12));
289
-		$yoffset  = (int) ($yoffset);
290
-		$place    = (int) ($yoffset / $bheight);
291
-		$i        = 1;
292
-		$j        = 0;
293
-		$tyoffset = 0;
294
-		while (isset($placements[$place])) {
295
-			if ($i === $j) {
296
-				$tyoffset = $bheight * $i;
297
-				$i++;
298
-			} else {
299
-				$tyoffset = -1 * $bheight * $j;
300
-				$j++;
301
-			}
302
-			$place = (int) (($yoffset + $tyoffset) / $bheight);
303
-		}
304
-		$yoffset            += $tyoffset;
305
-		$xoffset            += abs($tyoffset);
306
-		$placements[$place] = $yoffset;
278
+        $desc     = $event->getValue();
279
+        $gdate    = $event->getDate();
280
+        $date     = $gdate->minimumDate();
281
+        $date     = $date->convertToCalendar('gregorian');
282
+        $year     = $date->y;
283
+        $month    = max(1, $date->m);
284
+        $day      = max(1, $date->d);
285
+        $xoffset  = 0 + 22;
286
+        $yoffset  = 0 + (($year - $baseyear) * $scale) - ($scale);
287
+        $yoffset  = $yoffset + (($month / 12) * $scale);
288
+        $yoffset  = $yoffset + (($day / 30) * ($scale / 12));
289
+        $yoffset  = (int) ($yoffset);
290
+        $place    = (int) ($yoffset / $bheight);
291
+        $i        = 1;
292
+        $j        = 0;
293
+        $tyoffset = 0;
294
+        while (isset($placements[$place])) {
295
+            if ($i === $j) {
296
+                $tyoffset = $bheight * $i;
297
+                $i++;
298
+            } else {
299
+                $tyoffset = -1 * $bheight * $j;
300
+                $j++;
301
+            }
302
+            $place = (int) (($yoffset + $tyoffset) / $bheight);
303
+        }
304
+        $yoffset            += $tyoffset;
305
+        $xoffset            += abs($tyoffset);
306
+        $placements[$place] = $yoffset;
307 307
 
308
-		echo "<div id=\"fact$factcount\" style=\"position:absolute; " . (I18N::direction() === 'ltr' ? 'left: ' . ($xoffset) : 'right: ' . ($xoffset)) . 'px; top:' . ($yoffset) . 'px; font-size: 8pt; height: ' . ($bheight) . "px;\" onmousedown=\"factMouseDown(this, '" . $factcount . "', " . ($yoffset - $tyoffset) . ');">';
309
-		echo '<table cellspacing="0" cellpadding="0" border="0" style="cursor: hand;"><tr><td>';
310
-		echo '<img src="' . Theme::theme()->parameter('image-hline') . '" name="boxline' . $factcount . '" id="boxline' . $factcount . '" height="3" width="10" style="padding-';
311
-		if (I18N::direction() === 'ltr') {
312
-			echo 'left: 3px;">';
313
-		} else {
314
-			echo 'right: 3px;">';
315
-		}
308
+        echo "<div id=\"fact$factcount\" style=\"position:absolute; " . (I18N::direction() === 'ltr' ? 'left: ' . ($xoffset) : 'right: ' . ($xoffset)) . 'px; top:' . ($yoffset) . 'px; font-size: 8pt; height: ' . ($bheight) . "px;\" onmousedown=\"factMouseDown(this, '" . $factcount . "', " . ($yoffset - $tyoffset) . ');">';
309
+        echo '<table cellspacing="0" cellpadding="0" border="0" style="cursor: hand;"><tr><td>';
310
+        echo '<img src="' . Theme::theme()->parameter('image-hline') . '" name="boxline' . $factcount . '" id="boxline' . $factcount . '" height="3" width="10" style="padding-';
311
+        if (I18N::direction() === 'ltr') {
312
+            echo 'left: 3px;">';
313
+        } else {
314
+            echo 'right: 3px;">';
315
+        }
316 316
 
317
-		$col = array_search($event->getParent(), $individuals);
318
-		if ($col === false) {
319
-			// Marriage event - use the color of the husband
320
-			$col = array_search($event->getParent()->getHusband(), $individuals);
321
-		}
322
-		if ($col === false) {
323
-			// Marriage event - use the color of the wife
324
-			$col = array_search($event->getParent()->getWife(), $individuals);
325
-		}
326
-		$col = $col % 6;
327
-		echo '</td><td class="person' . $col . '">';
328
-		if (count($individuals) > 6) {
329
-			// We only have six colours, so show naes if more than this number
330
-			echo $event->getParent()->getFullName() . ' — ';
331
-		}
332
-		$record = $event->getParent();
333
-		echo $event->getLabel();
334
-		echo ' — ';
335
-		if ($record instanceof Individual) {
336
-			echo FunctionsPrint::formatFactDate($event, $record, false, false);
337
-		} elseif ($record instanceof Family) {
338
-			echo $gdate->display();
339
-			if ($record->getHusband() && $record->getHusband()->getBirthDate()->isOK()) {
340
-				$ageh = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getHusband()->getBirthDate(), $gdate));
341
-			} else {
342
-				$ageh = null;
343
-			}
344
-			if ($record->getWife() && $record->getWife()->getBirthDate()->isOK()) {
345
-				$agew = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getWife()->getBirthDate(), $gdate));
346
-			} else {
347
-				$agew = null;
348
-			}
349
-			if ($ageh && $agew) {
350
-				echo '<span class="age"> ', I18N::translate('Husband’s age'), ' ', $ageh, ' ', I18N::translate('Wife’s age'), ' ', $agew, '</span>';
351
-			} elseif ($ageh) {
352
-				echo '<span class="age"> ', I18N::translate('Age'), ' ', $ageh, '</span>';
353
-			} elseif ($agew) {
354
-				echo '<span class="age"> ', I18N::translate('Age'), ' ', $ageh, '</span>';
355
-			}
356
-		}
357
-		echo ' ' . e($desc);
358
-		if (!$event->getPlace()->isEmpty()) {
359
-			echo ' — ' . $event->getPlace()->getShortName();
360
-		}
361
-		// Print spouses names for family events
362
-		if ($event->getParent() instanceof Family) {
363
-			echo ' — <a href="', e($event->getParent()->url()), '">', $event->getParent()->getFullName(), '</a>';
364
-		}
365
-		echo '</td></tr></table>';
366
-		echo '</div>';
367
-		if (I18N::direction() === 'ltr') {
368
-			$img  = 'image-dline2';
369
-			$ypos = '0%';
370
-		} else {
371
-			$img  = 'image-dline';
372
-			$ypos = '100%';
373
-		}
374
-		$dyoffset = ($yoffset - $tyoffset) + $bheight / 3;
375
-		if ($tyoffset < 0) {
376
-			$dyoffset = $yoffset + $bheight / 3;
377
-			if (I18N::direction() === 'ltr') {
378
-				$img  = 'image-dline';
379
-				$ypos = '100%';
380
-			} else {
381
-				$img  = 'image-dline2';
382
-				$ypos = '0%';
383
-			}
384
-		}
385
-		?>
317
+        $col = array_search($event->getParent(), $individuals);
318
+        if ($col === false) {
319
+            // Marriage event - use the color of the husband
320
+            $col = array_search($event->getParent()->getHusband(), $individuals);
321
+        }
322
+        if ($col === false) {
323
+            // Marriage event - use the color of the wife
324
+            $col = array_search($event->getParent()->getWife(), $individuals);
325
+        }
326
+        $col = $col % 6;
327
+        echo '</td><td class="person' . $col . '">';
328
+        if (count($individuals) > 6) {
329
+            // We only have six colours, so show naes if more than this number
330
+            echo $event->getParent()->getFullName() . ' — ';
331
+        }
332
+        $record = $event->getParent();
333
+        echo $event->getLabel();
334
+        echo ' — ';
335
+        if ($record instanceof Individual) {
336
+            echo FunctionsPrint::formatFactDate($event, $record, false, false);
337
+        } elseif ($record instanceof Family) {
338
+            echo $gdate->display();
339
+            if ($record->getHusband() && $record->getHusband()->getBirthDate()->isOK()) {
340
+                $ageh = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getHusband()->getBirthDate(), $gdate));
341
+            } else {
342
+                $ageh = null;
343
+            }
344
+            if ($record->getWife() && $record->getWife()->getBirthDate()->isOK()) {
345
+                $agew = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getWife()->getBirthDate(), $gdate));
346
+            } else {
347
+                $agew = null;
348
+            }
349
+            if ($ageh && $agew) {
350
+                echo '<span class="age"> ', I18N::translate('Husband’s age'), ' ', $ageh, ' ', I18N::translate('Wife’s age'), ' ', $agew, '</span>';
351
+            } elseif ($ageh) {
352
+                echo '<span class="age"> ', I18N::translate('Age'), ' ', $ageh, '</span>';
353
+            } elseif ($agew) {
354
+                echo '<span class="age"> ', I18N::translate('Age'), ' ', $ageh, '</span>';
355
+            }
356
+        }
357
+        echo ' ' . e($desc);
358
+        if (!$event->getPlace()->isEmpty()) {
359
+            echo ' — ' . $event->getPlace()->getShortName();
360
+        }
361
+        // Print spouses names for family events
362
+        if ($event->getParent() instanceof Family) {
363
+            echo ' — <a href="', e($event->getParent()->url()), '">', $event->getParent()->getFullName(), '</a>';
364
+        }
365
+        echo '</td></tr></table>';
366
+        echo '</div>';
367
+        if (I18N::direction() === 'ltr') {
368
+            $img  = 'image-dline2';
369
+            $ypos = '0%';
370
+        } else {
371
+            $img  = 'image-dline';
372
+            $ypos = '100%';
373
+        }
374
+        $dyoffset = ($yoffset - $tyoffset) + $bheight / 3;
375
+        if ($tyoffset < 0) {
376
+            $dyoffset = $yoffset + $bheight / 3;
377
+            if (I18N::direction() === 'ltr') {
378
+                $img  = 'image-dline';
379
+                $ypos = '100%';
380
+            } else {
381
+                $img  = 'image-dline2';
382
+                $ypos = '0%';
383
+            }
384
+        }
385
+        ?>
386 386
 
387 387
 		<!-- diagonal line -->
388 388
 		<div id="dbox<?= $factcount ?>" style="position:absolute; <?= (I18N::direction() === 'ltr' ? 'left: ' . (0 + 25) : 'right: ' . (0 + 25)) ?>px; top:<?= ($dyoffset) ?>px; font-size: 8pt; height: <?= abs($tyoffset) ?>px; width: <?= abs($tyoffset) ?>px; background-image: url('<?= Theme::theme()->parameter($img) ?>'); background-position: 0% <?= $ypos ?>;">
Please login to merge, or discard this patch.
resources/views/modules/relatives/family.php 1 patch
Indentation   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -13,18 +13,18 @@  discard block
 block discarded – undo
13 13
 
14 14
 	<tbody>
15 15
 		<?php
16
-		$found = false;
17
-		foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) {
18
-			$found |= !$fact->isPendingDeletion();
19
-			$person = $fact->getTarget();
20
-			if ($person instanceof Individual) {
21
-				$row_class = 'wt-gender-' . $person->getSex();
22
-				if ($fact->isPendingAddition()) {
23
-					$row_class .= ' new';
24
-				} elseif ($fact->isPendingDeletion()) {
25
-					$row_class .= ' old';
26
-				}
27
-				?>
16
+        $found = false;
17
+        foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) {
18
+            $found |= !$fact->isPendingDeletion();
19
+            $person = $fact->getTarget();
20
+            if ($person instanceof Individual) {
21
+                $row_class = 'wt-gender-' . $person->getSex();
22
+                if ($fact->isPendingAddition()) {
23
+                    $row_class .= ' new';
24
+                } elseif ($fact->isPendingDeletion()) {
25
+                    $row_class .= ' old';
26
+                }
27
+                ?>
28 28
 				<tr class="<?= $row_class ?>">
29 29
 					<th scope="row">
30 30
 						<?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?>
@@ -35,10 +35,10 @@  discard block
 block discarded – undo
35 35
 					</td>
36 36
 				</tr>
37 37
 				<?php
38
-			}
39
-		}
40
-		if (!$found && $family->canEdit()) {
41
-			?>
38
+            }
39
+        }
40
+        if (!$found && $family->canEdit()) {
41
+            ?>
42 42
 			<tr>
43 43
 				<th scope="row"></th>
44 44
 				<td>
@@ -48,20 +48,20 @@  discard block
 block discarded – undo
48 48
 				</td>
49 49
 			</tr>
50 50
 			<?php
51
-		}
52
-
53
-		$found = false;
54
-		foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) {
55
-			$person = $fact->getTarget();
56
-			if ($person instanceof Individual) {
57
-				$found |= !$fact->isPendingDeletion();
58
-				$row_class = 'wt-gender-' . $person->getSex();
59
-				if ($fact->isPendingAddition()) {
60
-					$row_class .= ' new';
61
-				} elseif ($fact->isPendingDeletion()) {
62
-					$row_class .= ' old';
63
-				}
64
-				?>
51
+        }
52
+
53
+        $found = false;
54
+        foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) {
55
+            $person = $fact->getTarget();
56
+            if ($person instanceof Individual) {
57
+                $found |= !$fact->isPendingDeletion();
58
+                $row_class = 'wt-gender-' . $person->getSex();
59
+                if ($fact->isPendingAddition()) {
60
+                    $row_class .= ' new';
61
+                } elseif ($fact->isPendingDeletion()) {
62
+                    $row_class .= ' old';
63
+                }
64
+                ?>
65 65
 
66 66
 				<tr class="<?= $row_class ?>">
67 67
 					<th scope="row">
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
73 73
 					</td>
74 74
 				</tr>
75 75
 				<?php
76
-			}
77
-		}
78
-		if (!$found && $family->canEdit()) { ?>
76
+            }
77
+        }
78
+        if (!$found && $family->canEdit()) { ?>
79 79
 			<tr>
80 80
 				<th scope="row"></th>
81 81
 				<td>
@@ -88,19 +88,19 @@  discard block
 block discarded – undo
88 88
 			<?php } ?>
89 89
 
90 90
 		<?php
91
-		///// MARR /////
92
-		$found = false;
93
-		$prev  = new Date('');
94
-		foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) {
95
-			$found |= !$fact->isPendingDeletion();
96
-			if ($fact->isPendingAddition()) {
97
-				$row_class = 'new';
98
-			} elseif ($fact->isPendingDeletion()) {
99
-				$row_class = 'old';
100
-			} else {
101
-				$row_class = '';
102
-			}
103
-			?>
91
+        ///// MARR /////
92
+        $found = false;
93
+        $prev  = new Date('');
94
+        foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) {
95
+            $found |= !$fact->isPendingDeletion();
96
+            if ($fact->isPendingAddition()) {
97
+                $row_class = 'new';
98
+            } elseif ($fact->isPendingDeletion()) {
99
+                $row_class = 'old';
100
+            } else {
101
+                $row_class = '';
102
+            }
103
+            ?>
104 104
 
105 105
 			<tr class="<?= $row_class ?>">
106 106
 				<th scope="row">
@@ -111,13 +111,13 @@  discard block
 block discarded – undo
111 111
 			</tr>
112 112
 
113 113
 			<?php
114
-			if (!$prev->isOK() && $fact->getDate()->isOK()) {
115
-				$prev = $fact->getDate();
116
-			}
117
-		}
114
+            if (!$prev->isOK() && $fact->getDate()->isOK()) {
115
+                $prev = $fact->getDate();
116
+            }
117
+        }
118 118
 
119
-		if (!$found && $family->canShow() && $family->canEdit()) {
120
-			?>
119
+        if (!$found && $family->canShow() && $family->canEdit()) {
120
+            ?>
121 121
 			<tr>
122 122
 				<th scope="row">
123 123
 				</th>
@@ -128,30 +128,30 @@  discard block
 block discarded – undo
128 128
 				</td>
129 129
 			</tr>
130 130
 			<?php
131
-		}
132
-
133
-		///// CHIL /////
134
-		$child_number = 0;
135
-		foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) {
136
-			$person = $fact->getTarget();
137
-			if ($person instanceof Individual) {
138
-				$row_class = 'wt-gender-' . $person->getSex();
139
-				if ($fact->isPendingAddition()) {
140
-					$child_number++;
141
-					$row_class .= ' new';
142
-				} elseif ($fact->isPendingDeletion()) {
143
-					$row_class .= ' old';
144
-				} else {
145
-					$child_number++;
146
-				}
147
-				$next = new Date('');
148
-				foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
149
-					if ($bfact->getDate()->isOK()) {
150
-						$next = $bfact->getDate();
151
-						break;
152
-					}
153
-				}
154
-				?>
131
+        }
132
+
133
+        ///// CHIL /////
134
+        $child_number = 0;
135
+        foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) {
136
+            $person = $fact->getTarget();
137
+            if ($person instanceof Individual) {
138
+                $row_class = 'wt-gender-' . $person->getSex();
139
+                if ($fact->isPendingAddition()) {
140
+                    $child_number++;
141
+                    $row_class .= ' new';
142
+                } elseif ($fact->isPendingDeletion()) {
143
+                    $row_class .= ' old';
144
+                } else {
145
+                    $child_number++;
146
+                }
147
+                $next = new Date('');
148
+                foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
149
+                    if ($bfact->getDate()->isOK()) {
150
+                        $next = $bfact->getDate();
151
+                        break;
152
+                    }
153
+                }
154
+                ?>
155 155
 
156 156
 				<tr class="<?= $row_class ?>">
157 157
 					<th scope="row">
@@ -182,9 +182,9 @@  discard block
 block discarded – undo
182 182
 					</td>
183 183
 				</tr>
184 184
 				<?php
185
-				$prev = $next;
186
-			}
187
-		} ?>
185
+                $prev = $next;
186
+            }
187
+        } ?>
188 188
 
189 189
 		<?php if ($family->canEdit()): ?>
190 190
 			<tr>
Please login to merge, or discard this patch.
resources/views/modules/relatives/tab.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -39,45 +39,45 @@
 block discarded – undo
39 39
 <!-- Parents -->
40 40
 <?php foreach ($parent_families as $family): ?>
41 41
 	<?= view('modules/relatives/family', [
42
-		'individual'       => $individual,
43
-		'family'           => $family,
44
-		'type'             => 'FAMC',
45
-		'label'            => $individual->getChildFamilyLabel($family),
46
-		'fam_access_level' => $fam_access_level,
47
-	]) ?>
42
+        'individual'       => $individual,
43
+        'family'           => $family,
44
+        'type'             => 'FAMC',
45
+        'label'            => $individual->getChildFamilyLabel($family),
46
+        'fam_access_level' => $fam_access_level,
47
+    ]) ?>
48 48
 <?php endforeach ?>
49 49
 
50 50
 <!-- step-parents -->
51 51
 <?php foreach ($step_parent_families as $family): ?>
52 52
 	<?= view('modules/relatives/family', [
53
-		'individual'       => $individual,
54
-		'family'           => $family,
55
-		'type'             => 'FAMC',
56
-		'label'            => $individual->getStepFamilyLabel($family),
57
-		'fam_access_level' => $fam_access_level,
58
-	]) ?>
53
+        'individual'       => $individual,
54
+        'family'           => $family,
55
+        'type'             => 'FAMC',
56
+        'label'            => $individual->getStepFamilyLabel($family),
57
+        'fam_access_level' => $fam_access_level,
58
+    ]) ?>
59 59
 <?php endforeach ?>
60 60
 
61 61
 <!-- spouses -->
62 62
 <?php foreach ($spouse_families as $family): ?>
63 63
 	<?= view('modules/relatives/family', [
64
-		'individual'       => $individual,
65
-		'family'           => $family,
66
-		'type'             => 'FAMS',
67
-		'label'            => $individual->getSpouseFamilyLabel($family),
68
-		'fam_access_level' => $fam_access_level,
69
-	]) ?>
64
+        'individual'       => $individual,
65
+        'family'           => $family,
66
+        'type'             => 'FAMS',
67
+        'label'            => $individual->getSpouseFamilyLabel($family),
68
+        'fam_access_level' => $fam_access_level,
69
+    ]) ?>
70 70
 <?php endforeach ?>
71 71
 
72 72
 <!-- step-children -->
73 73
 <?php foreach ($step_child_familiess as $family): ?>
74 74
 	<?= view('modules/relatives/family', [
75
-		'individual'       => $individual,
76
-		'family'           => $family,
77
-		'type'             => 'FAMS',
78
-		'label'            => $family->getFullName(),
79
-		'fam_access_level' => $fam_access_level,
80
-	]) ?>
75
+        'individual'       => $individual,
76
+        'family'           => $family,
77
+        'type'             => 'FAMS',
78
+        'label'            => $family->getFullName(),
79
+        'fam_access_level' => $fam_access_level,
80
+    ]) ?>
81 81
 <?php endforeach ?>
82 82
 
83 83
 <?php if ($can_edit): ?>
Please login to merge, or discard this patch.
resources/views/modules/gedcom_stats/config.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 		</legend>
9 9
 		<div class="col-sm-9">
10 10
 			<?= Bootstrap4::checkbox(/* I18N: label for yes/no option */
11
-				I18N::translate('Show date of last update'), false, ['name' => 'show_last_update', 'checked' => (bool) $show_last_update]) ?>
11
+                I18N::translate('Show date of last update'), false, ['name' => 'show_last_update', 'checked' => (bool) $show_last_update]) ?>
12 12
 		</div>
13 13
 	</div>
14 14
 </fieldset>
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 			<?= Bootstrap4::checkbox(I18N::translate('Most common surnames'), false, ['name' => 'show_common_surnames', 'checked' => (bool) $show_common_surnames]) ?>
51 51
 			<label for="number_of_surnames">
52 52
 				<?= /* I18N: ... to show in a list */
53
-				I18N::translate('Number of surnames') ?>
53
+                I18N::translate('Number of surnames') ?>
54 54
 				<input
55 55
 					class="form-control"
56 56
 					id="number_of_surnames"
Please login to merge, or discard this patch.
resources/views/modules/faq/edit.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	<div class="row form-group">
35 35
 		<label for="xref" class="col-sm-3 col-form-label">
36 36
 			<?= /* I18N: Label for a configuration option */
37
-			I18N::translate('Show this block for which languages') ?>
37
+            I18N::translate('Show this block for which languages') ?>
38 38
 		</label>
39 39
 
40 40
 		<div class="col-sm-9">
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 			<?= Bootstrap4::select(['' => I18N::translate('All')] + $tree_names, $tree->getName(), ['id' => 'gedcom_id', 'name' => 'gedcom_id']) ?>
62 62
 			<p class="small text-muted">
63 63
 				<?= /* I18N: FAQ = “Frequently Asked Question” */
64
-				I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?>
64
+                I18N::translate('An FAQ can be displayed on just one of the family trees, or on all the family trees.') ?>
65 65
 			</p>
66 66
 		</div>
67 67
 	</div>
Please login to merge, or discard this patch.
resources/views/modules/relationships_chart/config.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 		<div class="row form-group">
16 16
 			<label class="col-sm-3 col-form-label" for="relationship-ancestors-<?= $tree->getTreeId() ?>">
17 17
 				<?= /* I18N: Configuration option */
18
-				I18N::translate('Relationships') ?>
18
+                I18N::translate('Relationships') ?>
19 19
 			</label>
20 20
 			<div class="col-sm-9">
21 21
 				<?= Bootstrap4::select($ancestors_options, $tree->getPreference('RELATIONSHIP_ANCESTORS', $default_ancestors), ['id' => 'relationship-ancestors-' . $tree->getTreeId(), 'name' => 'relationship-ancestors-' . $tree->getTreeId()]) ?>
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			<div class="row">
27 27
 				<legend class="col-form-label col-sm-3">
28 28
 					<?= /* I18N: Configuration option */
29
-					I18N::translate('How much recursion to use when searching for relationships') ?>
29
+                    I18N::translate('How much recursion to use when searching for relationships') ?>
30 30
 				</legend>
31 31
 				<div class="col-sm-9">
32 32
 					<?= Bootstrap4::radioButtons('relationship-recursion-' . $tree->getTreeId(), $recursion_options, $tree->getPreference('RELATIONSHIP_RECURSION', $default_recursion), true) ?>
Please login to merge, or discard this patch.
resources/views/place-events.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,10 +21,10 @@  discard block
 block discarded – undo
21 21
 			<p><?= I18N::translate('No results found.') ?></p>
22 22
 		<?php else: ?>
23 23
 			<?= view('lists/individuals-table', [
24
-			'individuals' => $indilist,
25
-			'sosa'        => false,
26
-			'tree'        => $tree,
27
-			]) ?>
24
+            'individuals' => $indilist,
25
+            'sosa'        => false,
26
+            'tree'        => $tree,
27
+            ]) ?>
28 28
 		<?php endif ?>
29 29
 	</div>
30 30
 
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 			<p><?= I18N::translate('No results found.') ?></p>
34 34
 		<?php else: ?>
35 35
 			<?= view('lists/families-table', [
36
-				'families' => $famlist,
37
-			]) ?>
36
+                'families' => $famlist,
37
+            ]) ?>
38 38
 		<?php endif ?>
39 39
 	</div>
40 40
 </div>
Please login to merge, or discard this patch.
resources/views/interactive-tree-page.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 		<div class="col-sm-3 wt-page-options-label"></div>
26 26
 		<div class="col-sm-9 wt-page-options-value">
27 27
 			<input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */
28
-			I18N::translate('view') ?>">
28
+            I18N::translate('view') ?>">
29 29
 		</div>
30 30
 	</div>
31 31
 </form>
Please login to merge, or discard this patch.