From b36b315fa57068b9fe5e84a4c4857e1b34ffb3e7 Mon Sep 17 00:00:00 2001 From: Matthew Chambers Date: Thu, 20 May 2021 13:46:14 -0500 Subject: [PATCH] update ack to use image instead of emoji chars for copatiblity --- package.nw/data/acknowledgements.json | 26 +++++++++++++------------- package.nw/lib/gt.js | 8 +++++--- package.nw/lib/roster.js | 4 ++-- package.nw/lib/style.css | 5 +++++ package.nw/lib/style_roster.css | 7 ++++++- 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/package.nw/data/acknowledgements.json b/package.nw/data/acknowledgements.json index c5765f6c..c46dd215 100644 --- a/package.nw/data/acknowledgements.json +++ b/package.nw/data/acknowledgements.json @@ -1,54 +1,54 @@ { "N0TTL": { - "badge": "⭐️", + "badge": "img/emojis/star.png", "message": "Creator of GridTracker" }, "K1JT": { - "badge": "⭐️", + "badge": "img/emojis/star.png", "message": "Creator of FT8 and WSJT-X" }, "N2VFL": { - "badge": "🏆", + "badge": "img/emojis/trophy.png", "message": "GridTracker Developer" }, "NR0Q": { - "badge": "🏆", + "badge": "img/emojis/trophy.png", "message": "GridTracker Developer" }, "KF5QHQ": { - "badge": "🏆", + "badge": "img/emojis/trophy.png", "message": "GridTracker Developer" }, "WA4YA": { - "badge": "🏆", + "badge": "img/emojis/trophy.png", "message": "GridTracker Developer" }, "KI2D": { - "badge": "🥃", + "badge": "img/emojis/flatbread.png", "message": "GridTracker Developer" }, "K5TUX": { - "badge": "🐧", + "badge": "img/emojis/penguin.png", "message": "GridTracker Partner" }, "KA0AZS": { - "badge": "🍕", + "badge": "img/emojis/pizza.png", "message": "GridTracker Tester" }, "G1MIC": { - "badge": "🍕", + "badge": "img/emojis/pizza.png", "message": "GridTracker Tester" }, "KD0YTE": { - "badge": "🍕", + "badge": "img/emojis/pizza.png", "message": "GridTracker Tester" }, "W4IPA": { - "badge": "🍕", + "badge": "img/emojis/tumbler-glass.png", "message": "GridTracker Tester" }, "W5AFK": { - "badge": "🍕", + "badge": "img/emojis/pizza.png", "message": "GridTracker Tester" } } \ No newline at end of file diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index 7bdd10c5..0bcac9fc 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -15621,7 +15621,7 @@ function searchLogForCallsign(call) if (g_acknowledgedCalls[call]) { worker = `

GridTracker would like to acknowledge ${call}: ` + - `${g_acknowledgedCalls[call].badge} ${g_acknowledgedCalls[call].message}

` + ` ${g_acknowledgedCalls[call].message}` } if (list.length > 0) @@ -16069,7 +16069,8 @@ function pskSpotResults(buffer, flag) var call = json.receptionReport[key].receiverCallsign; var mode = json.receptionReport[key].mode; var grid = json.receptionReport[key].receiverLocator.substr(0, 6); - if (grid.length < 4) { + if (grid.length < 4) + { continue; } var band = Number( @@ -16188,7 +16189,8 @@ function createSpot(report, key, fromPoint, addToLayer = true) { var LL = squareToLatLongAll(report.grid); - if (isNaN(LL.la1)) { + if (isNaN(LL.la1)) + { // Bad value in grid, don't map // return; } diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js index d83d2bca..709fc6ce 100644 --- a/package.nw/lib/roster.js +++ b/package.nw/lib/roster.js @@ -1728,8 +1728,8 @@ function viewRoster() var callStr = thisCall.formatCallsign() if (acks[thisCall]) { - callStr = `${callStr} ${acks[thisCall].badge}` - callObj.awardReason += ` - ${acks[thisCall].badge} ${acks[thisCall].message}` + callStr = `${callStr} ` + callObj.awardReason += ` - ${acks[thisCall].message}` } worker += ""; diff --git a/package.nw/lib/style.css b/package.nw/lib/style.css index c92bff47..9311610b 100644 --- a/package.nw/lib/style.css +++ b/package.nw/lib/style.css @@ -713,6 +713,11 @@ a { /* animation: fadeEffect .3s; Fading effect takes 1 second */ } +.lookupAckBadge { + padding: 0; + width: 1em; +} + table.darkTable { border-collapse: collapse; border: 1px solid #888; diff --git a/package.nw/lib/style_roster.css b/package.nw/lib/style_roster.css index 748b8a59..35bfc98f 100644 --- a/package.nw/lib/style_roster.css +++ b/package.nw/lib/style_roster.css @@ -551,5 +551,10 @@ table.rosterTable thead th:first-child { float: right; font-size: 70%; padding-left: 3px; - padding-rright: 3px; + padding-right: 3px; } + +.ackBadge { + padding: 0; + width: 1em; +} \ No newline at end of file