-
-
-
-
+
+
-
- waiting for message
-
- |
- ||
- | - -||
Logbook | -- - | -|
Callsigns | -- - | -|
Hunting | -
-
-
-
-
-
-
-
-
- |
- |
- - | -
+
+
+
+
+
+
-
+
+
+ Waiting…
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ More Controls
+ Fewer Controls
+
+
";
- rosterTable.innerHTML = worker;
+ RosterTable.innerHTML = worker;
callTable.style.width = parseInt(window.innerWidth) - 6 + "px";
} else {
- rosterTable.innerHTML = worker + "";
+ RosterTable.innerHTML = worker + "
";
buttonsDiv.style.width = parseInt(window.innerWidth) - 6 + "px";
}
@@ -2194,7 +2194,7 @@ function updateAwardList(target = null) {
worker += "";
- awardWantedDiv.innerHTML = worker;
+ AwardWantedList.innerHTML = worker;
var keys = Object.keys(g_awardTracker).sort();
@@ -2378,11 +2378,26 @@ function closeAwardPopup() {
resetAwardAdd();
}
-function setVisual() {
- huntNeedTd.style.display = "none";
- huntStateTd.style.display = "none";
- huntDXCCsTd.style.display = "none";
+function toggleMoreControls() {
+ g_rosterSettings.controls = !g_rosterSettings.controls;
+ if (g_rosterSettings.controls) {
+ RosterControls.className = "extended"
+ } else {
+ RosterControls.className = "normal"
+ }
+}
+
+function setVisual() {
+ HuntNeedControls.style.display = "none";
+ HuntStateControls.style.display = "none";
+ HuntDXCCsControls.style.display = "none";
+
+ if (g_rosterSettings.controls) {
+ RosterControls.className = "extended"
+ } else {
+ RosterControls.className = "normal"
+ }
// Award Hunter
if (referenceNeed.value == 6) {
/*for ( key in g_rosterSettings.wanted )
@@ -2393,10 +2408,9 @@ function setVisual() {
g_rosterSettings.columns[t] = true;
}*/
- huntingTr.style.display = "none";
- callsignsTr.style.display = "none";
- awardHunterTr.style.display = "";
- awardWantedDiv.style.display = "";
+ HuntingControls.style.display = "none";
+ CallsignsControls.style.display = "none";
+ AwardTrackerControls.style.display = "";
huntingMatrixDiv.style.display = "";
updateAwardList();
} else {
@@ -2405,34 +2419,33 @@ function setVisual() {
document.getElementById(key).checked = g_rosterSettings.wanted[key];
}
- awardHunterTr.style.display = "none";
- awardWantedDiv.style.display = "none";
- huntingTr.style.display = "";
- callsignsTr.style.display = "";
+ AwardTrackerControls.style.display = "none";
+ HuntingControls.style.display = "";
+ CallsignsControls.style.display = "";
closeAwardPopup();
if (callsignNeed.value == "all" || callsignNeed.value == "hits") {
huntingMatrixDiv.style.display = "";
- huntNeedTd.style.display = "block";
- huntModeTd.style.display = "none";
+ HuntNeedControls.style.display = "block";
+ HuntModeControls.style.display = "none";
} else {
huntingMatrixDiv.style.display = "none";
- huntModeTd.style.display = "block";
+ HuntModeControls.style.display = "block";
if (
huntMode.value != "callsign" &&
huntMode.value != "usstate" &&
huntMode.value != "dxccs"
) {
- huntNeedTd.style.display = "block";
+ HuntNeedControls.style.display = "block";
}
if (huntMode.value == "usstate") {
- huntStateTd.style.display = "block";
+ HuntStateControls.style.display = "block";
}
if (huntMode.value == "usstates") {
- huntNeedTd.style.display = "block";
+ HuntNeedControls.style.display = "block";
}
if (huntMode.value == "dxccs") {
- huntDXCCsTd.style.display = "block";
+ HuntDXCCsControls.style.display = "block";
}
}
}
@@ -2876,12 +2889,6 @@ function checkForEnter(ele) {
}
function resize() {
- rosterTable.style.height = window.innerHeight - (rosterHead.clientHeight + 8);
- awardWantedDiv.style.height = exceptionDiv.clientHeight;
-
- if (typeof callTable != "undefined")
- callTable.style.width = parseInt(window.innerWidth) - 6 + "px";
-
if (editView.style.display == "inline-block") openIgnoreEdit();
window.opener.goProcessRoster();
@@ -2923,51 +2930,6 @@ function init() {
g_menu = new nw.Menu();
g_compactMenu = new nw.Menu();
- // Bind a callback to item
- var item = new nw.MenuItem({
- type: "normal",
- label: g_rosterSettings.controls ? "Hide Controls" : "Show Controls",
- click: function () {
- if (this.label == "Hide Controls") {
- this.label = "Show Controls";
- rosterHead.style.display = "none";
- g_rosterSettings.controls = false;
- } else {
- this.label = "Hide Controls";
- rosterHead.style.display = "block";
- g_rosterSettings.controls = true;
- }
- g_compactMenu.items[0].label = g_rosterSettings.controls
- ? "Hide Controls"
- : "Show Controls";
- localStorage.rosterSettings = JSON.stringify(g_rosterSettings);
- resize();
- },
- });
- g_menu.append(item);
-
- item = new nw.MenuItem({
- type: "normal",
- label: g_rosterSettings.controls ? "Hide Controls" : "Show Controls",
- click: function () {
- if (this.label == "Hide Controls") {
- this.label = "Show Controls";
- rosterHead.style.display = "none";
- g_rosterSettings.controls = false;
- } else {
- this.label = "Hide Controls";
- rosterHead.style.display = "block";
- g_rosterSettings.controls = true;
- }
- g_menu.items[0].label = g_rosterSettings.controls
- ? "Hide Controls"
- : "Show Controls";
- localStorage.rosterSettings = JSON.stringify(g_rosterSettings);
- resize();
- },
- });
- g_compactMenu.append(item);
-
item = new nw.MenuItem({
type: "normal",
label: "Compact Mode",
@@ -2990,8 +2952,6 @@ function init() {
});
g_compactMenu.append(item);
- rosterHead.style.display = g_rosterSettings.controls ? "block" : "none";
-
g_callMenu = new nw.Menu();
item = new nw.MenuItem({
diff --git a/package.nw/lib/style_roster.css b/package.nw/lib/style_roster.css
index b8d60f16..a7339c70 100644
--- a/package.nw/lib/style_roster.css
+++ b/package.nw/lib/style_roster.css
@@ -1,3 +1,4 @@
+/* == General Elements ==================================== */
table,
th,
td {
@@ -27,7 +28,6 @@ td {
}
input[type="checkbox"] {
- -webkit-appearance: checkbox !important;
appearance: checkbox !important;
margin: 0;
margin-right: 1px;
@@ -36,14 +36,13 @@ input[type="checkbox"] {
top: 0px;
}
-input[type="checkbox"]:checked {
- // -webkit-appearance: checkbox !important;
- // appearance: checkbox !important;
-}
+/* input[type="checkbox"]:checked {
+ appearance: checkbox !important;
+} */
select {
- -webkit-appearance: none;
- -webkit-border-radius: 6px;
+ appearance: none;
+ border-radius: 6px;
text-indent: 0.2px;
text-overflow: "";
padding: 2px;
@@ -72,10 +71,7 @@ select option {
background: #000;
color: #eee;
text-shadow: 0 2px 0 rgba(0, 0, 0, 0.4);
- -moz-appearance: none;
- -webkit-appearance: none;
- -moz-border-radius: 8px;
- -webkit-border-radius: 8px;
+ appearance: none;
border-radius: 8px;
text-indent: 0.2px;
text-overflow: "";
@@ -91,8 +87,84 @@ option:disabled {
color: #666;
}
+/* == Layout ============================================== */
+
+body.roster {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+
+ margin: 0;
+ padding: 0;
+
+ background-color: black;
+ white-space: nowrap;
+
+ overflow: auto;
+}
+
+#MainCallRoster {
+ display: flex;
+ flex-direction: column;
+ align-items: stretch;
+ justify-content: flex-start;
+}
+
+#MainCallRoster header {
+ flex: 0;
+}
+
+#MainCallRoster main {
+ flex: 1;
+}
+
+#MainRosterControls {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ margin: 2px;
+ justify-content: space-evenly;
+ align-items: center;
+}
+
+#MainRosterControls > div {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+}
+
+#MainRosterControls label {
+ margin-right: 4px;
+}
+
+#RosterControls.normal #ShowFewerControlsLink { display: none; }
+#RosterControls.normal #ShowMoreControlsLink { display: block; }
+#RosterControls.normal #SecondaryRosterControls { display: none; }
+
+#RosterControls.extended #ShowFewerControlsLink { display: block; }
+#RosterControls.extended #ShowMoreControlsLink { display: none; }
+#RosterControls.extended #SecondaryRosterControls { display: block; }
+
+/* == Other Elements ====================================== */
+
+#txrxdec {
+ width: 100px;
+}
+
+.link {
+ cursor: hand;
+ color: #FFFFAA;
+}
+
+.link:hover {
+ color: #FFFF00;
+ text-decoration: underline;
+}
+
.controlItem {
- -webkit-appearance: none;
+ appearance: none;
margin: 0;
padding: 0;
padding-top: 1px;
@@ -101,9 +173,9 @@ option:disabled {
border-width: 1px;
border-color: #aaa;
border-style: inset;
- -webkit-border-radius: 4px;
+ border-radius: 4px;
display: inline-block;
- -webkit-transition: border-color;
+ transition: border-color;
vertical-align: top;
}
@@ -142,6 +214,7 @@ table.rosterTable {
border: 1px solid #555;
background-color: black;
text-align: center;
+ width: 100%;
}
table.rosterTable td,
@@ -204,8 +277,8 @@ table.rosterTable thead th:first-child {
min-height: 2em;
display: inline-block;
color: #eee;
- -webkit-transition: border-style;
- -webkit-border-radius: 4px;
+ transition: border-style;
+ border-radius: 4px;
}
.compact:active {
+
+
+
+
+ New Award Tracker | -
---|
- - | -
- - | -
- | - -
+
+
diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js
index 51912176..07688103 100644
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@@ -1873,10 +1873,10 @@ function viewRoster() {
if (g_rosterSettings.compact == false) {
worker += "New Award Tracker | +
---|
+ + | +
+ + | +
+ | + +