diff --git a/package.nw/gt_roster.html b/package.nw/gt_roster.html index 0372f3d..c0a9d47 100644 --- a/package.nw/gt_roster.html +++ b/package.nw/gt_roster.html @@ -27,25 +27,30 @@
-
-
-
- Waiting… -
- -
Halt Tx
+
+
+ Waiting…
+
Halt Tx
+
+ +
+ + +
+ +
-
+
-
- -
-
- -
-
- -
- + + + + + + + +
-
- - -
-
+ +
+

Awards

+
Add Awards
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Wanted
- - - -
GridITUz
DXCCState
+
+

Wanted

+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
County
WPXCont
+ + +
+ +
+
+ +
+
+ +
+
+
+ +
+
-
- - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
Min dB - - -24
Max DT - - .5
Min freq - - 400
Max freq - - 3500
- Uses LoTW - - - - 3 -
- 		- - - - - - - - - - - - - - - - - - - - - - -
- Not - My DXCC -
- Only My DXCC -
- No    -
- Only -
-
- - - - -
- - -
-
+ +
+

Exceptions

+
+
+ +
+ +
+ +
+ +
+ + + -24 +
+ +
+ + + .5 +
+ +
+ + + 400 +
+ +
+ + + + 3500 +
+ +
+ + + + 3 +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+
- + +
+
diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js index 1049b06..533aeac 100644 --- a/package.nw/lib/roster.js +++ b/package.nw/lib/roster.js @@ -452,11 +452,11 @@ function viewRoster() if (window.opener.g_callsignLookups.lotwUseEnable == true) { - usesLoTWDiv.style.display = "inline-block"; + usesLoTWDiv.style.display = ""; if (g_rosterSettings.usesLoTW == true) { - maxLoTW.style.display = "inline-block"; - maxLoTWView.style.display = "inline-block"; + maxLoTW.style.display = ""; + maxLoTWView.style.display = ""; } else { @@ -472,18 +472,18 @@ function viewRoster() } if (window.opener.g_callsignLookups.eqslUseEnable == true) - { useseQSLDiv.style.display = "block"; } + { useseQSLDiv.style.display = ""; } else useseQSLDiv.style.display = "none"; if (window.opener.g_callsignLookups.oqrsUseEnable == true) - { usesOQRSDiv.style.display = "block"; } + { usesOQRSDiv.style.display = ""; } else usesOQRSDiv.style.display = "none"; if (g_rosterSettings.columns.Spot == true) - { onlySpotDiv.style.display = "block"; } + { onlySpotDiv.style.display = ""; } else onlySpotDiv.style.display = "none"; - if (callMode == "all") allOnlyNewDiv.style.display = "block"; + if (callMode == "all") allOnlyNewDiv.style.display = ""; else allOnlyNewDiv.style.display = "none"; var now = timeNowSec(); @@ -2189,12 +2189,10 @@ function viewRoster() { worker += ""; RosterTable.innerHTML = worker; - callTable.style.width = parseInt(window.innerWidth) - 6 + "px"; } else { RosterTable.innerHTML = worker + "
"; - buttonsDiv.style.width = parseInt(window.innerWidth) - 6 + "px"; } var dirPath = window.opener.g_scriptDir; @@ -2422,7 +2420,7 @@ function updateInstances() ""; } instancesDiv.innerHTML = worker; - instancesDiv.style.display = "block"; + instancesDiv.style.display = ""; } else instancesDiv.style.display = "none"; } @@ -2785,9 +2783,9 @@ function toggleMoreControls() function setVisual() { - HuntNeedControls.style.display = "none"; - HuntStateControls.style.display = "none"; - HuntDXCCsControls.style.display = "none"; + huntNeed.style.display = "none"; + stateSelect.style.display = "none"; + DXCCsSelect.style.display = "none"; if (g_rosterSettings.controls) { @@ -2816,7 +2814,7 @@ function setVisual() g_rosterSettings.columns[t] = true; } */ - HuntingControls.style.display = "none"; + HuntModeControls.style.display = "none"; CallsignsControls.style.display = "none"; AwardTrackerControls.style.display = ""; huntingMatrixDiv.style.display = ""; @@ -2831,19 +2829,20 @@ function setVisual() } AwardTrackerControls.style.display = "none"; - HuntingControls.style.display = ""; + HuntModeControls.style.display = ""; + huntMode.style.display = ""; CallsignsControls.style.display = ""; closeAwardPopup(); if (callsignNeed.value == "all" || callsignNeed.value == "hits") { huntingMatrixDiv.style.display = ""; - HuntNeedControls.style.display = "block"; - HuntModeControls.style.display = "none"; + huntNeed.style.display = ""; + huntMode.style.display = "none"; } else { huntingMatrixDiv.style.display = "none"; - HuntModeControls.style.display = "block"; + huntMode.style.display = ""; if ( huntMode.value != "callsign" && @@ -2851,26 +2850,26 @@ function setVisual() huntMode.value != "dxccs" ) { - HuntNeedControls.style.display = "block"; + huntNeed.style.display = ""; } if (huntMode.value == "usstate") { - HuntStateControls.style.display = "block"; + stateSelect.style.display = ""; } if (huntMode.value == "usstates") { - HuntNeedControls.style.display = "block"; + huntNeed.style.display = ""; } if (huntMode.value == "dxccs") { - HuntDXCCsControls.style.display = "block"; + DXCCsSelect.style.display = ""; } } } if (wantMaxDT.checked == true) { - maxDT.style.display = "block"; - maxDTView.style.display = "block"; + maxDT.style.display = ""; + maxDTView.style.display = ""; } else { @@ -2879,8 +2878,8 @@ function setVisual() } if (wantMinDB.checked == true) { - minDb.style.display = "block"; - minDbView.style.display = "block"; + minDb.style.display = ""; + minDbView.style.display = ""; } else { @@ -2889,8 +2888,8 @@ function setVisual() } if (wantMinFreq.checked == true) { - minFreq.style.display = "block"; - minFreqView.style.display = "block"; + minFreq.style.display = ""; + minFreqView.style.display = ""; } else { @@ -2899,8 +2898,8 @@ function setVisual() } if (wantMaxFreq.checked == true) { - maxFreq.style.display = "block"; - maxFreqView.style.display = "block"; + maxFreq.style.display = ""; + maxFreqView.style.display = ""; } else { @@ -2910,7 +2909,7 @@ function setVisual() if (useRegex.checked == true) { - callsignRegex.style.display = "inline-block"; + callsignRegex.style.display = ""; } else { @@ -2919,11 +2918,11 @@ function setVisual() if (window.opener.g_callsignLookups.lotwUseEnable == true) { - usesLoTWDiv.style.display = "inline-block"; + usesLoTWDiv.style.display = ""; if (g_rosterSettings.usesLoTW == true) { - maxLoTW.style.display = "inline-block"; - maxLoTWView.style.display = "inline-block"; + maxLoTW.style.display = ""; + maxLoTWView.style.display = ""; } else { @@ -2939,19 +2938,19 @@ function setVisual() } if (window.opener.g_callsignLookups.eqslUseEnable == true) - { useseQSLDiv.style.display = "block"; } + { useseQSLDiv.style.display = ""; } else useseQSLDiv.style.display = "none"; if (window.opener.g_callsignLookups.oqrsUseEnable == true) - { usesOQRSDiv.style.display = "block"; } + { usesOQRSDiv.style.display = ""; } else usesOQRSDiv.style.display = "none"; if (g_rosterSettings.columns.Spot == true) - { onlySpotDiv.style.display = "block"; } + { onlySpotDiv.style.display = ""; } else onlySpotDiv.style.display = "none"; if (g_rosterSettings.callsign == "all" || g_rosterSettings.callsign == "hits") - { allOnlyNewDiv.style.display = "block"; } + { allOnlyNewDiv.style.display = ""; } else allOnlyNewDiv.style.display = "none"; resize(); diff --git a/package.nw/lib/style_roster.css b/package.nw/lib/style_roster.css index b820a94..6ab51d1 100644 --- a/package.nw/lib/style_roster.css +++ b/package.nw/lib/style_roster.css @@ -120,23 +120,108 @@ body.roster { flex: 1; } -#MainRosterControls { - display: flex; - flex-direction: row; - flex-wrap: wrap; - margin: 2px; - justify-content: space-evenly; - align-items: center; +#RosterControls { + display: grid; } -#MainRosterControls > div { +#RosterControls.hidden { + display: none; +} + +#RosterControls.normal { + grid-template-columns: 200px 1fr 100px; + grid-template-rows: auto; + grid-template-areas: " txrx controls toggle "; +} + +#RosterControls.extended { + grid-template-columns: 300px 1fr; + grid-template-rows: auto; + grid-template-areas: + " txrx toggle " + " controls more-controls "; +} + +@media (max-width: 880px) { + #RosterControls.extended { + grid-template-areas: + " txrx toggle " + " controls . " + " more-controls more-controls "; + } +} + +#TransmitControls { + grid-area: txrx; + margin-left: 5px; + margin-bottom: 5px; display: flex; flex-direction: row; align-items: center; + justify-content: flex-start; +} + +#MoreLessControls { + grid-area: toggle; + text-align: right; + margin-right: 5px; + margin-bottom: 5px; + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-end; +} +#RosterControls.normal #ShowFewerControlsLink { + display: none; +} +#RosterControls.normal #ShowMoreControlsLink { + display: block; +} + +#MainRosterControls { + grid-area: controls; + +} +#SecondaryRosterControls { + grid-area: more-controls; +} +#RosterControls.normal #SecondaryRosterControls { + display: none; +} + +#RosterControls.normal #MainRosterControls { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-evenly; } #MainRosterControls label { margin-right: 4px; + margin-left: 8px; +} + +#RosterControls.extended #MainRosterControls { + display: flex; + flex-direction: column; + align-items: flex-end; + justify-content: flex-start; +} + +#RosterControls.extended #MainRosterControls > div { + margin-bottom: 4px; +} + +#RosterControls.extended #MainRosterControls select { + min-width: 200px; +} + +#RosterControls.extended #HuntModeControls { + display: flex; + flex-direction: row; + align-items: center; + flex-wrap: wrap; + justify-content: flex-end; } #AwardWantedList { @@ -145,22 +230,22 @@ body.roster { max-height: 142px; } -#RosterControls { - display: block; +@media (max-width: 1050px) { + #RosterControls.normal #HuntModeControls { + display: none !important; + } } -#RosterControls.hidden { - display: none; +@media (max-width: 780px) { + #RosterControls.normal #CallsignsControls { + display: none; + } } -#RosterControls.normal #ShowFewerControlsLink { - display: none; -} -#RosterControls.normal #ShowMoreControlsLink { - display: block; -} -#RosterControls.normal #SecondaryRosterControls { - display: none; +@media (max-width: 600px) { + #RosterControls.normal #LogbookControls { + display: none; + } } #RosterControls.extended #ShowFewerControlsLink { @@ -170,9 +255,91 @@ body.roster { display: none; } #RosterControls.extended #SecondaryRosterControls { - display: block; + display: flex; + flex-direction: row; + align-items: flex-start; + justify-content: flex-start; + margin-right: 8px; + margin-bottom: 4px; } +@media (max-width: 650px) { + #RosterControls.extended #SecondaryRosterControls { + flex-direction: column; + align-items: stretch; + } +} + +.secondaryControlGroup { + flex: 1; + margin-left: 8px; + padding: 6px; + border-width: 1px; + border-color: #aaa; + border-style: inset; + border-radius: 4px; +} + +#huntingMatrixDiv { + flex: 0.7; +} + +#exceptionDiv { + flex: 1.3; +} + +.secondaryControlGroup h3 { + text-align: left; + font-size: 13px; + margin: 2px; + padding: 0; +} + +.secondaryControlGroup .columns { + column-count: 2; + /* max-height: 160px; + display: flex; + flex-direction: column; + flex-wrap: wrap; + justify-content: flex-start; + align-items: stretch; */ +} + +@media (min-width: 1100px) { + .secondaryControlGroup .columns { + column-count: 3; + } +} + +@media (min-width: 1400px) { + .secondaryControlGroup .columns { + column-count: 4; + } +} + +.secondaryControlGroup .columns > div { + text-align: left; + margin-bottom: 2px; +} + +.secondaryControlGroup input.slider { + display: inline-block; + width: 75px; +} + +.secondaryControlGroup input.inputTextValue { + background-color: green; + color: yellow; + padding: 2px; +} + +.secondaryControlGroup .roundBorderValue { + padding: 2px; +} + +#RosterTable > table { + width: 100%; +} /* == Other Elements ====================================== */ #txrxdec { @@ -189,22 +356,6 @@ body.roster { text-decoration: underline; } -.controlItem { - appearance: none; - margin: 0; - padding: 0; - padding-top: 1px; - margin-top: 1px; - margin-bottom: 1px; - border-width: 1px; - border-color: #aaa; - border-style: inset; - border-radius: 4px; - display: inline-block; - transition: border-color; - vertical-align: top; -} - table.awardTableCSS { border-collapse: collapse; border: 0px solid #888;