fisharebest / webtrees

resources/views/lists/chart-by-age.php

Indentation +18 added lines, -18 removed lines

@@ -6,14 +6,14 @@ 
 $vmax   = 0;
 $avg    = 0;
 foreach ($data as $age => $v) {
-	$n      = strlen($v);
-	$vmax   = max($vmax, $n);
-	$agemax = max($agemax, $age);
-	$count += $n;
-	$avg += $age * $n;
+    $n      = strlen($v);
+    $vmax   = max($vmax, $n);
+    $agemax = max($agemax, $age);
+    $count += $n;
+    $avg += $age * $n;
 }
 if ($count < 1) {
-	return '';
+    return '';
 }
 $avg       = round($avg / $count);
 $chart_url = 'https://chart.googleapis.com/chart?cht=bvs'; // chart type
@@ -27,36 +27,36 @@ 
 $chart_url .= '&amp;chm=V,FF0000,0,' . ($avg - 0.3) . ',1'; // average age line marker
 $chart_url .= '&amp;chxl=0:|'; // label
 for ($age = 0; $age <= $agemax; $age += 5) {
-	$chart_url .= $age . '|||||'; // x axis
+    $chart_url .= $age . '|||||'; // x axis
 }
 $chart_url .= '|1:||' . rawurlencode(I18N::percentage($vmax / $count)); // y axis
 $chart_url .= '|2:||';
 $step = $vmax;
 for ($d = $vmax; $d > 0; $d--) {
-	if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
-		$step = $d;
-	}
+    if ($vmax < ($d * 10 + 1) && ($vmax % $d) == 0) {
+        $step = $d;
+    }
 }
 if ($step == $vmax) {
-	for ($d = $vmax - 1; $d > 0; $d--) {
-		if (($vmax - 1) < ($d * 10 + 1) && (($vmax - 1) % $d) == 0) {
-			$step = $d;
-		}
-	}
+    for ($d = $vmax - 1; $d > 0; $d--) {
+        if (($vmax - 1) < ($d * 10 + 1) && (($vmax - 1) % $d) == 0) {
+            $step = $d;
+        }
+    }
 }
 for ($n = $step; $n < $vmax; $n += $step) {
-	$chart_url .= $n . '|';
+    $chart_url .= $n . '|';
 }
 $chart_url .= rawurlencode($vmax . ' / ' . $count); // r axis
 $chart_url .= '&amp;chg=100,' . round(100 * $step / $vmax, 1) . ',1,5'; // grid
 $chart_url .= '&amp;chd=s:'; // data : simple encoding from A=0 to 9=61
 $CHART_ENCODING61 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 for ($age = 0; $age <= $agemax; $age++) {
-	$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], 'M') * 61 / $vmax)];
+    $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], 'M') * 61 / $vmax)];
 }
 $chart_url .= ',';
 for ($age = 0; $age <= $agemax; $age++) {
-	$chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], 'F') * 61 / $vmax)];
+    $chart_url .= $CHART_ENCODING61[(int) (substr_count($data[$age], 'F') * 61 / $vmax)];
 }
 $html = '<img src="' . $chart_url . '" alt="' . $title . '" title="' . $title . '" class="gchart">';
 

resources/views/lists/families-table.php

Indentation +26 added lines, -26 removed lines

@@ -70,13 +70,13 @@ 
 // init chart data
 $marr_by_age = [];
 for ($age = 0; $age <= $max_age; $age++) {
-	$marr_by_age[$age] = '';
+    $marr_by_age[$age] = '';
 }
 $birt_by_decade = [];
 $marr_by_decade = [];
 for ($year = 1550; $year < 2030; $year += 10) {
-	$birt_by_decade[$year] = '';
-	$marr_by_decade[$year] = '';
+    $birt_by_decade[$year] = '';
+    $marr_by_decade[$year] = '';
 }
 ?>
 
@@ -244,18 +244,18 @@ 
 
 				<!-- Husband age -->
 				<?php
