summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Controller/TimelineController.php4
-rw-r--r--app/Functions/FunctionsCharts.php65
-rw-r--r--app/Module/CensusAssistantModule.php8
-rw-r--r--app/Module/ChartsBlockModule.php10
-rw-r--r--app/Module/ClippingsCartModule.php643
-rw-r--r--app/Module/GoogleMapsModule.php37
-rw-r--r--app/Module/HtmlBlockModule.php40
-rw-r--r--app/Module/InteractiveTree/TreeView.php4
-rw-r--r--app/Module/TopGivenNamesModule.php2
-rw-r--r--app/Module/TopPageViewsModule.php12
-rw-r--r--app/Stats.php5
-rw-r--r--edit_interface.php2
-rw-r--r--editnews.php4
-rw-r--r--family.php132
-rw-r--r--help_text.php8
-rw-r--r--mediaviewer.php4
-rw-r--r--message.php8
-rw-r--r--modules_v3/GEDFact_assistant/MEDIA_ctrl.php8
-rw-r--r--modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php18
-rw-r--r--statistics.php44
-rw-r--r--timeline.php10
21 files changed, 564 insertions, 504 deletions
diff --git a/app/Controller/TimelineController.php b/app/Controller/TimelineController.php
index 102ed85cee..cc4c8db7d4 100644
--- a/app/Controller/TimelineController.php
+++ b/app/Controller/TimelineController.php
@@ -185,7 +185,7 @@ class TimelineController extends PageController {
echo "<div id=\"fact$factcount\" style=\"position:absolute; " . (I18N::direction() === 'ltr' ? 'left: ' . ($xoffset) : 'right: ' . ($xoffset)) . 'px; top:' . ($yoffset) . "px; font-size: 8pt; height: " . ($this->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" align="left" width="10" alt="" style="padding-';
+ echo '<img src="' . Theme::theme()->parameter('image-hline') . '" name="boxline' . $factcount . '" id="boxline' . $factcount . '" height="3" width="10" alt="" style="padding-';
if (I18N::direction() === 'ltr') {
echo 'left: 3px;">';
} else {
@@ -202,7 +202,7 @@ class TimelineController extends PageController {
$col = array_search($event->getParent()->getWife(), $this->people);
}
$col = $col % 6;
- echo '</td><td valign="top" class="person' . $col . '">';
+ echo '</td><td class="person' . $col . '">';
if (count($this->people) > 6) {
// We only have six colours, so show naes if more than this number
echo $event->getParent()->getFullName() . ' — ';
diff --git a/app/Functions/FunctionsCharts.php b/app/Functions/FunctionsCharts.php
index 4deb44dcd7..9e5931c29e 100644
--- a/app/Functions/FunctionsCharts.php
+++ b/app/Functions/FunctionsCharts.php
@@ -112,11 +112,11 @@ class FunctionsCharts {
self::printSosaNumber($sosa * 2);
}
if ($husb->isPendingAddtion()) {
- echo '<td valign="top" class="facts_value new">';
+ echo '<td class="facts_value new">';
} elseif ($husb->isPendingDeletion()) {
- echo '<td valign="top" class="facts_value old">';
+ echo '<td class="facts_value old">';
} else {
- echo '<td valign="top">';
+ echo '<td>';
}
FunctionsPrint::printPedigreePerson($husb, $show_full);
echo "</td></tr></table>";
@@ -136,20 +136,20 @@ class FunctionsCharts {
if (!empty($gparid) && $hfam->getHusband()->getXref() == $gparid) {
self::printSosaNumber(trim(substr($label, 0, -3), ".") . ".");
}
- echo '<td valign="top">';
+ echo '<td>';
FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
echo "</td></tr></table>";
} elseif ($hfam && !$hfam->getHusband()) {
// Empty box for grandfather
echo '<table border="0"><tr>';
- echo '<td valign="top">';
+ echo '<td>';
FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
echo '</td></tr></table>';
}
echo "</td>";
}
if ($hfam && ($sosa != -1)) {
- echo '<td valign="middle" rowspan="2">';
+ echo '<td rowspan="2">';
self::printUrlArrow(($sosa == 0 ? '?famid=' . $hfam->getXref() . '&amp;ged=' . $hfam->getTree()->getNameUrl() : '#' . $hfam->getXref()), $hfam->getXref(), 1);
echo '</td>';
}
@@ -164,13 +164,13 @@ class FunctionsCharts {
if (!empty($gparid) && $hfam->getWife()->getXref() == $gparid) {
self::printSosaNumber(trim(substr($label, 0, -3), ".") . ".");
}
- echo '<td valign="top">';
+ echo '<td>';
FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
echo '</td></tr></table>';
} elseif ($hfam && !$hfam->getWife()) {
// Empty box for grandmother
echo "<table border='0'><tr>";
- echo '<td valign="top">';
+ echo '<td>';
FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
echo '</td></tr></table>';
}
@@ -203,11 +203,11 @@ class FunctionsCharts {
self::printSosaNumber($sosa * 2 + 1);
}
if ($wife->isPendingAddtion()) {
- echo '<td valign="top" class="facts_value new">';
+ echo '<td class="facts_value new">';
} elseif ($wife->isPendingDeletion()) {
- echo '<td valign="top" class="facts_value old">';
+ echo '<td class="facts_value old">';
} else {
- echo '<td valign="top">';
+ echo '<td>';
}
FunctionsPrint::printPedigreePerson($wife, $show_full);
echo "</td></tr></table>";
@@ -227,20 +227,20 @@ class FunctionsCharts {
if (!empty($gparid) && $hfam->getHusband()->getXref() == $gparid) {
self::printSosaNumber(trim(substr($label, 0, -3), ".") . ".");
}
- echo '<td valign="top">';
+ echo '<td>';
FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
- echo "</td></tr></table>";
+ echo '</td></tr></table>';
} elseif ($hfam && !$hfam->getHusband()) {
// Empty box for grandfather
- echo "<table border='0'><tr>";
- echo '<td valign="top">';
+ echo '<table border="0"><tr>';
+ echo '<td>';
FunctionsPrint::printPedigreePerson($hfam->getHusband(), $show_full);
echo '</td></tr></table>';
}
- echo "</td>";
+ echo '</td>';
}
if ($hfam && ($sosa != -1)) {
- echo '<td valign="middle" rowspan="2">';
+ echo '<td rowspan="2">';
self::printUrlArrow(($sosa == 0 ? '?famid=' . $hfam->getXref() . '&amp;ged=' . $hfam->getTree()->getNameUrl() : '#' . $hfam->getXref()), $hfam->getXref(), 1);
echo '</td>';
}
@@ -255,13 +255,13 @@ class FunctionsCharts {
if (!empty($gparid) && $hfam->getWife()->getXref() == $gparid) {
self::printSosaNumber(trim(substr($label, 0, -3), ".") . ".");
}
- echo '<td valign="top">';
+ echo '<td>';
FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
echo '</td></tr></table>';
} elseif ($hfam && !$hfam->getWife()) {
// Empty box for grandmother
echo '<table border="0"><tr>';
- echo '<td valign="top">';
+ echo '<td>';
FunctionsPrint::printPedigreePerson($hfam->getWife(), $show_full);
echo '</td></tr></table>';
}
@@ -332,14 +332,14 @@ class FunctionsCharts {
}
}
if ($child->isPendingAddtion()) {
- echo '<td valign="middle" class="new">';
+ echo '<td class="new">';
} elseif ($child->isPendingDeletion()) {
- echo '<td valign="middle" class="old">';
+ echo '<td class="old">';
} else {
- echo '<td valign="middle">';
+ echo '<td>';
}
FunctionsPrint::printPedigreePerson($child, $show_full);
- echo "</td>";
+ echo '</td>';
if ($sosa != 0) {
// loop for all families where current child is a spouse
$famids = $child->getSpouseFamilies();
@@ -350,12 +350,7 @@ class FunctionsCharts {
// multiple marriages
if ($f > 0) {
echo '</tr><tr><td></td>';
- echo '<td valign="top"';
- if (I18N::direction() === 'rtl') {
- echo ' align="left">';
- } else {
- echo ' align="right">';
- }
+ echo '<td>';
//find out how many cousins there are to establish vertical line on second families
$fchildren = $famids[$f]->getChildren();
@@ -376,7 +371,7 @@ class FunctionsCharts {
echo ' width="3" src="' . Theme::theme()->parameter('image-vline') . '" alt="">';
echo '</td>';
}
- echo '<td class="details1" valign="middle" align="center">';
+ echo '<td class="details1" style="text-align:center;">';
$spouse = $famids[$f]->getSpouse($child);
$marr = $famids[$f]->getFirstFact('MARR');
@@ -440,7 +435,7 @@ class FunctionsCharts {
}
self::printFamilyParents(Family::getInstance($famid, $WT_TREE), $sosa, $label, $parid, $gparid, $show_full);
echo '<br>';
- echo '<table><tr><td valign="top">';
+ echo '<table><tr><td>';
self::printFamilyChildren(Family::getInstance($famid, $WT_TREE), $childid, $sosa, $label, $show_cousins, $show_full);
echo '</td></tr></table>';
echo '<br>';
@@ -517,17 +512,17 @@ class FunctionsCharts {
$kids = count($fchildren);
- echo '<td valign="middle" height="100%">';
+ echo '<td>';
if ($kids) {
- echo '<table cellspacing="0" cellpadding="0" border="0" ><tr valign="middle">';
+ echo '<table cellspacing="0" cellpadding="0" border="0" ><tr>';
if ($kids > 1) {
- echo '<td rowspan="', $kids, '" valign="middle" align="right"><img width="3px" height="', (($bheight + 9) * ($kids - 1)), 'px" src="', Theme::theme()->parameter('image-vline'), '" alt=""></td>';
+ echo '<td rowspan="', $kids, '"><img width="3px" height="', (($bheight + 9) * ($kids - 1)), 'px" src="', Theme::theme()->parameter('image-vline'), '" alt=""></td>';
}
$ctkids = count($fchildren);
$i = 1;
foreach ($fchildren as $fchil) {
if ($i == 1) {
- echo '<td><img width="10px" height="3px" align="top"';
+ echo '<td><img width="10px" height="3px" style="vertical-align:top"';
} else {
echo '<td><img width="10px" height="3px"';
}
diff --git a/app/Module/CensusAssistantModule.php b/app/Module/CensusAssistantModule.php
index 97d9a62744..728980de50 100644
--- a/app/Module/CensusAssistantModule.php
+++ b/app/Module/CensusAssistantModule.php
@@ -82,7 +82,7 @@ class CensusAssistantModule extends AbstractModule {
->pageHeader();
echo '<table class="list_table width90" border="0">';
- echo '<tr><td style="padding: 10px;" valign="top" class="facts_label03 width90">';
+ echo '<tr><td style="padding: 10px;" class="facts_label03 width90">';
echo I18N::translate('Find an individual');
echo '</td>';
echo '</table>';
@@ -176,9 +176,9 @@ class CensusAssistantModule extends AbstractModule {
</script>
<?php
- echo '<div align="center">';
+ echo '<div>';
echo '<table class="list_table width90" border="0">';
- echo '<tr><td style="padding: 10px;" valign="top" class="facts_label03 width90">'; // start column for find text header
+ echo '<tr><td style="padding: 10px;" class="facts_label03 width90">'; // start column for find text header
echo $controller->getPageTitle();
echo '</td>';
echo '</tr>';
@@ -462,7 +462,7 @@ class CensusAssistantModule extends AbstractModule {
<?php echo $spouse->getFullName(); ?>
</a>
</td>
- <td align="left" class="facts_value">
+ <td class="facts_value">
<a href="edit_interface.php?action=addnewnote_assisted&amp;noteid=newnote&amp;xref=<?php echo $spouse->getXref(); ?>&amp;gedcom=<?php echo $spouse->getTree()->getNameUrl(); ?>&amp;census=<?php echo get_class($census); ?>">
<?php echo $headImg2; ?>
</a>
diff --git a/app/Module/ChartsBlockModule.php b/app/Module/ChartsBlockModule.php
index 36a77fd1ab..eb7bbfae89 100644
--- a/app/Module/ChartsBlockModule.php
+++ b/app/Module/ChartsBlockModule.php
@@ -86,12 +86,12 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
$title .= I18N::translate('Pedigree of %s', $person->getFullName());
$chartController = new HourglassController($person->getXref(), $details, false);
$controller->addInlineJavascript($chartController->setupJavascript());
- $content .= '<td valign="middle">';
+ $content .= '<td>';
ob_start();
FunctionsPrint::printPedigreePerson($person, $details);
$content .= ob_get_clean();
$content .= '</td>';
- $content .= '<td valign="middle">';
+ $content .= '<td>';
ob_start();
$chartController->printPersonPedigree($person, 1);
$content .= ob_get_clean();
@@ -101,7 +101,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
$title .= I18N::translate('Descendants of %s', $person->getFullName());
$chartController = new HourglassController($person->getXref(), $details, false);
$controller->addInlineJavascript($chartController->setupJavascript());
- $content .= '<td valign="middle">';
+ $content .= '<td>';
ob_start();
$chartController->printDescendency($person, 1, false);
$content .= ob_get_clean();
@@ -111,12 +111,12 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
$title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
$chartController = new HourglassController($person->getXref(), $details, false);
$controller->addInlineJavascript($chartController->setupJavascript());
- $content .= '<td valign="middle">';
+ $content .= '<td>';
ob_start();
$chartController->printDescendency($person, 1, false);
$content .= ob_get_clean();
$content .= '</td>';
- $content .= '<td valign="middle">';
+ $content .= '<td>';
ob_start();
$chartController->printPersonPedigree($person, 1);
$content .= ob_get_clean();
diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php
index 02df3d47cd..92879eae95 100644
--- a/app/Module/ClippingsCartModule.php
+++ b/app/Module/ClippingsCartModule.php
@@ -33,12 +33,14 @@ use Fisharebest\Webtrees\Session;
class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, ModuleSidebarInterface {
/** {@inheritdoc} */
public function getTitle() {
- return /* I18N: Name of a module */ I18N::translate('Clippings cart');
+ return /* I18N: Name of a module */
+ I18N::translate('Clippings cart');
}
/** {@inheritdoc} */
public function getDescription() {
- return /* I18N: Description of the “Clippings cart” module */ I18N::translate('Select records from your family tree and save them as a GEDCOM file.');
+ return /* I18N: Description of the “Clippings cart” module */
+ I18N::translate('SELECT records FROM your family tree AND save them AS a GEDCOM FILE.');
}
/**
@@ -91,213 +93,226 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
if ($clip_ctrl->action == 'add') {
$record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
if ($clip_ctrl->type === 'FAM') { ?>
- <form action="module.php" method="get">
- <input type="hidden" name="mod" value="clippings">
- <input type="hidden" name="mod_action" value="index">
- <input type="hidden" name="id" value="<?php echo $clip_ctrl->id; ?>">
- <input type="hidden" name="type" value="<?php echo $clip_ctrl->type; ?>">
- <input type="hidden" name="action" value="add1">
- <table>
- <thead>
- <tr>
- <td class="topbottombar">
- <?php echo I18N::translate('Add to the clippings cart'); ?>
- </td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="optionbox">
- <input type="radio" name="others" value="parents">
- <?php echo $record->getFullName(); ?>
- </td>
- </tr>
- <tr>
- <td class="optionbox">
- <input type="radio" name="others" value="members" checked>
- <?php echo /* I18N: %s is a family (husband + wife) */ I18N::translate('%s and their children', $record->getFullName()); ?>
- </td>
- </tr>
- <tr>
- <td class="optionbox">
- <input type="radio" name="others" value="descendants">
- <?php echo /* I18N: %s is a family (husband + wife) */ I18N::translate('%s and their descendants', $record->getFullName()); ?>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td class="topbottombar"><input type="submit" value="<?php echo I18N::translate('continue'); ?>">
- </td>
- </tr>
- </tfoot>
- </table>
- </form>
- <?php } elseif ($clip_ctrl->type === 'INDI') { ?>
- <form action="module.php" method="get">
- <input type="hidden" name="mod" value="clippings">
- <input type="hidden" name="mod_action" value="index">
- <input type="hidden" name="id" value="<?php echo $clip_ctrl->id; ?>">
- <input type="hidden" name="type" value="<?php echo $clip_ctrl->type; ?>">
- <input type="hidden" name="action" value="add1"></td></tr>
- <table>
- <thead>
- <tr>
- <td class="topbottombar">
- <?php echo I18N::translate('Add to the clippings cart'); ?>
- </td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="optionbox">
- <label>
- <input type="radio" name="others" checked value="none">
- <?php echo $record->getFullName(); ?>
- </label>
- </td>
- </tr>
- <tr>
- <td class="optionbox">
- <label>
+ <form action="module.php" method="get">
+ <input type="hidden" name="mod" value="clippings">
+ <input type="hidden" name="mod_action" value="index">
+ <input type="hidden" name="id" value="<?php echo $clip_ctrl->id; ?>">
+ <input type="hidden" name="type" value="<?php echo $clip_ctrl->type; ?>">
+ <input type="hidden" name="action" value="add1">
+ <table>
+ <thead>
+ <tr>
+ <td class="topbottombar">
+ <?php echo I18N::translate('Add to the clippings cart'); ?>
+ </td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="optionbox">
<input type="radio" name="others" value="parents">
- <?php
- if ($record->getSex() === 'F') {
- echo /* I18N: %s is a woman's name */ I18N::translate('%s, her parents and siblings', $record->getFullName());
- } else {
- echo /* I18N: %s is a man's name */ I18N::translate('%s, his parents and siblings', $record->getFullName());
- }
- ?>
- </label>
- </td>
- </tr>
- <tr>
- <td class="optionbox">
- <label>
- <input type="radio" name="others" value="members">
- <?php
- if ($record->getSex() === 'F') {
- echo /* I18N: %s is a woman's name */ I18N::translate('%s, her spouses and children', $record->getFullName());
- } else {
- echo /* I18N: %s is a man's name */ I18N::translate('%s, his spouses and children', $record->getFullName());
- }
- ?>
- </label>
- </td>
- </tr>
- <tr>
- <td class="optionbox">
- <label>
- <input type="radio" name="others" value="ancestors" id="ancestors">
- <?php
- if ($record->getSex() === 'F') {
- echo /* I18N: %s is a woman's name */ I18N::translate('%s and her ancestors', $record->getFullName());
- } else {
- echo /* I18N: %s is a man's name */ I18N::translate('%s and his ancestors', $record->getFullName());
- }
- ?>
- </label>
- <br>
- <?php echo I18N::translate('Number of generations'); ?>
- <input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
- </td>
- </tr>
- <tr>
- <td class="optionbox">
- <label>
- <input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies">
- <?php
- if ($record->getSex() === 'F') {
- echo /* I18N: %s is a woman's name */ I18N::translate('%s, her ancestors and their families', $record->getFullName());
- } else {
- echo /* I18N: %s is a man's name */ I18N::translate('%s, his ancestors and their families', $record->getFullName());
- }
- ?>
- </label>
- <br >
- <?php echo I18N::translate('Number of generations'); ?>
- <input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
- </td>
- </tr>
- <tr>
- <td class="optionbox">
- <label>
- <input type="radio" name="others" value="descendants" id="descendants">
- <?php
- if ($record->getSex() === 'F') {
- echo /* I18N: %s is a woman's name */ I18N::translate('%s, her spouses and descendants', $record->getFullName());
- } else {
- echo /* I18N: %s is a man's name */ I18N::translate('%s, his spouses and descendants', $record->getFullName());
- }
- ?>
- </label>
- <br >
- <?php echo I18N::translate('Number of generations'); ?>
- <input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td class="topbottombar">
- <input type="submit" value="<?php echo I18N::translate('continue'); ?>">
- </td>
- </tr>
- </tfoot>
- </table>
- </form>
- <?php } elseif ($clip_ctrl->type === 'SOUR') { ?>
- <form action="module.php" method="get">
- <input type="hidden" name="mod" value="clippings">
- <input type="hidden" name="mod_action" value="index">
- <input type="hidden" name="id" value="<?php echo $clip_ctrl->id; ?>">
- <input type="hidden" name="type" value="<?php echo $clip_ctrl->type; ?>">
- <input type="hidden" name="action" value="add1"></td></tr>
- <table>
- <thead>
- <tr>
- <td class="topbottombar">
- <?php echo I18N::translate('Add to the clippings cart'); ?>
- </td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="optionbox">
- <label>
- <input type="radio" name="others" checked value="none">
<?php echo $record->getFullName(); ?>
- </label>
- </td>
- </tr>
- <tr>
- <td class="optionbox">
- <label>
- <input type="radio" name="others" value="linked">
- <?php echo /* I18N: %s is the name of a source */ I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
- </label>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td class="topbottombar">
- <input type="submit" value="<?php echo I18N::translate('continue'); ?>">
- </td>
- </tr>
- </tfoot>
- </table>
- </form>
+ </td>
+ </tr>
+ <tr>
+ <td class="optionbox">
+ <input type="radio" name="others" value="members" checked>
+ <?php echo /* I18N: %s is a family (husband + wife) */
+ I18N::translate('%s and their children', $record->getFullName()); ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="optionbox">
+ <input type="radio" name="others" value="descendants">
+ <?php echo /* I18N: %s is a family (husband + wife) */
+ I18N::translate('%s and their descendants', $record->getFullName()); ?>
+ </td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td class="topbottombar"><input type="submit" value="<?php echo I18N::translate('continue'); ?>">
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </form>
+ <?php } elseif ($clip_ctrl->type === 'INDI') { ?>
+ <form action="module.php" method="get">
+ <input type="hidden" name="mod" value="clippings">
+ <input type="hidden" name="mod_action" value="index">
+ <input type="hidden" name="id" value="<?php echo $clip_ctrl->id; ?>">
+ <input type="hidden" name="type" value="<?php echo $clip_ctrl->type; ?>">
+ <input type="hidden" name="action" value="add1">
+ <table>
+ <thead>
+ <tr>
+ <td class="topbottombar">
+ <?php echo I18N::translate('Add to the clippings cart'); ?>
+ </td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="optionbox">
+ <label>
+ <input type="radio" name="others" checked value="none">
+ <?php echo $record->getFullName(); ?>
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td class="optionbox">
+ <label>
+ <input type="radio" name="others" value="parents">
+ <?php
+ if ($record->getSex() === 'F') {
+ echo /* I18N: %s is a woman's name */
+ I18N::translate('%s, her parents and siblings', $record->getFullName());
+ } else {
+ echo /* I18N: %s is a man's name */
+ I18N::translate('%s, his parents and siblings', $record->getFullName());
+ }
+ ?>
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td class="optionbox">
+ <label>
+ <input type="radio" name="others" value="members">
+ <?php
+ if ($record->getSex() === 'F') {
+ echo /* I18N: %s is a woman's name */
+ I18N::translate('%s, her spouses and children', $record->getFullName());
+ } else {
+ echo /* I18N: %s is a man's name */
+ I18N::translate('%s, his spouses and children', $record->getFullName());
+ }
+ ?>
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td class="optionbox">
+ <label>
+ <input type="radio" name="others" value="ancestors" id="ancestors">
+ <?php
+ if ($record->getSex() === 'F') {
+ echo /* I18N: %s is a woman's name */
+ I18N::translate('%s and her ancestors', $record->getFullName());
+ } else {
+ echo /* I18N: %s is a man's name */
+ I18N::translate('%s and his ancestors', $record->getFullName());
+ }
+ ?>
+ </label>
+ <br>
+ <?php echo I18N::translate('Number of generations'); ?>
+ <input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
+ </td>
+ </tr>
+ <tr>
+ <td class="optionbox">
+ <label>
+ <input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies">
+ <?php
+ if ($record->getSex() === 'F') {
+ echo /* I18N: %s is a woman's name */
+ I18N::translate('%s, her ancestors and their families', $record->getFullName());
+ } else {
+ echo /* I18N: %s is a man's name */
+ I18N::translate('%s, his ancestors and their families', $record->getFullName());
+ }
+ ?>
+ </label>
+ <br>
+ <?php echo I18N::translate('Number of generations'); ?>
+ <input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
+ </td>
+ </tr>
+ <tr>
+ <td class="optionbox">
+ <label>
+ <input type="radio" name="others" value="descendants" id="descendants">
+ <?php
+ if ($record->getSex() === 'F') {
+ echo /* I18N: %s is a woman's name */
+ I18N::translate('%s, her spouses and descendants', $record->getFullName());
+ } else {
+ echo /* I18N: %s is a man's name */
+ I18N::translate('%s, his spouses and descendants', $record->getFullName());
+ }
+ ?>
+ </label>
+ <br>
+ <?php echo I18N::translate('Number of generations'); ?>
+ <input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
+ </td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td class="topbottombar">
+ <input type="submit" value="<?php echo I18N::translate('continue'); ?>">
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </form>
+ <?php } elseif ($clip_ctrl->type === 'SOUR') { ?>
+ <form action="module.php" method="get">
+ <input type="hidden" name="mod" value="clippings">
+ <input type="hidden" name="mod_action" value="index">
+ <input type="hidden" name="id" value="<?php echo $clip_ctrl->id; ?>">
+ <input type="hidden" name="type" value="<?php echo $clip_ctrl->type; ?>">
+ <input type="hidden" name="action" value="add1">
+ <table>
+ <thead>
+ <tr>
+ <td class="topbottombar">
+ <?php echo I18N::translate('Add to the clippings cart'); ?>
+ </td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="optionbox">
+ <label>
+ <input type="radio" name="others" checked value="none">
+ <?php echo $record->getFullName(); ?>
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td class="optionbox">
+ <label>
+ <input type="radio" name="others" value="linked">
+ <?php echo /* I18N: %s is the name of a source */
+ I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
+ </label>
+ </td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td class="topbottombar">
+ <input type="submit" value="<?php echo I18N::translate('continue'); ?>">
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </form>
<?php }
- }
+ }
if (!$cart[$WT_TREE->getTreeId()]) {
if ($clip_ctrl->action != 'add') {
echo I18N::translate('The clippings cart allows you to take extracts (“clippings”) from this family tree and bundle them up into a single file for downloading and subsequent importing into your own genealogy program. The downloadable file is recorded in GEDCOM format.<br><ul><li>How to take clippings?<br>This is really simple. Whenever you see a clickable name (individual, family, or source) you can go to the Details page of that name. There you will see the <b>Add to clippings cart</b> option. When you click that link you will be offered several options to download.</li><li>How to download?<br>Once you have items in your cart, you can download them just by clicking the “Download” link. Follow the instructions and links.</li></ul>');
?>
<form method="get" name="addin" action="module.php">
- <input type="hidden" name="mod" value="clippings">
- <input type="hidden" name="mod_action" value="index">
+ <input type="hidden" name="mod" value="clippings">
+ <input type="hidden" name="mod_action" value="index">
<table>
<thead>
<tr>
@@ -332,62 +347,93 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
// get lost after ajax updates
$pid = Filter::get('pid', WT_REGEX_XREF);
- if ($clip_ctrl->action != 'download' && $clip_ctrl->action != 'add') { ?>
- <table><tr><td class="width33" valign="top" rowspan="3">
+ if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
<form method="get" action="module.php">
- <input type="hidden" name="mod" value="clippings">
- <input type="hidden" name="mod_action" value="index">
- <input type="hidden" name="action" value="download">
- <input type="hidden" name="pid" value="<?php echo $pid; ?>">
- <table>
- <tr><td colspan="2" class="topbottombar"><h2><?php echo I18N::translate('Download'); ?></h2></td></tr>
- <tr>
- <td class="descriptionbox width50 wrap">
- <?php echo I18N::translate('To reduce the size of the download, you can compress the data into a .ZIP file. You will need to uncompress the .ZIP file before you can use it.'); ?>
- </td>
- <td class="optionbox wrap">
- <input type="checkbox" name="Zip" value="yes">
- <?php echo I18N::translate('Zip file(s)'); ?>
- </td>
- </tr>
- <tr>
- <td class="descriptionbox width50 wrap">
- <?php echo I18N::translate('Include media (automatically zips files)'); ?>
- </td>
- <td class="optionbox"><input type="checkbox" name="IncludeMedia" value="yes"></td></tr>
+ <input type="hidden" name="mod" value="clippings">
+ <input type="hidden" name="mod_action" value="index">
+ <input type="hidden" name="action" value="download">
+ <input type="hidden" name="pid" value="<?php echo $pid; ?>">
+ <table>
+ <tr>
+ <td colspan="2" class="topbottombar">
+ <h2><?php echo I18N::translate('Download'); ?></h2>
+ </td>
+ </tr>
+ <tr>
+ <td class="descriptionbox width50 wrap">
+ <?php echo I18N::translate('To reduce the size of the download, you can compress the data into a .ZIP file. You will need to uncompress the .ZIP file before you can use it.'); ?>
+ </td>
+ <td class="optionbox wrap">
+ <input type="checkbox" name="Zip" value="yes">
+ <?php echo I18N::translate('Zip file(s)'); ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="descriptionbox width50 wrap">
+ <?php echo I18N::translate('Include media (automatically zips files)'); ?>
+ </td>
+ <td class="optionbox">
+ <input type="checkbox" name="IncludeMedia" value="yes">
+ </td>
+ </tr>
- <?php if (Auth::isManager($WT_TREE)) { ?>
- <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings'); ?></td>
- <td class="optionbox">
- <input type="radio" name="privatize_export" value="none" checked> <?php echo I18N::translate('None'); ?><br>
- <input type="radio" name="privatize_export" value="gedadmin"> <?php echo I18N::translate('Manager'); ?><br>
- <input type="radio" name="privatize_export" value="user"> <?php echo I18N::translate('Member'); ?><br>
- <input type="radio" name="privatize_export" value="visitor"> <?php echo I18N::translate('Visitor'); ?>
- </td></tr>
- <?php } elseif (Auth::isMember($WT_TREE)) { ?>
- <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings'); ?></td>
- <td class="optionbox">
- <input type="radio" name="privatize_export" value="user" checked> <?php echo I18N::translate('Member'); ?><br>
- <input type="radio" name="privatize_export" value="visitor"> <?php echo I18N::translate('Visitor'); ?>
- </td></tr>
- <?php } ?>
+ <?php if (Auth::isManager($WT_TREE)) { ?>
+ <tr>
+ <td class="descriptionbox width50 wrap">
+ <?php echo I18N::translate('Apply privacy settings'); ?>
+ </td>
+ <td class="optionbox">
+ <input type="radio" name="privatize_export" value="none" checked>
+ <?php echo I18N::translate('None'); ?>
+ <br>
+ <input type="radio" name="privatize_export" value="gedadmin">
+ <?php echo I18N::translate('Manager'); ?>
+ <br>
+ <input type="radio" name="privatize_export" value="user">
+ <?php echo I18N::translate('Member'); ?>
+ <br>
+ <input type="radio" name="privatize_export" value="visitor">
+ <?php echo I18N::translate('Visitor'); ?>
+ </td>
+ </tr>
+ <?php } elseif (Auth::isMember($WT_TREE)) { ?>
+ <tr>
+ <td class="descriptionbox width50 wrap">
+ <?php echo I18N::translate('Apply privacy settings'); ?>
+ </td>
+ <td class="optionbox">
+ <input type="radio" name="privatize_export" value="user" checked> <?php echo I18N::translate('Member'); ?><br>
+ <input type="radio" name="privatize_export" value="visitor"> <?php echo I18N::translate('Visitor'); ?>
+ </td>
+ </tr>
+ <?php } ?>
- <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Convert from UTF-8 to ISO-8859-1'); ?></td>
- <td class="optionbox"><input type="checkbox" name="convert" value="yes"></td></tr>
+ <tr>
+ <td class="descriptionbox width50 wrap">
+ <?php echo I18N::translate('Convert from UTF-8 to ISO-8859-1'); ?>
+ </td>
+ <td class="optionbox">
+ <input type="checkbox" name="convert" value="yes">
+ </td>
+ </tr>
- <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Add the GEDCOM media path to filenames'); ?></td>
- <td class="optionbox">
- <input type="checkbox" name="conv_path" value="<?php echo Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')); ?>">
- <span dir="auto"><?php echo Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')); ?></span>
- </td></tr>
+ <tr>
+ <td class="descriptionbox width50 wrap">
+ <?php echo I18N::translate('Add the GEDCOM media path to filenames'); ?>
+ </td>
+ <td class="optionbox">
+ <input type="checkbox" name="conv_path" value="<?php echo Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')); ?>">
+ <span dir="auto"><?php echo Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')); ?></span>
+ </td>
+ </tr>
- <tr><td class="topbottombar" colspan="2">
- <input type="submit" value="<?php echo I18N::translate('Download'); ?>">
+ <tr>
+ <td class="topbottombar" colspan="2">
+ <input type="submit" value="<?php echo I18N::translate('Download'); ?>">
+ </td>
+ </tr>
+ </table>
</form>
- </td></tr>
- </table>
- </td></tr>
- </table>
<br>
<form method="get" name="addin" action="module.php">
@@ -414,52 +460,75 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
<input type="submit" value="<?php echo I18N::translate('Add'); ?>">
</td>
</tr>
- </tbody>
+ </tbody>
+ <tfoot>
+ <tr>
+ <th colspan="2">
+ <a href="module.php?mod=clippings&amp;mod_action=index&amp;action=empty">
+ <?php echo I18N::translate('Empty the clippings cart'); ?>
+ </a>
+ </th>
+ </tr>
+ </tfoot>
</table>
</form>
-
<?php } ?>
- <br><a href="module.php?mod=clippings&amp;mod_action=index&amp;action=empty"><?php echo I18N::translate('Empty the clippings cart'); ?></a>
- </td></tr>
- <tr><td class="topbottombar"><h2><?php echo I18N::translate('Family tree clippings cart'); ?></h2></td></tr>
-
- <tr><td valign="top">
+ <h2>
+ <?php echo I18N::translate('Family tree clippings cart'); ?>
+ </h2>
<table id="mycart" class="sortable list_table width100">
- <tr>
- <th class="list_label"><?php echo I18N::translate('Record'); ?></th>
- <th class="list_label"><?php echo I18N::translate('Remove'); ?></th>
- </tr>
- <?php
- foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
- $record = GedcomRecord::getInstance($xref, $WT_TREE);
- if ($record) {
- switch ($record::RECORD_TYPE) {
- case 'INDI': $icon = 'icon-indis'; break;
- case 'FAM': $icon = 'icon-sfamily'; break;
- case 'SOUR': $icon = 'icon-source'; break;
- case 'REPO': $icon = 'icon-repository'; break;
- case 'NOTE': $icon = 'icon-note'; break;
- case 'OBJE': $icon = 'icon-media'; break;
- default: $icon = 'icon-clippings'; break;
- }
- ?>
- <tr><td class="list_value">
- <i class="<?php echo $icon; ?>"></i>
+ <thead>
+ <tr>
+ <th class="list_label"><?php echo I18N::translate('Record'); ?></th>
+ <th class="list_label"><?php echo I18N::translate('Remove'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
<?php
- echo '<a href="', $record->getHtmlUrl(), '">', $record->getFullName(), '</a>';
+ foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
+ $record = GedcomRecord::getInstance($xref, $WT_TREE);
+ if ($record) {
+ switch ($record::RECORD_TYPE) {
+ case 'INDI':
+ $icon = 'icon-indis';
+ break;
+ case 'FAM':
+ $icon = 'icon-sfamily';
+ break;
+ case 'SOUR':
+ $icon = 'icon-source';
+ break;
+ case 'REPO':
+ $icon = 'icon-repository';
+ break;
+ case 'NOTE':
+ $icon = 'icon-note';
+ break;
+ case 'OBJE':
+ $icon = 'icon-media';
+ break;
+ default:
+ $icon = 'icon-clippings';
+ break;
+ }
+ ?>
+ <tr>
+ <td class="list_value">
+ <i class="<?php echo $icon; ?>"></i>
+ <?php
+ echo '<a href="', $record->getHtmlUrl(), '">', $record->getFullName(), '</a>';
+ ?>
+ </td>
+ <td class="list_value center vmiddle"><a href="module.php?mod=clippings&amp;mod_action=index&amp;action=remove&amp;id=<?php echo $xref; ?>" class="icon-remove" title="<?php echo I18N::translate('Remove'); ?>"></a></td>
+ </tr>
+ <?php
+ }
+ }
?>
- </td>
- <td class="list_value center vmiddle"><a href="module.php?mod=clippings&amp;mod_action=index&amp;action=remove&amp;id=<?php echo $xref; ?>" class="icon-remove" title="<?php echo I18N::translate('Remove'); ?>"></a></td>
- </tr>
- <?php
- }
- }
- ?>
</table>
- </td></tr></table>
- <?php
+ <?php
}
break;
default:
diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php
index 5dbdc93b72..7a3d95c454 100644
--- a/app/Module/GoogleMapsModule.php
+++ b/app/Module/GoogleMapsModule.php
@@ -157,23 +157,23 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/wt_v3_googlemap.css" rel="stylesheet">';
echo '<table border="0" width="100%"><tr><td>';
echo '<table width="100%" border="0" class="facts_table">';
- echo '<tr><td valign="top">';
+ echo '<tr><td>';
echo '<div id="map_pane" style="border: 1px solid gray; color: black; width: 100%; height: ', $this->getSetting('GM_YSIZE'), 'px"></div>';
if (Auth::isAdmin()) {
echo '<table width="100%"><tr>';
- echo '<td width="40%" align="left">';
+ echo '<td>';
echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_config">', I18N::translate('Google Maps™ preferences'), '</a>';
echo '</td>';
- echo '<td width="35%" class="center">';
+ echo '<td "style=text-align:center;">';
echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_places">', I18N::translate('Geographic data'), '</a>';
echo '</td>';
- echo '<td width="25%" align="right">';
+ echo '<td style="text-align:end;">';
echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_placecheck">', I18N::translate('Place check'), '</a>';
echo '</td>';
echo '</tr></table>';
}
echo '</td>';
- echo '<td valign="top" width="30%">';
+ echo '<td width="30%">';
echo '<div id="map_content">';
$this->buildIndividualMap($controller->record);
@@ -864,24 +864,24 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
echo '<div id="pedigreemap_chart">';
echo '<table class="tabs_table" cellspacing="0" cellpadding="0" border="0" width="100%">';
echo '<tr>';
- echo '<td valign="top">';
+ echo '<td>';
echo '<div id="pm_map" style="border: 1px solid gray; height: ', $this->getSetting('GM_YSIZE'), 'px; font-size: 0.9em;';
echo '"><i class="icon-loading-large"></i></div>';
if (Auth::isAdmin()) {
echo '<table width="100%">';
- echo '<tr><td align="left">';
+ echo '<tr><td>';
echo '<a href="module.php?mod=googlemap&amp;mod_action=admin_config">', I18N::translate('Google Maps™ preferences'), '</a>';
echo '</td>';
- echo '<td align="center">';
+ echo '<td style="text-align:center;">';
echo '<a href="module.php?mod=googlemap&amp;mod_action=admin_places">', I18N::translate('Geographic data'), '</a>';
echo '</td>';
- echo '<td align="right">';
+ echo '<td style="text-align:end;">';
echo '<a href="module.php?mod=googlemap&amp;mod_action=admin_placecheck">', I18N::translate('Place check'), '</a>';
echo '</td></tr>';
echo '</table>';
}
echo '</td><td width="15px"></td>';
- echo '<td width="310px" valign="top">';
+ echo '<td width="310px">';
echo '<div id="side_bar" style="width:300px; font-size:0.9em; overflow:auto; overflow-x:hidden; overflow-y:auto; height:', $this->getSetting('GM_YSIZE'), 'px;"></div></td>';
echo '</tr>';
echo '</table>';
@@ -889,7 +889,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
echo '<hr>';
echo '<table cellspacing="0" cellpadding="0" border="0" width="100%">';
echo '<tr>';
- echo '<td valign="top">';
+ echo '<td>';
// print summary statistics
if (isset($curgen)) {
$total = pow(2, $curgen) - 1;
@@ -902,7 +902,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
echo '</td>';
echo '</tr>';
echo '<tr>';
- echo '<td valign="top">';
+ echo '<td>';
if ($priv) {
echo I18N::plural('%s individual is private.', '%s individuals are private.', $priv, $priv), '<br>';
}
@@ -2629,9 +2629,9 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
$parent = Filter::getArray('parent');
// create the map
- echo '<table style="margin:20px auto 0 auto;"><tr valign="top"><td>';
+ echo '<table style="margin:20px auto 0 auto;"><tr><td>';
//<!-- start of map display -->
- echo '<table><tr valign="top">';
+ echo '<table><tr>';
echo '<td class="center" width="200px">';
$levelm = $this->setLevelMap($level, $parent);
@@ -2728,9 +2728,9 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
I18N::translate('Zoom') . "<input name='sv_zoomText' id='sv_zoomText' type='text' style='width:30px; background:none; border:none;' value='" . $sv_zoom . "'>
");
if (Auth::isAdmin()) {
- echo '<table align="center" style="margin-left:6px; border:solid 1px black; width:522px; margin-top:-28px; background:#cccccc;">';
+ echo '<table style="margin-left:6px; border:solid 1px black; width:522px; margin-top:-28px; background:#cccccc;">';
} else {
- echo '<table align="center" style="display:none;">';
+ echo '<table style="display:none;">';
}
echo '<tr><td>';
echo '<form style="text-align:left; margin-left:5px; font:11px verdana; color:blue;" method="post" action="">';
@@ -3877,9 +3877,6 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
}
window.onload = function() { loadMap(); };
</script>
- <table><tr><td align="center">
- </td></tr></table>
- </body>
<form method="post" id="editplaces" name="editplaces" action="module.php?mod=googlemap&amp;mod_action=places_edit">
<input type="hidden" name="action" value="<?php echo $action ?>record">
<input type="hidden" name="placeid" value="<?php echo $placeid ?>">
@@ -3894,7 +3891,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
<table class="facts_table">
<tr>
<td class="optionbox" colspan="3">
- <center><div id="map_pane" style="width: 100%; height: 300px;"></div></center>
+ <div id="map_pane" style="width: 100%; height: 300px;"></div>
</td>
</tr>
<tr>
diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php
index cb05ad50bd..e25cfd7a7f 100644
--- a/app/Module/HtmlBlockModule.php
+++ b/app/Module/HtmlBlockModule.php
@@ -165,91 +165,91 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface {
' . I18N::translate('This family tree was last updated on %s.', '#gedcomUpdated#') . '
<table id="keywords">
<tr>
- <td valign="top" class="width20">
+ <td class="width20">
<table cellspacing="1" cellpadding="0">
<tr>
<td class="facts_label">' . I18N::translate('Individuals') . '</td>
- <td class="facts_value" align="right"><a href="indilist.php?surname_sublist=no">#totalIndividuals#</a></td>
+ <td class="facts_value"><a href="indilist.php?surname_sublist=no">#totalIndividuals#</a></td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Males') . '</td>
- <td class="facts_value" align="right">#totalSexMales#<br>#totalSexMalesPercentage#</td>
+ <td class="facts_value">#totalSexMales#<br>#totalSexMalesPercentage#</td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Females') . '</td>
- <td class="facts_value" align="right">#totalSexFemales#<br>#totalSexFemalesPercentage#</td>
+ <td class="facts_value">#totalSexFemales#<br>#totalSexFemalesPercentage#</td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Total surnames') . '</td>
- <td class="facts_value" align="right"><a href="indilist.php?show_all=yes&amp;surname_sublist=yes&amp;ged=' . $WT_TREE->getNameUrl() . '">#totalSurnames#</a></td>
+ <td class="facts_value"><a href="indilist.php?show_all=yes&amp;surname_sublist=yes&amp;ged=' . $WT_TREE->getNameUrl() . '">#totalSurnames#</a></td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Families') . '</td>
- <td class="facts_value" align="right"><a href="famlist.php?ged=' . $WT_TREE->getNameUrl() . '">#totalFamilies#</a></td>
+ <td class="facts_value"><a href="famlist.php?ged=' . $WT_TREE->getNameUrl() . '">#totalFamilies#</a></td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Sources') . '</td>
- <td class="facts_value" align="right"><a href="sourcelist.php?ged=' . $WT_TREE->getNameUrl() . '">#totalSources#</a></td>
+ <td class="facts_value"><a href="sourcelist.php?ged=' . $WT_TREE->getNameUrl() . '">#totalSources#</a></td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Media objects') . '</td>
- <td class="facts_value" align="right"><a href="medialist.php?ged=' . $WT_TREE->getNameUrl() . '">#totalMedia#</a></td>
+ <td class="facts_value"><a href="medialist.php?ged=' . $WT_TREE->getNameUrl() . '">#totalMedia#</a></td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Repositories') . '</td>
- <td class="facts_value" align="right"><a href="repolist.php?ged=' . $WT_TREE->getNameUrl() . '">#totalRepositories#</a></td>
+ <td class="facts_value"><a href="repolist.php?ged=' . $WT_TREE->getNameUrl() . '">#totalRepositories#</a></td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Total events') . '</td>
- <td class="facts_value" align="right">#totalEvents#</td>
+ <td class="facts_value">#totalEvents#</td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Total users') . '</td>
- <td class="facts_value" align="right">#totalUsers#</td>
+ <td class="facts_value">#totalUsers#</td>
</tr>
</table>
</td>
<td><br></td>
- <td valign="top">
+ <td>
<table cellspacing="1" cellpadding="0" border="0">
<tr>
<td class="facts_label">' . I18N::translate('Earliest birth year') . '</td>
- <td class="facts_value" align="right">#firstBirthYear#</td>
+ <td class="facts_value">#firstBirthYear#</td>
<td class="facts_value">#firstBirth#</td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Latest birth year') . '</td>
- <td class="facts_value" align="right">#lastBirthYear#</td>
+ <td class="facts_value">#lastBirthYear#</td>
<td class="facts_value">#lastBirth#</td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Earliest death year') . '</td>
- <td class="facts_value" align="right">#firstDeathYear#</td>
+ <td class="facts_value">#firstDeathYear#</td>
<td class="facts_value">#firstDeath#</td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Latest death year') . '</td>
- <td class="facts_value" align="right">#lastDeathYear#</td>
+ <td class="facts_value">#lastDeathYear#</td>
<td class="facts_value">#lastDeath#</td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Individual who lived the longest') . '</td>
- <td class="facts_value" align="right">#longestLifeAge#</td>
+ <td class="facts_value">#longestLifeAge#</td>
<td class="facts_value">#longestLife#</td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Average age at death') . '</td>
- <td class="facts_value" align="right">#averageLifespan#</td>
+ <td class="facts_value">#averageLifespan#</td>
<td class="facts_value"></td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Family with the most children') . '</td>
- <td class="facts_value" align="right">#largestFamilySize#</td>
+ <td class="facts_value">#largestFamilySize#</td>
<td class="facts_value">#largestFamily#</td>
</tr>
<tr>
<td class="facts_label">' . I18N::translate('Average number of children per family') . '</td>
- <td class="facts_value" align="right">#averageChildren#</td>
+ <td class="facts_value">#averageChildren#</td>
<td class="facts_value"></td>
</tr>
</table>
diff --git a/app/Module/InteractiveTree/TreeView.php b/app/Module/InteractiveTree/TreeView.php
index 5819c60b82..caf9b4a010 100644
--- a/app/Module/InteractiveTree/TreeView.php
+++ b/app/Module/InteractiveTree/TreeView.php
@@ -207,7 +207,7 @@ class TreeView {
$html .= $this->drawPerson($child, $gen - 1, -1, null, $co);
}
if (!$ajax) {
- $html = '<td align="right"' . ($gen == 0 ? ' abbr="c' . $f2load . '"' : '') . '>' . $html . '</td>' . $this->drawHorizontalLine();
+ $html = '<td' . ($gen == 0 ? ' abbr="c' . $f2load . '"' : '') . '>' . $html . '</td>' . $this->drawHorizontalLine();
}
}
@@ -296,7 +296,7 @@ class TreeView {
/* draw the parents */
if ($state >= 0 && (!empty($parent) || count($fop))) {
$unique = (empty($parent) || count($fop) == 0);
- $html .= '<td align="left"><table class="tv_tree"><tbody>';
+ $html .= '<td><table class="tv_tree"><tbody>';
if (!empty($parent)) {
$u = $unique ? 'c' : 't';
$html .= '<tr><td ' . ($gen == 0 ? ' abbr="p' . $primaryChildFamily->getXref() . '@' . $u . '"' : '') . '>';
diff --git a/app/Module/TopGivenNamesModule.php b/app/Module/TopGivenNamesModule.php
index c8d4d9db10..04ee1de0ad 100644
--- a/app/Module/TopGivenNamesModule.php
+++ b/app/Module/TopGivenNamesModule.php
@@ -99,7 +99,7 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface
case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page
$params = array(1, $num, 'rcount');
$content .= '<table style="margin:auto;">
- <tr valign="top">
+ <tr>
<td>' . $stats->commonGivenFemaleTable($params) . '</td>
<td>' . $stats->commonGivenMaleTable($params) . '</td>';
$content .= '</tr></table>';
diff --git a/app/Module/TopPageViewsModule.php b/app/Module/TopPageViewsModule.php
index 5736742e66..626d90bf85 100644
--- a/app/Module/TopPageViewsModule.php
+++ b/app/Module/TopPageViewsModule.php
@@ -76,7 +76,7 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
}
$title .= $this->getTitle();
- $content = "";
+ $content = '';
// load the lines from the file
$top10 = Database::prepare(
"SELECT page_parameter, page_count" .
@@ -89,20 +89,20 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
))->fetchAssoc();
if ($block) {
- $content .= "<table width=\"90%\">";
+ $content .= '<table width="90%">';
} else {
- $content .= "<table>";
+ $content .= '<table>';
}
foreach ($top10 as $id => $count) {
$record = GedcomRecord::getInstance($id, $WT_TREE);
if ($record && $record->canShow()) {
- $content .= '<tr valign="top">';
+ $content .= '<tr>';
if ($count_placement == 'before') {
- $content .= '<td dir="ltr" align="right">[' . $count . ']</td>';
+ $content .= '<td dir="ltr" style="text-align:right">[' . $count . ']</td>';
}
$content .= '<td class="name2" ><a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a></td>';
if ($count_placement == 'after') {
- $content .= '<td dir="ltr" align="right">[' . $count . ']</td>';
+ $content .= '<td dir="ltr" style="text-align:right">[' . $count . ']</td>';
}
$content .= '</tr>';
}
diff --git a/app/Stats.php b/app/Stats.php
index b2e51a7d74..085cd13fff 100644
--- a/app/Stats.php
+++ b/app/Stats.php
@@ -65,9 +65,6 @@ class Stats {
$reflection = new \ReflectionMethod($this, $method);
if ($reflection->isPublic() && !in_array($method, $this->public_but_not_allowed)) {
$examples[$method] = $this->$method();
- if (stristr($method, 'highlight')) {
- $examples[$method] = str_replace(array(' align="left"', ' align="right"'), '', $examples[$method]);
- }
}
}
ksort($examples);
@@ -1738,7 +1735,7 @@ class Stats {
}
$chart = '<div id="google_charts" class="center">';
$chart .= '<b>' . $chart_title . '</b><br><br>';
- $chart .= '<div align="center"><img src="' . $chart_url . '" alt="' . $chart_title . '" title="' . $chart_title . '" class="gchart" /><br>';
+ $chart .= '<div><img src="' . $chart_url . '" alt="' . $chart_title . '" title="' . $chart_title . '" class="gchart" /><br>';
$chart .= '<table class="center"><tr>';
$chart .= '<td bgcolor="#' . $WT_STATS_CHART_COLOR2 . '" width="12"></td><td>' . I18N::translate('Highest population') . '</td>';
$chart .= '<td bgcolor="#' . $WT_STATS_CHART_COLOR3 . '" width="12"></td><td>' . I18N::translate('Lowest population') . '</td>';
diff --git a/edit_interface.php b/edit_interface.php
index f9eb350f0a..1196b596d0 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -1726,7 +1726,7 @@ case 'reorder_media':
<li class="facts_value" style="list-style:none;cursor:move;margin-bottom:2px;" id="li_<?php echo $obje->getXref(); ?>">
<table class="pic">
<tr>
- <td width="80" valign="top" align="center">
+ <td>
<?php echo $obje->displayImage(); ?>
</td>
<td>
diff --git a/editnews.php b/editnews.php
index ead5b73cc4..817be5703d 100644
--- a/editnews.php
+++ b/editnews.php
@@ -65,9 +65,9 @@ case 'compose':
echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
echo '<table>';
- echo '<tr><th style="text-align:left;font-weight:900;" dir="auto;">' . I18N::translate('Title') . '</th><tr>';
+ echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
- echo '<tr><th valign="top" style="text-align:left;font-weight:900;" dir="auto;">' . I18N::translate('Content') . '</th></tr>';
+ echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
echo '<tr><td>';
echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
echo '</td></tr>';
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>
diff --git a/help_text.php b/help_text.php
index 6c2ae0a0da..6a32d534a7 100644
--- a/help_text.php
+++ b/help_text.php
@@ -164,12 +164,12 @@ case 'DATE':
'<p>' . I18N::translate('Simple dates are assumed to be in the gregorian calendar. To specify a date in another calendar, add a keyword before the date. This keyword is optional if the month or year format make the date unambiguous.') . '</p>' .
'<table border="1">' .
'<tr><th>' . I18N::translate('Date') . '</th><th>' . I18N::translate('Format') . '</th></tr>' .
- '<tr><td colspan="2" align="center">' . I18N::translate('Julian') . '</td></tr>' .
+ '<tr><th colspan="2">' . I18N::translate('Julian') . '</th></tr>' .
'<tr><td>' . $dates['@#DJULIAN@ 14 JAN 1700'] . '</td><td><kbd dir="ltr" lang="en">@#DJULIAN@ 14 JAN 1700</kbd></td></tr>' .
'<tr><td>' . $dates['@#DJULIAN@ 44 B.C.'] . '</td><td><kbd dir="ltr" lang="en">@#DJULIAN@ 44 B.C.</kbd></td></tr>' .
'<tr><td>' . $dates['@#DJULIAN@ 20 FEB 1742/43'] . '</td><td><kbd dir="ltr" lang="en">@#DJULIAN@ 20 FEB 1742/43</kbd></td></tr>' .
'<tr><td>' . $dates['BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752'] . '</td><td><kbd dir="ltr" lang="en">BET @#DJULIAN@ 01 SEP 1752 AND @#DGREGORIAN@ 30 SEP 1752</kbd></td></tr>' .
- '<tr><td colspan="2" align="center">' . I18N::translate('Jewish') . '</td></tr>' .
+ '<tr><th colspan="2">' . I18N::translate('Jewish') . '</th></tr>' .
'<tr><td>' . $dates['@#DHEBREW@ 5481'] . '</td><td><kbd dir="ltr" lang="en">@#DHEBREW@ 5481</kbd></td></tr>' .
'<tr><td>' . $dates['@#DHEBREW@ TSH 5481'] . '</td><td><kbd dir="ltr" lang="en">@#DHEBREW@ TSH 5481</kbd></td></tr>' .
'<tr><td>' . $dates['ABT @#DHEBREW@ CSH 5481'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHEBREW@ CSH 5481</kbd></td></tr>' .
@@ -183,7 +183,7 @@ case 'DATE':
'<tr><td>' . $dates['TO @#DHEBREW@ TMZ 5481'] . '</td><td><kbd dir="ltr" lang="en">TO @#DHEBREW@ TMZ 5481</kbd></td></tr>' .
'<tr><td>' . $dates['EST @#DHEBREW@ AAV 5481'] . '</td><td><kbd dir="ltr" lang="en">EST @#DHEBREW@ AAV 5481</kbd></td></tr>' .
'<tr><td>' . $dates['@#DHEBREW@ 03 ELL 5481'] . '</td><td><kbd dir="ltr" lang="en">@#DHEBREW@ 03 ELL 5481</kbd></td></tr>' .
- '<tr><td colspan="2" align="center">' . I18N::translate('Hijri') . '</td></tr>' .
+ '<tr><th colspan="2">' . I18N::translate('Hijri') . '</th></tr>' .
'<tr><td>' . $dates['@#DHIJRI@ 1497'] . '</td><td><kbd dir="ltr" lang="en">@#DHIJRI@ 1497</kbd></td></tr>' .
'<tr><td>' . $dates['@#DHIJRI@ MUHAR 1497'] . '</td><td><kbd dir="ltr" lang="en">@#DHIJRI@ MUHAR 1497</kbd></td></tr>' .
'<tr><td>' . $dates['ABT @#DHIJRI@ SAFAR 1497'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DHIJRI@ SAFAR 1497</kbd></td></tr>' .
@@ -195,7 +195,7 @@ case 'DATE':
'<tr><td>' . $dates['FROM @#DHIJRI@ SHAWW 1497'] . '</td><td><kbd dir="ltr" lang="en">FROM @#DHIJRI@ SHAWW 1497</kbd></td></tr>' .
'<tr><td>' . $dates['TO @#DHIJRI@ DHUAQ 1497'] . '</td><td><kbd dir="ltr" lang="en">TO @#DHIJRI@ DHUAQ 1497</kbd></td></tr>' .
'<tr><td>' . $dates['@#DHIJRI@ 03 DHUAH 1497'] . '</td><td><kbd dir="ltr" lang="en">@#DHIJRI@ 03 DHUAH 1497</kbd></td></tr>' .
- '<tr><td colspan="2" align="center">' . I18N::translate('French') . '</td></tr>' .
+ '<tr><th colspan="2">' . I18N::translate('French') . '</th></tr>' .
'<tr><td>' . $dates['@#DFRENCH R@ 12'] . '</td><td><kbd dir="ltr" lang="en">@#DFRENCH R@ 12</kbd></td></tr>' .
'<tr><td>' . $dates['@#DFRENCH R@ VEND 12'] . '</td><td><kbd dir="ltr" lang="en">@#DFRENCH R@ VEND 12</kbd></td></tr>' .
'<tr><td>' . $dates['ABT @#DFRENCH R@ BRUM 12'] . '</td><td><kbd dir="ltr" lang="en">ABT @#DFRENCH R@ BRUM 12</kbd></td></tr>' .
diff --git a/mediaviewer.php b/mediaviewer.php
index 186ed4fe04..2c01c5b1b9 100644
--- a/mediaviewer.php
+++ b/mediaviewer.php
@@ -146,7 +146,7 @@ $facts = $controller->getFacts();
<div id="media-edit">
<table class="facts_table">
<tr>
- <td align="center" width="150">
+ <td style="text-align:center; width:150px;">
<?php
// When we have a pending edit, $controller->record shows the *old* data.
// As a temporary kludge, fetch a "normal" version of the record - which includes pending changes
@@ -164,7 +164,7 @@ $facts = $controller->getFacts();
}
?>
</td>
- <td valign="top">
+ <td>
<table class="facts_table">
<?php
foreach ($facts as $fact) {
diff --git a/message.php b/message.php
index 11747b44ad..8294a6f986 100644
--- a/message.php
+++ b/message.php
@@ -113,10 +113,10 @@ case 'compose':
echo '<tr><td></td><td>', I18N::translate('This message will be sent to %s', '<b>' . $to_user->getRealNameHtml() . '</b>'), '</td></tr>';
}
if (!Auth::check()) {
- echo '<tr><td valign="top" width="15%" align="right">', I18N::translate('Your name'), '</td>';
- echo '<td><input type="text" name="from_name" size="40" value="', Filter::escapeHtml($from_name), '"></td></tr><tr><td valign="top" align="right">', I18N::translate('Email address'), '</td><td><input type="email" name="from_email" size="40" value="', Filter::escapeHtml($from_email), '"><br>', I18N::translate('Please provide your email address so that we may contact you in response to this message. If you do not provide your email address we will not be able to respond to your inquiry. Your email address will not be used in any other way besides responding to this inquiry.'), '<br><br></td></tr>';
+ echo '<tr style="vertical-align:top;"><td width="15%">', I18N::translate('Your name'), '</td>';
+ echo '<td><input type="text" name="from_name" size="40" value="', Filter::escapeHtml($from_name), '"></td></tr><tr style="vertical-align:top;"><td>', I18N::translate('Email address'), '</td><td><input type="email" name="from_email" size="40" value="', Filter::escapeHtml($from_email), '"><br>', I18N::translate('Please provide your email address so that we may contact you in response to this message. If you do not provide your email address we will not be able to respond to your inquiry. Your email address will not be used in any other way besides responding to this inquiry.'), '<br><br></td></tr>';
}
- echo '<tr><td align="right">', I18N::translate('Subject'), '</td>';
+ echo '<tr style="vertical-align:top;"><td>', I18N::translate('Subject'), '</td>';
echo '<td>';
echo '<input type="hidden" name="action" value="send">';
echo '<input type="hidden" name="to" value="', Filter::escapeHtml($to), '">';
@@ -124,7 +124,7 @@ case 'compose':
echo '<input type="hidden" name="method" value="', $method, '">';
echo '<input type="hidden" name="url" value="', Filter::escapeHtml($url), '">';
echo '<input type="text" name="subject" size="50" value="', Filter::escapeHtml($subject), '"><br></td></tr>';
- echo '<tr><td valign="top" align="right">', I18N::translate('Body'), '<br></td><td><textarea name="body" cols="50" rows="7">', Filter::escapeHtml($body), '</textarea><br></td></tr>';
+ echo '<tr style="vertical-align:top;"><td>', I18N::translate('Body'), '<br></td><td><textarea name="body" cols="50" rows="7">', Filter::escapeHtml($body), '</textarea><br></td></tr>';
echo '<tr><td></td><td><input type="submit" value="', I18N::translate('Send'), '"></td></tr>';
echo '</table>';
echo '</form>';
diff --git a/modules_v3/GEDFact_assistant/MEDIA_ctrl.php b/modules_v3/GEDFact_assistant/MEDIA_ctrl.php
index ac09b9d877..efca401750 100644
--- a/modules_v3/GEDFact_assistant/MEDIA_ctrl.php
+++ b/modules_v3/GEDFact_assistant/MEDIA_ctrl.php
@@ -61,12 +61,12 @@ global $controller;
<div id="media-links">
<table class="facts_table center">
<tr>
- <td class="topbottombar" colspan="1">
+ <td class="topbottombar">
<b><?php echo $controller->getPageTitle(); ?></b>
</td>
</tr>
<tr>
- <td valign="top">
+ <td>
<table class="outer_nav">
<tr>
<th class="descriptionbox"><?php echo I18N::translate('Search for individuals to add to add Links list.'); ?></th>
@@ -91,10 +91,10 @@ global $controller;
</td>
</tr>
<tr>
- <td align="center">
+ <td>
<table width="100%" class="fact_table" cellspacing="0" border="0">
<tr>
- <td align="center" colspan=3 class="descriptionbox wrap">
+ <td colspan=3 class="descriptionbox wrap">
<?php echo I18N::translate('Click %s to choose individual as head of family.', '<i class="headimg vmiddle icon-button_head"></i>'); ?>
<br><br>
<?php echo I18N::translate('Click name to add individual to add links list.'); ?>
diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 3ec0e33987..972f9e2277 100644
--- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -123,12 +123,12 @@ if ($action == 'choose' && $paramok) {
echo '</td><td>';
echo $record->getFullName();
echo '</td>';
- echo '<td align=\'center\'><input alt=\'', I18N::translate('Keep link in list'), '\', title=\'', I18N::translate('Keep link in list'), '\' type=\'radio\' id=\'', $record->getXref(), '_off\' name=\'', $record->getXref(), '\' checked></td>';
- echo '<td align=\'center\'><input alt=\'', I18N::translate('Remove link from list'), '\', title=\'', I18N::translate('Remove link from list'), '\' type=\'radio\' id=\'', $record->getXref(), '_on\' name=\'', $record->getXref(), '\'></td>';
+ echo '<td><input alt="', I18N::translate('Keep link in list'), '" title="', I18N::translate('Keep link in list'), '" type="radio" id="', $record->getXref(), '_off" name="', $record->getXref(), '" checked></td>';
+ echo '<td><input alt="', I18N::translate('Remove link from list'), '" title="', I18N::translate('Remove link from list'), '" type="radio" id="', $record->getXref(), '_on" name="', $record->getXref(), '"></td>';
if ($record instanceof Individual) {
?>
- <td align="center"><a href="#" class="icon-button_family" name="family_'<?php echo $record->getXref(); ?>'" onclick="openFamNav('<?php echo $record->getXref(); ?>'); return false;"></a></td>
+ <td><a href="#" class="icon-button_family" name="family_'<?php echo $record->getXref(); ?>'" onclick="openFamNav('<?php echo $record->getXref(); ?>'); return false;"></a></td>
<?php
} elseif ($record instanceof Family) {
if ($record->getHusband()) {
@@ -139,7 +139,7 @@ if ($action == 'choose' && $paramok) {
$head = '';
}
?>
- <td align="center"><a href="#" class="icon-button_family" name="family_'<?php echo $record->getXref(); ?>'" onclick="openFamNav('<?php echo $head; ?>');"></a></td>
+ <td><a href="#" class="icon-button_family" name="family_'<?php echo $record->getXref(); ?>'" onclick="openFamNav('<?php echo $head; ?>');"></a></td>
<?php
} else {
echo '<td></td>';
@@ -520,11 +520,11 @@ function shiftlinks() {
<table width="430" border="0" cellspacing="1" id="addlinkQueue">
<thead>
<tr>
- <th class="topbottombar" width="10" style="font-weight:100;" align="left">#</th>
- <th class="topbottombar" width="55" style="font-weight:100;" align="left"><?php echo I18N::translate('Record'); ?></th>
- <th class="topbottombar" width="370" style="font-weight:100;" align="left"><?php echo I18N::translate('Name'); ?></th>
- <th class="topbottombar" width="20" style="font-weight:100;" align="left"><?php echo I18N::translate('Remove'); ?></th>
- <th class="topbottombar" width="20" style="font-weight:100;" align="left"><?php echo I18N::translate('Family navigator'); ?></th>
+ <th class="topbottombar" width="10" style="font-weight:100;">#</th>
+ <th class="topbottombar" width="55" style="font-weight:100;"><?php echo I18N::translate('Record'); ?></th>
+ <th class="topbottombar" width="370" style="font-weight:100;"><?php echo I18N::translate('Name'); ?></th>
+ <th class="topbottombar" width="20" style="font-weight:100;"><?php echo I18N::translate('Remove'); ?></th>
+ <th class="topbottombar" width="20" style="font-weight:100;"><?php echo I18N::translate('Family navigator'); ?></th>
</tr>
</thead>
<tbody>
diff --git a/statistics.php b/statistics.php
index 5fb1d6c779..84d4af94e3 100644
--- a/statistics.php
+++ b/statistics.php
@@ -94,10 +94,10 @@ if (!$ajax) {
<td class="facts_label">', I18N::translate('Total dead'), '</td>
</tr>
<tr>
- <td class="facts_value" align="center">', $stats->totalSexMales(), '</td>
- <td class="facts_value" align="center">', $stats->totalSexFemales(), '</td>
- <td class="facts_value" align="center">', $stats->totalLiving(), '</td>
- <td class="facts_value" align="center">', $stats->totalDeceased(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalSexMales(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalSexFemales(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalLiving(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalDeceased(), '</td>
</tr>
<tr>
<td class="facts_value statistics-page" colspan="2">', $stats->chartSex(), '</td>
@@ -112,8 +112,8 @@ if (!$ajax) {
<td class="facts_label">', I18N::translate('Total deaths'), '</td>
</tr>
<tr>
- <td class="facts_value" align="center">', $stats->totalBirths(), '</td>
- <td class="facts_value" align="center">', $stats->totalDeaths(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalBirths(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalDeaths(), '</td>
</tr>
<tr>
<td class="facts_label">', I18N::translate('Births by century'), '</td>
@@ -149,9 +149,9 @@ if (!$ajax) {
<td class="facts_label">', I18N::translate('Females'), '</td>
</tr>
<tr>
- <td class="facts_value" align="center">', $stats->averageLifespan(true), '</td>
- <td class="facts_value" align="center">', $stats->averageLifespanMale(true), '</td>
- <td class="facts_value" align="center">', $stats->averageLifespanFemale(true), '</td>
+ <td class="facts_value statistics-page">', $stats->averageLifespan(true), '</td>
+ <td class="facts_value statistics-page">', $stats->averageLifespanMale(true), '</td>
+ <td class="facts_value statistics-page">', $stats->averageLifespanFemale(true), '</td>
</tr>
<tr>
<td class="facts_value statistics-page" colspan="3">', $stats->statsAge(), '</td>
@@ -191,8 +191,8 @@ if (!$ajax) {
<td class="facts_label">', I18N::translate('Total given names'), '</td>
</tr>
<tr>
- <td class="facts_value" align="center">', $stats->totalSurnames(), '</td>
- <td class="facts_value" align="center">', $stats->totalGivennames(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalSurnames(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalGivennames(), '</td>
</tr>
<tr>
<td class="facts_label">', I18N::translate('Top surnames'), '</td>
@@ -214,8 +214,8 @@ if (!$ajax) {
<td class="facts_label">', I18N::translate('Total divorces'), '</td>
</tr>
<tr>
- <td class="facts_value" align="center">', $stats->totalMarriages(), '</td>
- <td class="facts_value" align="center">', $stats->totalDivorces(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalMarriages(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalDivorces(), '</td>
</tr>
<tr>
<td class="facts_label">', I18N::translate('Marriages by century'), '</td>
@@ -305,8 +305,8 @@ if (!$ajax) {
<td class="facts_label">', I18N::translate('Number of families without children'), '</td>
</tr>
<tr>
- <td class="facts_value" align="center">', $stats->averageChildren(), '</td>
- <td class="facts_value" align="center">', $stats->noChildrenFamilies(), '</td>
+ <td class="facts_value statistics-page">', $stats->averageChildren(), '</td>
+ <td class="facts_value statistics-page">', $stats->noChildrenFamilies(), '</td>
</tr>
<tr>
<td class="facts_value statistics-page">', $stats->statsChildren(), '</td>
@@ -353,10 +353,10 @@ if (!$ajax) {
<td class="facts_label">', I18N::translate('Repositories'), '</td>
</tr>
<tr>
- <td class="facts_value" align="center">', $stats->totalMedia(), '</td>
- <td class="facts_value" align="center">', $stats->totalSources(), '</td>
- <td class="facts_value" align="center">', $stats->totalNotes(), '</td>
- <td class="facts_value" align="center">', $stats->totalRepositories(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalMedia(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalSources(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalNotes(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalRepositories(), '</td>
</tr>
</table>
</fieldset>
@@ -392,8 +392,8 @@ if (!$ajax) {
<td class="facts_label">', I18N::translate('Families with sources'), '</td>
</tr>
<tr>
- <td class="facts_value" align="center">', $stats->totalIndisWithSources(), '</td>
- <td class="facts_value" align="center">', $stats->totalFamsWithSources(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalIndisWithSources(), '</td>
+ <td class="facts_value statistics-page">', $stats->totalFamsWithSources(), '</td>
</tr>
<tr>
<td class="facts_value statistics-page">', $stats->chartIndisWithSources(), '</td>
@@ -638,7 +638,7 @@ if (!$ajax) {
</tr>
</table>
<table width="100%">
- <tr align="center"><td>
+ <tr style="text-align:center;"><td>
<br>
<input type="submit" value="', I18N::translate('show the plot'), ' ">
<input type="reset" value=" ', I18N::translate('reset'), ' " onclick="{statusEnable(\'z_sex\'); statusHide(\'x_years\'); statusHide(\'x_months\'); statusHide(\'x_numbers\'); statusHide(\'map_opt\');}"><br>
diff --git a/timeline.php b/timeline.php
index f3d246a684..8e5cc822da 100644
--- a/timeline.php
+++ b/timeline.php
@@ -291,7 +291,7 @@ document.onmouseup = function () {
<?php } ?>
</td>
<?php } ?>
- <td class="list_value" style="padding: 5px;" valign="top">
+ <td class="list_value" style="padding: 5px;">
<?php echo I18N::translate('Add another individual to the chart'), '<br>'; ?>
<input class="pedigree_form" data-autocomplete-type="INDI" type="text" size="5" id="newpid" name="pids[]">
<?php echo FunctionsPrint::printFindIndividualLink('newpid'); ?>
@@ -359,9 +359,9 @@ if (count($controller->people) > 0) {
<table cellspacing="0" cellpadding="0">
<tr>
<td>
- <img src="<?php echo Theme::theme()->parameter('image-hline'); ?>" name="ageline<?php echo $p; ?>" id="ageline<?php echo $p; ?>" align="left" width="25" height="3" alt="">
+ <img src="<?php echo Theme::theme()->parameter('image-hline'); ?>" name="ageline<?php echo $p; ?>" id="ageline<?php echo $p; ?>" width="25" height="3" alt="">
</td>
- <td valign="top">
+ <td>
<?php
$tyear = round(($ageyoffset + ($controller->bheight / 2)) / $controller->scale) + $controller->baseyear;
if (!empty($controller->birthyears[$pid])) {
@@ -369,12 +369,12 @@ if (count($controller->people) > 0) {
?>
<table class="person<?php echo $col; ?>" style="cursor: hand;">
<tr>
- <td valign="top" width="120"><?php echo I18N::translate('Year:'); ?>
+ <td><?php echo I18N::translate('Year:'); ?>
<span id="yearform<?php echo $p; ?>" class="field">
<?php echo $tyear; ?>
</span>
</td>
- <td valign="top" width="130">(<?php echo I18N::translate('Age'); ?>
+ <td>(<?php echo I18N::translate('Age'); ?>
<span id="ageform<?php echo $p; ?>" class="field"><?php echo $tage; ?></span>)
</td>
</tr>
generated by cgit v1.3 (git 2.53.0) at 2026-07-01 20:24:11 +0000