diff --git a/client/dashboard.css b/client/dashboard.css index 0158020..14a47e4 100644 --- a/client/dashboard.css +++ b/client/dashboard.css @@ -5,6 +5,13 @@ body { td , caption , th { text-align: center; } +#info { + float: left; +} +#source { + float: right; + text-align: right; +} #lhtable { border: 1px solid black; background-color: PowderBlue; diff --git a/client/index.html b/client/index.html index 54e53e0..e7310c5 100644 --- a/client/index.html +++ b/client/index.html @@ -1,34 +1,39 @@ - - - - - - - - - - Dashboard - - - -

Dashboard

-
-
-
- -
-
- - Dashboard Source - DStarGateway Source - -
-
- + + + + + + + + + + + + + + Dashboard +
+
+ dsgwdashboard Source
+ DStarGateway Source
+
+

Dashboard

+
+
+
+
+ +
+
+ diff --git a/client/script.js b/client/script.js index d0f059d..80238e4 100644 --- a/client/script.js +++ b/client/script.js @@ -8,7 +8,7 @@ socket.addEventListener("info", indata => { // console.log(indata); const data = JSON.parse(indata); $("#instruct").empty(); - $("#instruct").append(""); + $("#instruct").append("
Helpful URLs
"); $("#urltable").append(""); $("#urltable").append(""); $.each(data, function(index,val){ // console.log(index, val); - var mcall = val.mycall; + var mcall = "" + val.mycall + ""; if (val.msg1 != "") mcall += " / " + val.msg1; + var rpt1 = val.rpt1.substring(0,7).trim(); + if (rpt1.substring(0,3) == "REF") rpt1 = "" + val.rpt1 + ""; + var rpt2 = val.rpt2.substring(0,7).trim(); + if (rpt2.substring(0,3) == "REF") rpt2 = "" + val.rpt2 + ""; $("#lhtable").append(""); }) }); diff --git a/dashboard.ini b/dashboard.ini index b960b56..53ecab0 100644 --- a/dashboard.ini +++ b/dashboard.ini @@ -9,7 +9,7 @@ port=443 sponsorname=Greater Kingston Radio Club cosponsorname=Northwest Digital Radio Club sponsor=https://groups.io/g/gkrc -cosponsor= +cosponsor=https://www.qrz.com/db/NW7DR registersite=D-STAR Registration registration=https://regist.dstargateway.org livename_1=IRCDDB Live
Helpful Sites
SponsorLiveUtilities
" + data.sponsorname + "" + @@ -61,10 +61,14 @@ socket.addEventListener("lastheard", data => { $("#lhtable").append("
MYcallURcallRpt1Rpt2SourceDateTime
" + mcall + ""+ val.urcall + - "" + val.rpt1 + "" + val.rpt2 + + "" + rpt1 + "" + rpt2 + "" + val.source + "" + val.date + "" + val.time + "