-				$mdate = $family->getMarriageDate();
-				$hdate = $husb->getBirthDate();
-				if ($hdate->isOK() && $mdate->isOK()) {
-					if ($hdate->gregorianYear() >= 1550 && $hdate->gregorianYear() < 2030) {
-						$birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
-					}
-					$hage = Date::getAge($hdate, $mdate, 0);
-					if ($hage >= 0 && $hage <= $max_age) {
-						$marr_by_age[$hage] .= $husb->getSex();
-					}
-				}
-				?>
+                $mdate = $family->getMarriageDate();
+                $hdate = $husb->getBirthDate();
+                if ($hdate->isOK() && $mdate->isOK()) {
+                    if ($hdate->gregorianYear() >= 1550 && $hdate->gregorianYear() < 2030) {
+                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+                    }
+                    $hage = Date::getAge($hdate, $mdate, 0);
+                    if ($hage >= 0 && $hage <= $max_age) {
+                        $marr_by_age[$hage] .= $husb->getSex();
+                    }
+                }
+                ?>
 				<td class="center" data-sort="<?= Date::getAge($hdate, $mdate, 1) ?>">
 					<?= Date::getAge($hdate, $mdate, 2) ?>
 				</td>
@@ -280,17 +280,17 @@ 
 
 				<!-- Wife age -->
 				<?php
-				$wdate = $wife->getBirthDate();
-				if ($wdate->isOK() && $mdate->isOK()) {
-					if ($wdate->gregorianYear() >= 1550 && $wdate->gregorianYear() < 2030) {
-						$birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
-					}
-					$wage = Date::getAge($wdate, $mdate, 0);
-					if ($wage >= 0 && $wage <= $max_age) {
-						$marr_by_age[$wage] .= $wife->getSex();
-					}
-				}
-				?>
+                $wdate = $wife->getBirthDate();
+                if ($wdate->isOK() && $mdate->isOK()) {
+                    if ($wdate->gregorianYear() >= 1550 && $wdate->gregorianYear() < 2030) {
+                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+                    }
+                    $wage = Date::getAge($wdate, $mdate, 0);
+                    if ($wage >= 0 && $wage <= $max_age) {
+                        $marr_by_age[$wage] .= $wife->getSex();
+                    }
+                }
+                ?>
 
 				<td class="center" data-sort="<?= Date::getAge($wdate, $mdate, 1) ?>">
 					<?= Date::getAge($wdate, $mdate, 2) ?>

resources/views/media-list-page.php

Indentation +32 added lines, -32 removed lines

@@ -123,49 +123,49 @@
 
 							<p class="card-text">
 								<?php
-								// Show file details
-								$mediatype = $media_file->type();
-								if ($mediatype) {
-									echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($mediatype));
-								}
-								echo FunctionsPrintFacts::printFactSources($tree, $media_object->getGedcom(), 1);
-								echo FunctionsPrint::printFactNotes($tree, $media_object->getGedcom(), 1);
-								if ($media_file->isExternal()) {
-									echo GedcomTag::getLabelValue('URL', $media_file->filename());
-								} elseif ($media_file->fileExists()) {
-									?>
+                                // Show file details
+                                $mediatype = $media_file->type();
+                                if ($mediatype) {
+                                    echo GedcomTag::getLabelValue('TYPE', GedcomTag::getFileFormTypeValue($mediatype));
+                                }
+                                echo FunctionsPrintFacts::printFactSources($tree, $media_object->getGedcom(), 1);
+                                echo FunctionsPrint::printFactNotes($tree, $media_object->getGedcom(), 1);
+                                if ($media_file->isExternal()) {
+                                    echo GedcomTag::getLabelValue('URL', $media_file->filename());
+                                } elseif ($media_file->fileExists()) {
+                                    ?>
 								<button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#details-<?= e($n) ?>" aria-expanded="false" aria-controls="details-<?= e($n) ?>">
 									<?= I18N::translate('Media file') ?>
 								</button>
 							<div class="collapse" id="details-<?= e($n) ?>">
 								<?php
-								if (Auth::isEditor($tree)) {
-									echo GedcomTag::getLabelValue('FILE', $media_file->filename());
-								}
-								echo GedcomTag::getLabelValue('FORM', $media_file->mimeType());
-								foreach ($media_file->attributes() as $tag => $value) {
-									echo GedcomTag::getLabelValue($tag, $value);
-								}
-								?>
+                                if (Auth::isEditor($tree)) {
+                                    echo GedcomTag::getLabelValue('FILE', $media_file->filename());
+                                }
+                                echo GedcomTag::getLabelValue('FORM', $media_file->mimeType());
+                                foreach ($media_file->attributes() as $tag => $value) {
+                                    echo GedcomTag::getLabelValue($tag, $value);
+                                }
+                                ?>
 							</div>
 						<?php
-								} else {
-									echo '<p class="alert alert-danger">', /* I18N: %s is a filename */ I18N::translate('The file “%s” does not exist.', $media_file->filename()), '</p>';
-								}
-								?>
+                                } else {
+                                    echo '<p class="alert alert-danger">', /* I18N: %s is a filename */ I18N::translate('The file “%s” does not exist.', $media_file->filename()), '</p>';
+                                }
+                                ?>
 							</p>
 						</div>
 						<div class="card-footer">
 							<?php
