Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ajust gps aligment of Status and Quality #3581

Merged
merged 2 commits into from Sep 20, 2023
+14 −9
Merged

Ajust gps aligment of Status and Quality #3581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d42679
Step 1
HThuren Sep 16, 2023
04357de
New aligment
HThuren Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions locales/en/messages.json
View file
Open in desktop
Expand Up @@ -2804,8 +2804,11 @@
"gpsSignalSatId": {
"message": "Sat ID"
},
"gpsSignalStatusQly": {
"message": "Status     |  Quality"
"gpsSignalStatus": {
"message": "Status"
},
"gpsSignalQuality": {
"message": "Quality"
},
"gnssQualityNoSignal": {
"message": "no signal"
Expand All @@ -2829,7 +2832,7 @@
"message": "unused"
},
"gnssUsedUsed": {
"message": "USED "
"message": "USED"
},
"gnssHealthyUnknown": {
"message": "unknown"
Expand Down
14 changes: 8 additions & 6 deletions src/js/tabs/gps.js
View file
Open in desktop
Expand Up @@ -211,10 +211,11 @@ gps.initialize = async function (callback) {
eSsTable.html('');
eSsTable.append(`
<tr class="titles">
<td style="width: 12%;" i18n="gpsSignalGnssId">${i18n.getMessage('gpsSignalGnssId')}</td>
<td style="width: 10%;" i18n="gpsSignalSatId">${i18n.getMessage('gpsSignalSatId')}</td>
<td style="width: 25%;" i18n="gpsSignalStr">${i18n.getMessage('gpsSignalStr')}</td>
<td style="width: 53%;" i18n="gpsSignalStatusQly">${i18n.getMessage('gpsSignalStatusQly')}</td>
<td style="text-align: left; width: 12%;" i18n="gpsSignalGnssId">${i18n.getMessage('gpsSignalGnssId')}</td>
<td style="text-align: center;width: 10%;" i18n="gpsSignalSatId">${i18n.getMessage('gpsSignalSatId')}</td>
<td style="text-align: center;width: 25%;" i18n="gpsSignalStr">${i18n.getMessage('gpsSignalStr')}</td>
<td style="text-align: left; width: 17%;" i18n="gpsSignalStatus">${i18n.getMessage('gpsSignalStatus')}</td>
<td style="text-align: left; width: 33%;" i18n="gpsSignalQuality">${i18n.getMessage('gpsSignalQuality')}</td>
</tr>
`);

Expand Down Expand Up @@ -281,12 +282,13 @@ gps.initialize = async function (callback) {

// 1st column: unused = red, used = green
if (used.startsWith(i18n.getMessage('gnssUsedUsed'))) {
used = `<span class="colorToggle ready">&nbsp${used}&nbsp</span>`;
used = `<span class="colorToggle ready">${used}</span>`;
} else {
used = `<span class="colorToggle ${usedColor}">${used}</span>`;
}

rowContent += `<td>${used} | ${quality}</td>`;
rowContent += `<td style="text-align: left; width: 17%;">${used}</td>
<td style="text-align: left; width: 33%;">${quality}</td>`;
}
eSsTable.append(`<tr>${rowContent}</tr>`);
}
Expand Down