Merge branch 'chrbayer84.oqrs-request-qsl-from-unconfirmed' into 'master'

new icon to directly request Clublog OQRS QSL for unconfirmed station

See merge request gridtracker.org/gridtracker!86
merge-requests/88/merge
Matthew Chambers 2021-04-03 16:56:48 +00:00
commit 7582f12d25
2 zmienionych plików z 17 dodań i 6 usunięć

Wyświetl plik

@ -2,7 +2,8 @@
# Build a docker environment and run it to do the build
docker build -t gridtracker-build docker
test -d ../gridtracker-dist || mkdir ../gridtracker-dist
docker run --rm \
#docker run --rm \
docker run \
-v `/bin/pwd`:/build/gridtracker \
-v `/bin/pwd`/../gridtracker-dist:/build/dist \
gridtracker-build $*

Wyświetl plik

@ -2337,10 +2337,19 @@ function createTooltTipTableLogbook(toolElement)
}
if (g_callsignLookups.oqrsUseEnable == true)
{
worker +=
"<td align='center'>" +
(callsign.DEcall in g_oqrsCallsigns ? "&#10004;" : "") +
"</td>";
if (callsign.DEcall in g_oqrsCallsigns)
{
worker +=
"<td align='center' " +
"onClick='window.opener.openSite(\"https://clublog.org/logsearch/logsearch.php?log=" +
callsign.DEcall + "&call=" + callsign.DXcall + "&SubmitLogSearch=Show+contacts\");'>" +
"&#10004;&#128236;</td>";
}
else
{
worker +=
"<td align='center'></td>";
}
}
worker += "</tr>";
}
@ -14437,7 +14446,8 @@ function continueWithLookup(callsign, gridPass)
"Looking up <font color='cyan'>" + callsign + "</font>, please wait..."
);
if (g_appSettings.lookupCallookPreferred) {
if (g_appSettings.lookupCallookPreferred)
{
var dxcc = callsignToDxcc(callsign);
var where;
var ccode = 0;