-							foreach ($media_object->linkedIndividuals('OBJE') as $individual) {
-								echo '<a href="' . e($individual->url()) . '">' . FontAwesome::semanticIcon('individual', I18N::translate('Individual')) . ' ' . $individual->getFullName() . '</a><br>';
-							}
-							foreach ($media_object->linkedFamilies('OBJE') as $family) {
-								echo '<a href="' . e($family->url()) . '">' . FontAwesome::semanticicon('family', I18N::translate('Family')) . ' ' . $family->getFullName() . '</a><br>';
-							}
-							foreach ($media_object->linkedSources('OBJE') as $source) {
-								echo '<a href="' . e($source->url()) . '">' . FontAwesome::semanticIcon('source', I18N::translate('Source')) . ' ' . $source->getFullName() . '</a><br>';
-							} ?>
+                            foreach ($media_object->linkedIndividuals('OBJE') as $individual) {
+                                echo '<a href="' . e($individual->url()) . '">' . FontAwesome::semanticIcon('individual', I18N::translate('Individual')) . ' ' . $individual->getFullName() . '</a><br>';
+                            }
+                            foreach ($media_object->linkedFamilies('OBJE') as $family) {
+                                echo '<a href="' . e($family->url()) . '">' . FontAwesome::semanticicon('family', I18N::translate('Family')) . ' ' . $family->getFullName() . '</a><br>';
+                            }
+                            foreach ($media_object->linkedSources('OBJE') as $source) {
+                                echo '<a href="' . e($source->url()) . '">' . FontAwesome::semanticIcon('source', I18N::translate('Source')) . ' ' . $source->getFullName() . '</a><br>';
+                            } ?>
 						</div>
 					</div>
 				</div>

resources/views/lifespans-page.php

Indentation +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
 		</label>
 		<div class="col-sm-9 wt-page-options-value">
 			<?= FunctionsEdit::formControlIndividual($tree, null, [
-				'id'   => 'addxref',
-				'name' => 'addxref',
-			]) ?>
+                'id'   => 'addxref',
+                'name' => 'addxref',
+            ]) ?>
 
 			<?= Bootstrap4::checkbox(/* I18N: Label for a configuration option */ I18N::translate('Include the individual’s immediate family'), false, ['name' => 'addfam']) ?>
 		</div>

resources/views/layouts/default.php

Indentation +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 				<?php if ($page_hits ?? 0 > 0): ?>
 				<div class="wt-page-views">
 					<?= I18N::plural('This page has been viewed %s time.', 'This page has been viewed %s times.', $page_hits,
-					'<span class="odometer">' . I18N::digits($page_hits) . '</span>') ?>
+                    '<span class="odometer">' . I18N::digits($page_hits) . '</span>') ?>
 				</div>
 				<?php endif ?>
 

resources/views/relationships-page.php

Indentation +14 added lines, -14 removed lines

@@ -17,12 +17,12 @@ 
 		</label>
 		<div class="col-sm-9 wt-page-options-value">
 			<?= FunctionsEdit::formControlIndividual($tree, $individual1, [
-				'id'   => 'xref1',
-				'name' => 'xref1',
-			]) ?>
+                'id'   => 'xref1',
+                'name' => 'xref1',
+            ]) ?>
 			<button class="btn btn-link small" id="btn-swap-individuals" type="button">
 				<?= /* I18N: Reverse the order of two individuals */
-				I18N::translate('Swap individuals') ?>
+                I18N::translate('Swap individuals') ?>
 			</button>
 		</div>
 	</div>
@@ -33,9 +33,9 @@ 
 		</label>
 		<div class="col-sm-9 wt-page-options-value">
 			<?= FunctionsEdit::formControlIndividual($tree, $individual2, [
-				'id'   => 'xref2',
-				'name' => 'xref2',
-			]) ?>
+                'id'   => 'xref2',
+                'name' => 'xref2',
+            ]) ?>
 		</div>
 	</div>
 
