summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin_media_upload.php2
-rw-r--r--admin_trees_config.php1
-rw-r--r--app/Date.php2
-rw-r--r--app/Functions/FunctionsPrintLists.php12
-rw-r--r--app/GedcomRecord.php2
-rw-r--r--app/Module/ClippingsCartModule.php3
-rw-r--r--app/Module/GoogleMapsModule.php14
-rw-r--r--app/Module/RelativesTabModule.php2
-rw-r--r--app/Stats.php18
-rw-r--r--calendar.php2
-rw-r--r--find.php16
-rw-r--r--index.php4
-rw-r--r--placelist.php2
-rw-r--r--setup.php3
-rw-r--r--timeline.php2
15 files changed, 38 insertions, 47 deletions
diff --git a/admin_media_upload.php b/admin_media_upload.php
index c5814db34e..86203786d4 100644
--- a/admin_media_upload.php
+++ b/admin_media_upload.php
@@ -197,7 +197,7 @@ echo '<input type="hidden" name="action" value="upload">';
// Print 5 forms for uploading images
for ($i = 1; $i < 6; $i++) {
echo '<table class="upload_media">';
- echo '<tr><th>', I18N::translate('Media file'), ':&nbsp;&nbsp;', $i, '</th></tr>';
+ echo '<tr><th>', I18N::translate('Media file'), ' ', $i, '</th></tr>';
echo '<tr><td>';
echo I18N::translate('Media file to upload');
echo '</td>';
diff --git a/admin_trees_config.php b/admin_trees_config.php
index 48bd1f281a..08644bebe0 100644
--- a/admin_trees_config.php
+++ b/admin_trees_config.php
@@ -516,7 +516,6 @@ $controller
<?php echo FunctionsEdit::selectEditControl('resn[]', $PRIVACY_CONSTANTS, null, 'privacy', null); ?>
</td>
<td>
- &nbsp;
</td>
</tr>
</script>
diff --git a/app/Date.php b/app/Date.php
index 8f1255ee21..b49fc0a893 100644
--- a/app/Date.php
+++ b/app/Date.php
@@ -468,7 +468,7 @@ class Date {
return I18N::number($d1->minimumDate()->getAge(false, $jd));
}
} else {
- return '&nbsp;';
+ return '';
}
default:
throw new \InvalidArgumentException('format: ' . $format);
diff --git a/app/Functions/FunctionsPrintLists.php b/app/Functions/FunctionsPrintLists.php
index 804ea795b3..d63a097d82 100644
--- a/app/Functions/FunctionsPrintLists.php
+++ b/app/Functions/FunctionsPrintLists.php
@@ -145,7 +145,7 @@ class FunctionsPrintLists {
}
$html = '
- <div class="loading-image">&nbsp;</div>
+ <div class="loading-image"></div>
<div class="indi-list">
<table id="' . $table_id . '">
<thead>
@@ -610,7 +610,7 @@ class FunctionsPrintLists {
}
$html = '
- <div class="loading-image">&nbsp;</div>
+ <div class="loading-image"></div>
<div class="fam-list">
<table id="' . $table_id . '">
<thead>
@@ -1072,7 +1072,7 @@ class FunctionsPrintLists {
');
//--table wrapper
- $html .= '<div class="loading-image">&nbsp;</div>';
+ $html .= '<div class="loading-image"></div>';
$html .= '<div class="source-list">';
//-- table header
$html .= '<table id="' . $table_id . '"><thead><tr>';
@@ -1212,7 +1212,7 @@ class FunctionsPrintLists {
');
//--table wrapper
- $html .= '<div class="loading-image">&nbsp;</div>';
+ $html .= '<div class="loading-image"></div>';
$html .= '<div class="note-list">';
//-- table header
$html .= '<table id="' . $table_id . '"><thead><tr>';
@@ -1328,7 +1328,7 @@ class FunctionsPrintLists {
');
//--table wrapper
- $html .= '<div class="loading-image">&nbsp;</div>';
+ $html .= '<div class="loading-image"></div>';
$html .= '<div class="repo-list">';
//-- table header
$html .= '<table id="' . $table_id . '"><thead><tr>';
@@ -1439,7 +1439,7 @@ class FunctionsPrintLists {
');
//--table wrapper
- $html .= '<div class="loading-image">&nbsp;</div>';
+ $html .= '<div class="loading-image"></div>';
$html .= '<div class="media-list">';
//-- table header
$html .= '<table id="' . $table_id . '"><thead><tr>';
diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php
index 46f70bf531..d64db08b56 100644
--- a/app/GedcomRecord.php
+++ b/app/GedcomRecord.php
@@ -1137,7 +1137,7 @@ class GedcomRecord {
if ($sorting) {
return '0';
} else {
- return '&nbsp;';
+ return '';
}
}
}
diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php
index cef4c96df1..d5e8303f73 100644
--- a/app/Module/ClippingsCartModule.php
+++ b/app/Module/ClippingsCartModule.php
@@ -198,7 +198,6 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
?>
</label>
<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<?php echo I18N::translate('Number of generations'); ?>
<input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
</td>
@@ -216,7 +215,6 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
?>
</label>
<br >
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<?php echo I18N::translate('Number of generations'); ?>
<input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
</td>
@@ -234,7 +232,6 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
?>
</label>
<br >
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<?php echo I18N::translate('Number of generations'); ?>
<input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
</td>
diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php
index a215cc177d..2359ac35cc 100644
--- a/app/Module/GoogleMapsModule.php
+++ b/app/Module/GoogleMapsModule.php
@@ -3935,9 +3935,9 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
<td class="optionbox"><input type="text" id="new_pl_name" name="NEW_PLACE_NAME" value="<?php echo Filter::escapeHtml($place_name) ?>" size="25" class="address_input">
<div id="INDI_PLAC_pop" style="display: inline;">
<?php echo FunctionsPrint::printSpecialCharacterLink('new_pl_name') ?></div></td><td class="optionbox">
- <label for="new_pl_name"><a href="#" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false">&nbsp;<?php echo I18N::translate('Search globally') ?></a></label>
- &nbsp;&nbsp;|&nbsp;&nbsp;
- <label for="new_pl_name"><a href="#" onclick="showLocation_level(document.getElementById('new_pl_name').value); return false">&nbsp;<?php echo I18N::translate('Search locally') ?></a></label>
+ <label for="new_pl_name"><a href="#" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false"><?php echo I18N::translate('Search globally') ?></a></label>
+ |
+ <label for="new_pl_name"><a href="#" onclick="showLocation_level(document.getElementById('new_pl_name').value); return false"><?php echo I18N::translate('Search locally') ?></a></label>
</td>
</tr>
<tr>
@@ -4019,11 +4019,11 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
<td class="optionbox" colspan="2">
<div id="flagsDiv">
<?php if ($place_icon) { ?>
- <img alt="<?php echo /* I18N: The emblem of a country or region */ I18N::translate('Flag') ?>" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place_icon ?>">&nbsp;&nbsp;
- <a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag') ?></a>&nbsp;&nbsp;
- <a href="#" onclick="remove_icon();return false;"><?php echo I18N::translate('Remove flag') ?></a>
+ <img alt="<?php echo /* I18N: The emblem of a country or region */ I18N::translate('Flag') ?>" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place_icon ?>">
+ <a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag') ?></a>
+ <a href="#" onclick="remove_icon();return false;"><?php echo I18N::translate('Remove flag') ?></a>
<?php } else { ?>
- <a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag') ?></a>
+ <a href="#" onclick="change_icon();return false;"><?php echo I18N::translate('Change flag') ?></a>
<?php } ?>
</div>
<p class="small text-muted">
diff --git a/app/Module/RelativesTabModule.php b/app/Module/RelativesTabModule.php
index 7f3b1f197b..cd17ea60fa 100644
--- a/app/Module/RelativesTabModule.php
+++ b/app/Module/RelativesTabModule.php
@@ -205,7 +205,6 @@ class RelativesTabModule extends AbstractModule implements ModuleTabInterface {
?>
<tr>
<td class="facts_label">
- &nbsp;
</td>
<td class="facts_value<?php echo $class; ?>">
<?php echo GedcomTag::getLabelValue($fact->getTag(), $fact->getDate()->display() . ' — ' . $fact->getPlace()->getFullName()); ?>
@@ -221,7 +220,6 @@ class RelativesTabModule extends AbstractModule implements ModuleTabInterface {
?>
<tr>
<td class="facts_label">
- &nbsp;
</td>
<td class="facts_value">
<a href="#" onclick="return add_new_record('<?php echo $family->getXref(); ?>', 'MARR');">
diff --git a/app/Stats.php b/app/Stats.php
index 2d9b4d0e00..acf73b19c6 100644
--- a/app/Stats.php
+++ b/app/Stats.php
@@ -1740,9 +1740,9 @@ class Stats {
$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 .= '<table class="center"><tr>';
- $chart .= '<td bgcolor="#' . $WT_STATS_CHART_COLOR2 . '" width="12"></td><td>' . I18N::translate('Highest population') . '&nbsp;&nbsp;</td>';
- $chart .= '<td bgcolor="#' . $WT_STATS_CHART_COLOR3 . '" width="12"></td><td>' . I18N::translate('Lowest population') . '&nbsp;&nbsp;</td>';
- $chart .= '<td bgcolor="#' . $WT_STATS_CHART_COLOR1 . '" width="12"></td><td>' . I18N::translate('Nobody at all') . '&nbsp;&nbsp;</td>';
+ $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>';
+ $chart .= '<td bgcolor="#' . $WT_STATS_CHART_COLOR1 . '" width="12"></td><td>' . I18N::translate('Nobody at all') . '</td>';
$chart .= '</tr></table></div></div>';
return $chart;
@@ -2432,7 +2432,7 @@ class Stats {
if ($type === 'list') {
$top10 = implode('', $top10);
} else {
- $top10 = implode(';&nbsp; ', $top10);
+ $top10 = implode('; ', $top10);
}
if (I18N::direction() === 'rtl') {
$top10 = str_replace(array('[', ']', '(', ')', '+'), array('&rlm;[', '&rlm;]', '&rlm;(', '&rlm;)', '&rlm;+'), $top10);
@@ -3276,7 +3276,7 @@ class Stats {
if ($type === 'list') {
$top10 = implode('', $top10);
} else {
- $top10 = implode(';&nbsp; ', $top10);
+ $top10 = implode('; ', $top10);
}
if (I18N::direction() === 'rtl') {
$top10 = str_replace(array('[', ']', '(', ')', '+'), array('&rlm;[', '&rlm;]', '&rlm;(', '&rlm;)', '&rlm;+'), $top10);
@@ -4468,7 +4468,7 @@ class Stats {
if ($type === 'list') {
$top10 = implode('', $top10);
} else {
- $top10 = implode(';&nbsp; ', $top10);
+ $top10 = implode('; ', $top10);
}
if (I18N::direction() === 'rtl') {
$top10 = str_replace(array('[', ']', '(', ')', '+'), array('&rlm;[', '&rlm;]', '&rlm;(', '&rlm;)', '&rlm;+'), $top10);
@@ -5106,7 +5106,7 @@ class Stats {
if ($type == 'list') {
$top10 = implode('', $top10);
} else {
- $top10 = implode(';&nbsp; ', $top10);
+ $top10 = implode('; ', $top10);
}
if (I18N::direction() === 'rtl') {
$top10 = str_replace(array('[', ']', '(', ')', '+'), array('&rlm;[', '&rlm;]', '&rlm;(', '&rlm;)', '&rlm;+'), $top10);
@@ -5269,7 +5269,7 @@ class Stats {
if ($type === 'list') {
$top10 = implode('', $top10);
} else {
- $top10 = implode(';&nbsp; ', $top10);
+ $top10 = implode('; ', $top10);
}
if (I18N::direction() === 'rtl') {
$top10 = str_replace(array('[', ']', '(', ')', '+'), array('&rlm;[', '&rlm;]', '&rlm;(', '&rlm;)', '&rlm;+'), $top10);
@@ -5582,7 +5582,7 @@ class Stats {
break;
}
if ($show_tot) {
- $tot = '&nbsp;(' . I18N::number($total) . ')';
+ $tot = ' (' . I18N::number($total) . ')';
} else {
$tot = '';
}
diff --git a/calendar.php b/calendar.php
index 42e69cc21b..b9da58af68 100644
--- a/calendar.php
+++ b/calendar.php
@@ -493,8 +493,6 @@ case 'month':
echo calendar_list_text($cal_facts[0], '', '', false);
echo '</div>';
$cal_facts[0] = array();
- } else {
- echo '&nbsp;';
}
} else {
// Format the day number using the calendar
diff --git a/find.php b/find.php
index a8268e9c62..395bc750db 100644
--- a/find.php
+++ b/find.php
@@ -120,7 +120,7 @@ if ($type == "indi") {
<input type="hidden" name="callback" value="' . $callback . '">
<input type="hidden" name="action" value="filter">
<input type="hidden" name="type" value="indi">
- <span>', /* I18N: Label for search field */ I18N::translate('Name contains'), '&nbsp;</span>
+ <span>', /* I18N: Label for search field */ I18N::translate('Name contains'), '</span>
<input type="text" name="filter" value="';
if ($filter) {
echo $filter;
@@ -137,7 +137,7 @@ if ($type == "fam") {
<input type="hidden" name="callback" value="' . $callback . '">
<input type="hidden" name="action" value="filter">
<input type="hidden" name="type" value="fam">
- <span>', I18N::translate('Name contains'), '&nbsp;</span>
+ <span>', I18N::translate('Name contains'), '</span>
<input type="text" name="filter" value="';
if ($filter) {
echo $filter;
@@ -163,7 +163,7 @@ if ($type == 'media') {
}
echo '" autofocus>',
'<p class="small text-muted">', I18N::translate('Simple search filter based on the characters entered, no wildcards are accepted.'), '</p>',
- '<p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">&nbsp;
+ '<p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">
<input type="submit" name="all" value="', I18N::translate('Display all'), '" onclick="this.form.subclick.value=this.name">
</p></form></div>';
}
@@ -182,7 +182,7 @@ if ($type == "place") {
echo $filter;
}
echo '" autofocus>
- <p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">&nbsp;
+ <p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">
<input type="submit" name="all" value="', I18N::translate('Display all'), '" onclick="this.form.subclick.value=this.name">
</p></form></div>';
}
@@ -201,7 +201,7 @@ if ($type == "repo") {
echo $filter;
}
echo '" autofocus>
- <p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">&nbsp;
+ <p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">
<input type="submit" name="all" value="', I18N::translate('Display all'), '" onclick="this.form.subclick.value=this.name">
</td></tr></table>
</p></form></div>';
@@ -221,7 +221,7 @@ if ($type == "note") {
echo $filter;
}
echo '" autofocus>
- <p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">&nbsp;
+ <p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">
<input type="submit" name="all" value="', I18N::translate('Display all'), '" onclick="this.form.subclick.value=this.name">
</p></form></div>';
}
@@ -240,7 +240,7 @@ if ($type == "source") {
echo $filter;
}
echo '" autofocus>
- <p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">&nbsp;
+ <p><input type="submit" name="search" value="', I18N::translate('Filter'), '" onclick="this.form.subclick.value=this.name">
<input type="submit" name="all" value="', I18N::translate('Display all'), '" onclick="this.form.subclick.value=this.name">
</p></form></div>';
}
@@ -571,7 +571,7 @@ if ($action == "filter") {
echo '</a></li>';
}
echo '</ul>
- <p>', I18N::translate('Places found'), '&nbsp;', count($places), '</p>';
+ <p>', I18N::translate('Places found'), ' ', count($places), '</p>';
} else {
echo '<p>', I18N::translate('No results found.'), '</p>';
}
diff --git a/index.php b/index.php
index 4f82a84489..8d4aed9324 100644
--- a/index.php
+++ b/index.php
@@ -110,7 +110,7 @@ if ($blocks['main']) {
echo $active_blocks[$module_name]->getBlock($block_id);
} else {
// Load the block asynchronously
- echo '<div id="block_', $block_id, '"><div class="loading-image">&nbsp;</div></div>';
+ echo '<div id="block_', $block_id, '"><div class="loading-image"></div></div>';
$controller->addInlineJavascript(
'jQuery("#block_' . $block_id . '").load("index.php?ctype=' . $ctype . '&action=ajax&block_id=' . $block_id . '");'
);
@@ -132,7 +132,7 @@ if ($blocks['side']) {
echo $active_blocks[$module_name]->getBlock($block_id);
} else {
// Load the block asynchronously
- echo '<div id="block_', $block_id, '"><div class="loading-image">&nbsp;</div></div>';
+ echo '<div id="block_', $block_id, '"><div class="loading-image"></div></div>';
$controller->addInlineJavascript(
'jQuery("#block_' . $block_id . '").load("index.php?ctype=' . $ctype . '&action=ajax&block_id=' . $block_id . '");'
);
diff --git a/placelist.php b/placelist.php
index 38fe6c2f1e..2eba80f08a 100644
--- a/placelist.php
+++ b/placelist.php
@@ -216,7 +216,7 @@ case 'hierarchy':
->addInlineJavascript('jQuery("#places-tabs").css("visibility", "visible");')
->addInlineJavascript('jQuery(".loading-image").css("display", "none");');
- echo '<div class="loading-image">&nbsp;</div>';
+ echo '<div class="loading-image"></div>';
echo '<div id="places-tabs"><ul>';
if ($myindilist) {
echo '<li><a href="#places-indi"><span id="indisource">', I18N::translate('Individuals'), '</span></a></li>';
diff --git a/setup.php b/setup.php
index eea8b10f0e..a1614db3ae 100644
--- a/setup.php
+++ b/setup.php
@@ -436,8 +436,7 @@ if (empty($_POST['wtname']) || empty($_POST['wtuser']) || strlen($_POST['wtpass'
I18N::translate('Password'), '</td><td>',
'<input type="password" name="wtpass" value="', Filter::escapeHtml($_POST['wtpass']), '"></td><td>',
I18N::translate('This must be at least six characters long. It is case-sensitive.'),
- '</td></tr><tr><td>',
- '&nbsp;', '</td><td>',
+ '</td></tr><tr><td></td><td>',
'<input type="password" name="wtpass2" value="', Filter::escapeHtml($_POST['wtpass2']), '"></td><td>',
I18N::translate('Type your password again, to make sure you have typed it correctly.'),
'</td></tr><tr><td>',
diff --git a/timeline.php b/timeline.php
index b6157557f1..8c28993a27 100644
--- a/timeline.php
+++ b/timeline.php
@@ -266,7 +266,7 @@ document.onmouseup = function () {
if ($indi && $indi->canShow()) {
echo $indi->getSexImage('large');
?>
- <a href="<?php echo $indi->getHtmlUrl(); ?>">&nbsp;<?php echo $indi->getFullName(); ?><br>
+ <a href="<?php echo $indi->getHtmlUrl(); ?>"> <?php echo $indi->getFullName(); ?><br>
<?php echo $indi->getAddName(); ?><br>
</a>
<input type="hidden" name="pids[<?php echo $p; ?>]" value="<?php echo Filter::escapeHtml($pid); ?>">
generated by cgit v1.3 (git 2.53.0) at 2026-07-07 10:49:11 +0000