summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-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
7 files changed, 24 insertions, 29 deletions
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 ' ';
+ 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 = '';
}