@@ -73,19 +73,19 @@ 
 		<div class="col-form-label col-sm-3 wt-page-options-label"></div>
 		<div class="col-sm-9 wt-page-options-value">
 			<input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */
-			I18N::translate('view') ?>">
+            I18N::translate('view') ?>">
 		</div>
 	</div>
 </form>
 
 <?php if ($individual1 !== null && $individual2 !== null): ?>
 	<div class="wt-ajax-load wt-page-content wt-chart wt-relationships-chart" data-ajax-url="<?= e(route('relationships-chart', [
-		'xref1'     => $individual1->getXref(),
-		'xref2'     => $individual2->getXref(),
-		'ged'       => $individual2->getTree()->getName(),
-		'recursion' => $recursion,
-		'ancestors' => $ancestors,
-	])) ?>"></div>
+        'xref1'     => $individual1->getXref(),
+        'xref2'     => $individual2->getXref(),
+        'ged'       => $individual2->getTree()->getName(),
+        'recursion' => $recursion,
+        'ancestors' => $ancestors,
+    ])) ?>"></div>
 <?php endif ?>
 
 <?php View::push('javascript') ?>

resources/views/timeline-chart.php

Indentation +132 added lines, -132 removed lines

@@ -14,18 +14,18 @@ 
   var birthmonths = [];
   var birthdays   = [];
 	<?php
-	foreach ($individuals as $c => $indi) {
-		if (!empty($birthyears[$indi->getXref()])) {
-			echo 'birthyears[' . $c . ']=' . $birthyears[$indi->getXref()] . ';';
-		}
-		if (!empty($birthmonths[$indi->getXref()])) {
-			echo 'birthmonths[' . $c . ']=' . $birthmonths[$indi->getXref()] . ';';
-		}
-		if (!empty($birthdays[$indi->getXref()])) {
-			echo 'birthdays[' . $c . ']=' . $birthdays[$indi->getXref()] . ';';
-		}
-	}
-	?>
+    foreach ($individuals as $c => $indi) {
+        if (!empty($birthyears[$indi->getXref()])) {
+            echo 'birthyears[' . $c . ']=' . $birthyears[$indi->getXref()] . ';';
+        }
+        if (!empty($birthmonths[$indi->getXref()])) {
+            echo 'birthmonths[' . $c . ']=' . $birthmonths[$indi->getXref()] . ';';
+        }
+        if (!empty($birthdays[$indi->getXref()])) {
+            echo 'birthdays[' . $c . ']=' . $birthdays[$indi->getXref()] . ';';
+        }
+    }
+    ?>
 
   var bheight = <?= $bheight ?>;
   var scale   = <?= $scale ?>;
@@ -255,134 +255,134 @@ 
 		<?= $baseyear ?>
 	</div>
 	<?php
-	// at a scale of 25 or higher, show every year
-	$mod = 25 / $scale;
-	if ($mod < 1) {
-		$mod = 1;
-	}
-	for ($i = $baseyear + 1; $i < $topyear; $i++) {
-		if ($i % $mod === 0) {
-			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') . ';">';
-			echo $i;
-			echo '</div>';
-		}
-	}
-	echo '';
-	?>
+    // at a scale of 25 or higher, show every year
+    $mod = 25 / $scale;
+    if ($mod < 1) {
+        $mod = 1;
+    }
+    for ($i = $baseyear + 1; $i < $topyear; $i++) {
+        if ($i % $mod === 0) {
+            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') . ';">';
+            echo $i;
+            echo '</div>';
+        }
+    }
+    echo '';
+    ?>
 	<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' ?>;">
 		<?= e($topyear) ?>
 	</div>
 
 	<?php foreach ($indifacts as $factcount => $event): ?>
 		<?php
