Fix #824 - obsolete HTML markup

1 files changed, 67 insertions, 65 deletions

diff --git a/family.php b/family.php
index e2ae6f5ee9..8b327fb283 100644
--- a/family.php
+++ b/family.php
@@ -29,7 +29,7 @@ use Fisharebest\Webtrees\Functions\FunctionsPrint;
 define('WT_SCRIPT_NAME', 'family.php');
 require './includes/session.php';
 
-$record = Family::getInstance(Filter::get('famid', WT_REGEX_XREF), $WT_TREE);
+$record     = Family::getInstance(Filter::get('famid', WT_REGEX_XREF), $WT_TREE);
 $controller = new FamilyController($record);
 
 if ($controller->record && $controller->record->canShow()) {
@@ -37,38 +37,40 @@ if ($controller->record && $controller->record->canShow()) {
 	if ($controller->record->isPendingDeletion()) {
 		if (Auth::isModerator($controller->record->getTree())) {
 			echo
-				'<p class="ui-state-highlight">',
-				/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-					'This family has been deleted. You should review the deletion and then %1$s or %2$s it.',
-					'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
-					'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
-				),
-				' ', FunctionsPrint::helpLink('pending_changes'),
-				'</p>';
+			'<p class="ui-state-highlight">',
+				/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */
+			I18N::translate(
+				'This family has been deleted. You should review the deletion and then %1$s or %2$s it.',
+				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
+				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
+			),
+			' ', FunctionsPrint::helpLink('pending_changes'),
+			'</p>';
 		} elseif (Auth::isEditor($controller->record->getTree())) {
 			echo
-				'<p class="ui-state-highlight">',
-				I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.'),
-				' ', FunctionsPrint::helpLink('pending_changes'),
-				'</p>';
+			'<p class="ui-state-highlight">',
+			I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.'),
+			' ', FunctionsPrint::helpLink('pending_changes'),
+			'</p>';
 		}
 	} elseif ($controller->record->isPendingAddtion()) {
 		if (Auth::isModerator($controller->record->getTree())) {
 			echo
-				'<p class="ui-state-highlight">',
-				/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-					'This family has been edited. You should review the changes and then %1$s or %2$s them.',
-					'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
-					'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
-				),
-				' ', FunctionsPrint::helpLink('pending_changes'),
-				'</p>';
+			'<p class="ui-state-highlight">',
+				/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */
+			I18N::translate(
+				'This family has been edited. You should review the changes and then %1$s or %2$s them.',
+				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
+				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
+			),
+			' ', FunctionsPrint::helpLink('pending_changes'),
+			'</p>';
 		} elseif (Auth::isEditor($controller->record->getTree())) {
 			echo
-				'<p class="ui-state-highlight">',
-				I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.'),
-				' ', FunctionsPrint::helpLink('pending_changes'),
-				'</p>';
+			'<p class="ui-state-highlight">',
+			I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.'),
+			' ', FunctionsPrint::helpLink('pending_changes'),
+			'</p>';
 		}
 	}
 } elseif ($controller->record && $controller->record->getTree()->getPreference('SHOW_PRIVATE_RELATIONSHIPS')) {
@@ -85,40 +87,40 @@ if ($controller->record && $controller->record->canShow()) {
 
 ?>
 <div id="family-page">
-<h2><?php echo $controller->record->getFullName(); ?></h2>
+	<h2><?php echo $controller->record->getFullName(); ?></h2>
 
-<table id="family-table" align="center" width="95%">
-	<tr valign="top">
-		<td valign="top" style="width: <?php echo Theme::theme()->parameter('chart-box-x') + 30; ?>px;"><!--//List of children//-->
-			<?php FunctionsCharts::printFamilyChildren($controller->record); ?>
-		</td>
-		<td> <!--//parents pedigree chart and Family Details//-->
-			<table width="100%">
-				<tr>
-					<td class="subheaders" valign="top"><?php echo I18N::translate('Parents'); ?></td>
-					<td class="subheaders" valign="top"><?php echo I18N::translate('Grandparents'); ?></td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<?php
-						FunctionsCharts::printFamilyParents($controller->record);
-						if (Auth::isEditor($controller->record->getTree())) {
-							$husb = $controller->record->getHusband();
-							if (!$husb) {
-								echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'HUSB\');">', I18N::translate('Add a new father'), '</a><br>';
+	<table id="family-table">
+		<tr style="vertical-align:top;">
+			<td style="width: <?php echo Theme::theme()->parameter('chart-box-x') + 30; ?>px;"><!--//List of children//-->
+				<?php FunctionsCharts::printFamilyChildren($controller->record); ?>
+			</td>
+			<td> <!--//parents pedigree chart and Family Details//-->
+				<table width="100%">
+					<tr>
+						<td class="subheaders"><?php echo I18N::translate('Parents'); ?></td>
+						<td class="subheaders"><?php echo I18N::translate('Grandparents'); ?></td>
+					</tr>
+					<tr>
+						<td colspan="2">
+							<?php
+							FunctionsCharts::printFamilyParents($controller->record);
+							if (Auth::isEditor($controller->record->getTree())) {
+								$husb = $controller->record->getHusband();
+								if (!$husb) {
+									echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'HUSB\');">', I18N::translate('Add a new father'), '</a><br>';
+								}
+								$wife = $controller->record->getWife();
+								if (!$wife) {
+									echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'WIFE\');">', I18N::translate('Add a new mother'), '</a><br>';
+								}
 							}
-							$wife = $controller->record->getWife();
-							if (!$wife) {
-								echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'WIFE\');">', I18N::translate('Add a new mother'), '</a><br>';
-							}
-						}
-						?>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-					<span class="subheaders"><?php echo I18N::translate('Family group information'); ?></span>
-						<?php
+							?>
+						</td>
+					</tr>
+					<tr>
+						<td colspan="2">
+							<span class="subheaders"><?php echo I18N::translate('Family group information'); ?></span>
+							<?php
 							if ($controller->record->canShow()) {
 								echo '<table class="facts_table">';
 								$controller->printFamilyFacts();
@@ -126,11 +128,11 @@ if ($controller->record && $controller->record->canShow()) {
 							} else {
 								echo '<p class="ui-state-highlight">', I18N::translate('The details of this family are private.'), '</p>';
 							}
-						?>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-</div> <!-- Close <div id="family-page"> -->
+							?>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</div>