-		$desc     = $event->getValue();
-		$gdate    = $event->getDate();
-		$date     = $gdate->minimumDate();
-		$date     = $date->convertToCalendar('gregorian');
-		$year     = $date->y;
-		$month    = max(1, $date->m);
-		$day      = max(1, $date->d);
-		$xoffset  = 0 + 22;
-		$yoffset  = 0 + (($year - $baseyear) * $scale) - ($scale);
-		$yoffset  = $yoffset + (($month / 12) * $scale);
-		$yoffset  = $yoffset + (($day / 30) * ($scale / 12));
-		$yoffset  = (int) ($yoffset);
-		$place    = (int) ($yoffset / $bheight);
-		$i        = 1;
-		$j        = 0;
-		$tyoffset = 0;
-		while (isset($placements[$place])) {
-			if ($i === $j) {
-				$tyoffset = $bheight * $i;
-				$i++;
-			} else {
-				$tyoffset = -1 * $bheight * $j;
-				$j++;
-			}
-			$place = (int) (($yoffset + $tyoffset) / $bheight);
-		}
-		$yoffset            += $tyoffset;
-		$xoffset            += abs($tyoffset);
-		$placements[$place] = $yoffset;
+        $desc     = $event->getValue();
+        $gdate    = $event->getDate();
+        $date     = $gdate->minimumDate();
+        $date     = $date->convertToCalendar('gregorian');
+        $year     = $date->y;
+        $month    = max(1, $date->m);
+        $day      = max(1, $date->d);
+        $xoffset  = 0 + 22;
+        $yoffset  = 0 + (($year - $baseyear) * $scale) - ($scale);
+        $yoffset  = $yoffset + (($month / 12) * $scale);
+        $yoffset  = $yoffset + (($day / 30) * ($scale / 12));
+        $yoffset  = (int) ($yoffset);
+        $place    = (int) ($yoffset / $bheight);
+        $i        = 1;
+        $j        = 0;
+        $tyoffset = 0;
+        while (isset($placements[$place])) {
+            if ($i === $j) {
+                $tyoffset = $bheight * $i;
+                $i++;
+            } else {
+                $tyoffset = -1 * $bheight * $j;
+                $j++;
+            }
+            $place = (int) (($yoffset + $tyoffset) / $bheight);
+        }
+        $yoffset            += $tyoffset;
+        $xoffset            += abs($tyoffset);
+        $placements[$place] = $yoffset;
 
-		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) . ');">';
-		echo '<table cellspacing="0" cellpadding="0" border="0" style="cursor: hand;"><tr><td>';
-		echo '<img src="' . Theme::theme()->parameter('image-hline') . '" name="boxline' . $factcount . '" id="boxline' . $factcount . '" height="3" width="10" style="padding-';
-		if (I18N::direction() === 'ltr') {
-			echo 'left: 3px;">';
-		} else {
-			echo 'right: 3px;">';
-		}
+        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) . ');">';
+        echo '<table cellspacing="0" cellpadding="0" border="0" style="cursor: hand;"><tr><td>';
+        echo '<img src="' . Theme::theme()->parameter('image-hline') . '" name="boxline' . $factcount . '" id="boxline' . $factcount . '" height="3" width="10" style="padding-';
+        if (I18N::direction() === 'ltr') {
+            echo 'left: 3px;">';
+        } else {
+            echo 'right: 3px;">';
+        }
 
-		$col = array_search($event->getParent(), $individuals);
-		if ($col === false) {
-			// Marriage event - use the color of the husband
-			$col = array_search($event->getParent()->getHusband(), $individuals);
-		}
-		if ($col === false) {
-			// Marriage event - use the color of the wife
-			$col = array_search($event->getParent()->getWife(), $individuals);
-		}
-		$col = $col % 6;
-		echo '</td><td class="person' . $col . '">';
-		if (count($individuals) > 6) {
-			// We only have six colours, so show naes if more than this number
-			echo $event->getParent()->getFullName() . ' — ';
-		}
-		$record = $event->getParent();
-		echo $event->getLabel();
-		echo ' — ';
-		if ($record instanceof Individual) {
-			echo FunctionsPrint::formatFactDate($event, $record, false, false);
-		} elseif ($record instanceof Family) {
-			echo $gdate->display();
-			if ($record->getHusband() && $record->getHusband()->getBirthDate()->isOK()) {
-				$ageh = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getHusband()->getBirthDate(), $gdate));
-			} else {
-				$ageh = null;
-			}
-			if ($record->getWife() && $record->getWife()->getBirthDate()->isOK()) {
-				$agew = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getWife()->getBirthDate(), $gdate));
-			} else {
-				$agew = null;
-			}
-			if ($ageh && $agew) {
-				echo '<span class="age"> ', I18N::translate('Husband’s age'), ' ', $ageh, ' ', I18N::translate('Wife’s age'), ' ', $agew, '</span>';
-			} elseif ($ageh) {
-				echo '<span class="age"> ', I18N::translate('Age'), ' ', $ageh, '</span>';
-			} elseif ($agew) {
-				echo '<span class="age"> ', I18N::translate('Age'), ' ', $ageh, '</span>';
-			}
-		}
-		echo ' ' . e($desc);
-		if (!$event->getPlace()->isEmpty()) {
-			echo ' — ' . $event->getPlace()->getShortName();
-		}
-		// Print spouses names for family events
-		if ($event->getParent() instanceof Family) {
-			echo ' — <a href="', e($event->getParent()->url()), '">', $event->getParent()->getFullName(), '</a>';
-		}
-		echo '</td></tr></table>';
-		echo '</div>';
-		if (I18N::direction() === 'ltr') {
-			$img  = 'image-dline2';
-			$ypos = '0%';
-		} else {
-			$img  = 'image-dline';
-			$ypos = '100%';
-		}
-		$dyoffset = ($yoffset - $tyoffset) + $bheight / 3;
-		if ($tyoffset < 0) {
-			$dyoffset = $yoffset + $bheight / 3;
-			if (I18N::direction() === 'ltr') {
-				$img  = 'image-dline';
-				$ypos = '100%';
-			} else {
-				$img  = 'image-dline2';
-				$ypos = '0%';
-			}
-		}
-		?>
+        $col = array_search($event->getParent(), $individuals);
+        if ($col === false) {
+            // Marriage event - use the color of the husband
+            $col = array_search($event->getParent()->getHusband(), $individuals);
+        }
+        if ($col === false) {
+            // Marriage event - use the color of the wife
+            $col = array_search($event->getParent()->getWife(), $individuals);
+        }
+        $col = $col % 6;
+        echo '</td><td class="person' . $col . '">';
+        if (count($individuals) > 6) {
+            // We only have six colours, so show naes if more than this number
+            echo $event->getParent()->getFullName() . ' — ';
+        }
+        $record = $event->getParent();
+        echo $event->getLabel();
+        echo ' — ';
+        if ($record instanceof Individual) {
+            echo FunctionsPrint::formatFactDate($event, $record, false, false);
+        } elseif ($record instanceof Family) {
+            echo $gdate->display();
+            if ($record->getHusband() && $record->getHusband()->getBirthDate()->isOK()) {
+                $ageh = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getHusband()->getBirthDate(), $gdate));
+            } else {
+                $ageh = null;
+            }
+            if ($record->getWife() && $record->getWife()->getBirthDate()->isOK()) {
+                $agew = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getWife()->getBirthDate(), $gdate));
+            } else {
+                $agew = null;
+            }
+            if ($ageh && $agew) {
+                echo '<span class="age"> ', I18N::translate('Husband’s age'), ' ', $ageh, ' ', I18N::translate('Wife’s age'), ' ', $agew, '</span>';
+            } elseif ($ageh) {
+                echo '<span class="age"> ', I18N::translate('Age'), ' ', $ageh, '</span>';
+            } elseif ($agew) {
+                echo '<span class="age"> ', I18N::translate('Age'), ' ', $ageh, '</span>';
+            }
+        }
+        echo ' ' . e($desc);
+        if (!$event->getPlace()->isEmpty()) {
+            echo ' — ' . $event->getPlace()->getShortName();
+        }
+        // Print spouses names for family events
+        if ($event->getParent() instanceof Family) {
+            echo ' — <a href="', e($event->getParent()->url()), '">', $event->getParent()->getFullName(), '</a>';
+        }
+        echo '</td></tr></table>';
+        echo '</div>';
+        if (I18N::direction() === 'ltr') {
+            $img  = 'image-dline2';
+            $ypos = '0%';
+        } else {
+            $img  = 'image-dline';
+            $ypos = '100%';
+        }
+        $dyoffset = ($yoffset - $tyoffset) + $bheight / 3;
+        if ($tyoffset < 0) {
+            $dyoffset = $yoffset + $bheight / 3;
+            if (I18N::direction() === 'ltr') {
+                $img  = 'image-dline';
+                $ypos = '100%';
+            } else {
+                $img  = 'image-dline2';
+                $ypos = '0%';
+            }
+        }
+        ?>
 
 		<!-- diagonal line -->
 		<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 ?>;">

resources/views/modules/relatives/family.php

Indentation +79 added lines, -79 removed lines

@@ -13,18 +13,18 @@ 
 
 	<tbody>
 		<?php
-		$found = false;
-		foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) {
-			$found |= !$fact->isPendingDeletion();
-			$person = $fact->getTarget();
-			if ($person instanceof Individual) {
-				$row_class = 'wt-gender-' . $person->getSex();
-				if ($fact->isPendingAddition()) {
-					$row_class .= ' new';
-				} elseif ($fact->isPendingDeletion()) {
-					$row_class .= ' old';
-				}
-				?>
+        $found = false;
+        foreach ($family->getFacts('HUSB', false, $fam_access_level) as $fact) {
+            $found |= !$fact->isPendingDeletion();
+            $person = $fact->getTarget();
+            if ($person instanceof Individual) {
+                $row_class = 'wt-gender-' . $person->getSex();
+                if ($fact->isPendingAddition()) {
+                    $row_class .= ' new';
+                } elseif ($fact->isPendingDeletion()) {
+                    $row_class .= ' old';
+                }
+                ?>
 				<tr class="<?= $row_class ?>">
 					<th scope="row">
 						<?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?>
@@ -35,10 +35,10 @@ 
 					</td>
 				</tr>
 				<?php
-			}
-		}
-		if (!$found && $family->canEdit()) {
-			?>
+            }
+        }
+        if (!$found && $family->canEdit()) {
+            ?>
 			<tr>
 				<th scope="row"></th>
 				<td>
@@ -48,20 +48,20 @@ 
 				</td>
 			</tr>
 			<?php
-		}
-
-		$found = false;
-		foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) {
-			$person = $fact->getTarget();
-			if ($person instanceof Individual) {
-				$found |= !$fact->isPendingDeletion();
-				$row_class = 'wt-gender-' . $person->getSex();
-				if ($fact->isPendingAddition()) {
-					$row_class .= ' new';
-				} elseif ($fact->isPendingDeletion()) {
-					$row_class .= ' old';
-				}
-				?>
+        }
+
+        $found = false;
+        foreach ($family->getFacts('WIFE', false, $fam_access_level) as $fact) {
+            $person = $fact->getTarget();
+            if ($person instanceof Individual) {
+                $found |= !$fact->isPendingDeletion();
+                $row_class = 'wt-gender-' . $person->getSex();
+                if ($fact->isPendingAddition()) {
+                    $row_class .= ' new';
+                } elseif ($fact->isPendingDeletion()) {
+                    $row_class .= ' old';
+                }
+                ?>
 
 				<tr class="<?= $row_class ?>">
 					<th scope="row">
@@ -73,9 +73,9 @@ 
 					</td>
 				</tr>
 				<?php
-			}
-		}
-		if (!$found && $family->canEdit()) { ?>
+            }
+        }
+        if (!$found && $family->canEdit()) { ?>
 			<tr>
 				<th scope="row"></th>
 				<td>
@@ -88,19 +88,19 @@ 
 			<?php } ?>
 
 		<?php
-		///// MARR /////
-		$found = false;
-		$prev  = new Date('');
-		foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) {
-			$found |= !$fact->isPendingDeletion();
-			if ($fact->isPendingAddition()) {
-				$row_class = 'new';
-			} elseif ($fact->isPendingDeletion()) {
-				$row_class = 'old';
-			} else {
-				$row_class = '';
-			}
-			?>
+        ///// MARR /////
+        $found = false;
+        $prev  = new Date('');
+        foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) {
+            $found |= !$fact->isPendingDeletion();
+            if ($fact->isPendingAddition()) {
+                $row_class = 'new';
+            } elseif ($fact->isPendingDeletion()) {
+                $row_class = 'old';
+            } else {
+                $row_class = '';
+            }
+            ?>
 
 			<tr class="<?= $row_class ?>">
 				<th scope="row">
@@ -111,13 +111,13 @@ 
 			</tr>
 
 			<?php
-			if (!$prev->isOK() && $fact->getDate()->isOK()) {
-				$prev = $fact->getDate();
-			}
-		}
+            if (!$prev->isOK() && $fact->getDate()->isOK()) {
+                $prev = $fact->getDate();
+            }
+        }
 
-		if (!$found && $family->canShow() && $family->canEdit()) {
-			?>
+        if (!$found && $family->canShow() && $family->canEdit()) {
+            ?>
 			<tr>
 				<th scope="row">
 				</th>
@@ -128,30 +128,30 @@ 
 				</td>
 			</tr>
 			<?php
-		}
-
-		///// CHIL /////
-		$child_number = 0;
-		foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) {
-			$person = $fact->getTarget();
-			if ($person instanceof Individual) {
-				$row_class = 'wt-gender-' . $person->getSex();
-				if ($fact->isPendingAddition()) {
-					$child_number++;
-					$row_class .= ' new';
-				} elseif ($fact->isPendingDeletion()) {
-					$row_class .= ' old';
-				} else {
-					$child_number++;
-				}
-				$next = new Date('');
-				foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
-					if ($bfact->getDate()->isOK()) {
-						$next = $bfact->getDate();
-						break;
-					}
-				}
-				?>
+        }
+
+        ///// CHIL /////
+        $child_number = 0;
+        foreach ($family->getFacts('CHIL', false, $fam_access_level) as $fact) {
+            $person = $fact->getTarget();
+            if ($person instanceof Individual) {
+                $row_class = 'wt-gender-' . $person->getSex();
+                if ($fact->isPendingAddition()) {
+                    $child_number++;
+                    $row_class .= ' new';
+                } elseif ($fact->isPendingDeletion()) {
+                    $row_class .= ' old';
+                } else {
+                    $child_number++;
+                }
+                $next = new Date('');
+                foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
+                    if ($bfact->getDate()->isOK()) {
+                        $next = $bfact->getDate();
+                        break;
+                    }
+                }
+                ?>
 
 				<tr class="<?= $row_class ?>">
 					<th scope="row">
@@ -182,9 +182,9 @@ 
 					</td>
 				</tr>
 				<?php
-				$prev = $next;
-			}
-		} ?>
+                $prev = $next;
+            }
+        } ?>
 
 		<?php if ($family->canEdit()): ?>
 			<tr>

resources/views/modules/relatives/tab.php

Indentation +24 added lines, -24 removed lines

@@ -39,45 +39,45 @@
 <!-- Parents -->
 <?php foreach ($parent_families as $family): ?>
 	<?= view('modules/relatives/family', [
-		'individual'       => $individual,
-		'family'           => $family,
-		'type'             => 'FAMC',
-		'label'            => $individual->getChildFamilyLabel($family),
-		'fam_access_level' => $fam_access_level,
-	]) ?>
+        'individual'       => $individual,
+        'family'           => $family,
+        'type'             => 'FAMC',
+        'label'            => $individual->getChildFamilyLabel($family),
+        'fam_access_level' => $fam_access_level,
+    ]) ?>
 <?php endforeach ?>
 
 <!-- step-parents -->
 <?php foreach ($step_parent_families as $family): ?>
 	<?= view('modules/relatives/family', [
-		'individual'       => $individual,
-		'family'           => $family,
-		'type'             => 'FAMC',
-		'label'            => $individual->getStepFamilyLabel($family),
-		'fam_access_level' => $fam_access_level,
-	]) ?>
+        'individual'       => $individual,
+        'family'           => $family,
+        'type'             => 'FAMC',
+        'label'            => $individual->getStepFamilyLabel($family),
+        'fam_access_level' => $fam_access_level,
+    ]) ?>
 <?php endforeach ?>
 
 <!-- spouses -->
 <?php foreach ($spouse_families as $family): ?>
 	<?= view('modules/relatives/family', [
-		'individual'       => $individual,
-		'family'           => $family,
-		'type'             => 'FAMS',
-		'label'            => $individual->getSpouseFamilyLabel($family),
-		'fam_access_level' => $fam_access_level,
-	]) ?>
+        'individual'       => $individual,
+        'family'           => $family,
+        'type'             => 'FAMS',
+        'label'            => $individual->getSpouseFamilyLabel($family),
+        'fam_access_level' => $fam_access_level,
+    ]) ?>
 <?php endforeach ?>
 
 <!-- step-children -->
 <?php foreach ($step_child_familiess as $family): ?>
 	<?= view('modules/relatives/family', [
-		'individual'       => $individual,
-		'family'           => $family,
-		'type'             => 'FAMS',
-		'label'            => $family->getFullName(),
-		'fam_access_level' => $fam_access_level,
-	]) ?>
+        'individual'       => $individual,
+        'family'           => $family,
+        'type'             => 'FAMS',
+        'label'            => $family->getFullName(),
+        'fam_access_level' => $fam_access_level,
+    ]) ?>
 <?php endforeach ?>
 
 <?php if ($can_edit): ?>