diff --git a/op25/gr-op25_repeater/www/www-static/main.css b/op25/gr-op25_repeater/www/www-static/main.css
index 9aa3e5e..ae6b845 100644
--- a/op25/gr-op25_repeater/www/www-static/main.css
+++ b/op25/gr-op25_repeater/www/www-static/main.css
@@ -2,7 +2,6 @@
background-color: LightGray;
font-family: Arial, Helvetica, sans-serif;
-
}
#div_status table {
@@ -11,7 +10,6 @@
background-color: #336699;
border-collapse: collapse;
font-family: "Courier New", Courier, Monospace;
-
}
#div_status th {
@@ -22,8 +20,7 @@
color: #000;
font-weight: bold;
background: #669999; /* For browsers that do not support gradients */
- background: linear-gradient(#669999, #77AAAA);
-
+ background: linear-gradient(#31687e, #56a0bd);
}
#div_status td {
@@ -34,89 +31,116 @@
}
hr {
- width: 730px;
+ width: 730px;
float: left;
padding: 0px;
}
-/* the buttons */
+hr.disp { /* hr in main display */
-.scan-button {
- /* background-color: #669999; */
- border-color: black;
+ width: 97%;
+ position: absolute;
+ top: 50px;
+}
+
+.control-button { /* skip/hold/lockout buttons */
+
+ border-color: gray;
+ height: 38px;
color: white;
padding: 10px 10px;
text-decoration: none;
- margin: 4px 2px;
+ margin: 1px 1px;
cursor: pointer;
width: 100px;
font-size: 14px;
font-weight: bold;
+ box-shadow: 0 1px 1px 0 rgba(0,0,0,0.2), 0 2px 5px 0 rgba(0,0,0,0.19);
+ background: #31687e; /* For browsers that do not support gradients */
+ background: linear-gradient(#31687e, #56a0bd);
+ /* background: linear-gradient(#669999, #82B0B0); --- the green */
+}
+
+.control-button:hover {
+
+ background: linear-gradient(#56a0bd, #31687e);
+}
+
+.controlsDisplay { /* holds buttons, and display */
+
+ width: 730px;
+ border: 0px solid #aaa;
+ vertical-align: top;
+ height: 122px;
+ padding: 2px;
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2), 0 3px 10px 0 rgba(0,0,0,0.19);
- background: #669999; /* For browsers that do not support gradients */
- background: linear-gradient(#669999, #82B0B0);
+ background: LightGray; /* For browsers that do not support gradients */
+ background: linear-gradient(White, Silver);
}
-/* flex container for top buttons */
+.controls { /* skip/hold/lockout buttons (1) */
-/*
-the flex properties are more useful when a variable-width is applied,
-but can be safely left in place even when using a fixed width
-*/
+ border: 1px solid #aaa;
+ width: 104px;
+ float: left;
+ height: 100%;
+ text-align: center;
+}
-.flex-container {
- display: flex;
- width: 730px;
- justify-content: space-between;
-
-}
-
-.flex-container > div {
- width: 100px;
- margin: 0px;
- text-align: center;
- line-height: 75px;
- font-size: 30px;
-}
-
-
-/* main info container for the two tables */
-
-div.info {
+.statDisplay { /* main display - freq, sys, tgid (2) */
+ padding: 0px;
+ width: 522px;
+ float: left;
position: relative;
+ display: inline-block;
+ border: 1px solid #aaa;
+ height: 100%;
+ background: LightGray; /* For browsers that do not support gradients */
+ background: linear-gradient(LightGray, White, LightGray);
+}
+
+.sysMsg { /* OP25 logo and message box on right (3) */
+
+ padding: 0px;
+ /* display: inline-block; */
+ float: right; /* works left or right, right gives margin in between this & 2*/
+ width: 95px;
+ height: 100%;
+ background-color:#f9f9f9;
+ background-image: url("op25.png");
+ background-repeat: no-repeat;
+ background-position: right;
+ border: 1px solid #aaa;
+ font-family: Arial, Helvetica, sans-serif;
+ color: #666;
+ font-size: 8pt;
+}
+
+div.info { /* main info container for the two tables */
+
+/* min-height: 50px;
+ overflow: hidden;
+ position: relative; */
width: 730px;
- height: auto;
- border: 0px solid #000;
+ border: 0px solid #a00;
+ display: inline-block;
}
-/* system frequencies container that holds the table */
-.top {
+div.system { /* system frequencies container that holds the table */
- text-align: left;
- border: 0px solid #000;
-
-}
-
-div.system {
-
- position: absolute;
- top: 10px;
- left: 0;
+ float: left;
width: 48%;
height: auto;
- border: 0px solid #d00
+ border: 0px solid #d00;
}
-/* adjacent sites container that holds the table */
+div.adjacent { /* adjacent sites container that holds the table */
-div.adjacent {
-
- position: relative;
- top: 10px;
+ margin-left: 29px;
+ float: left;
width: 48%;
- float: right;
height: auto;
border: 0px solid #00f;
}
@@ -127,9 +151,10 @@ div.adjacent {
font-family: Arial, Helvetica, sans-serif;
font-size: 14px;
- padding: 20px;
color: #484848;
float: right;
+ margin-top: 22px;
+ margin-right: 4px;
}
.label {
@@ -138,6 +163,34 @@ div.adjacent {
color: #484848;
}
+.label-hold {
+
+ font-family: Arial, Helvetica, sans-serif;
+ color: #c00;
+ font-size: 8pt;
+ font-weight: bold;
+ text-align: center;
+ vertical-align: center;
+ height: 50%;
+}
+
+.label-sm {
+
+ font-family: Arial, Helvetica, sans-serif;
+ color: #444;
+ font-size: 8pt;
+ padding: 2px;
+}
+
+.label-lc { /* Last Command text */
+
+ font-family: Arial, Helvetica, sans-serif;
+ color: #444;
+ font-size: 8pt;
+ padding: 2px;
+ text-align: center;
+}
+
.value {
font-family: Arial, Helvetica, sans-serif;
@@ -158,9 +211,8 @@ div.adjacent {
text-align: left;
}
-/* the whole NAC string... NAC, freq tsbks, etc. */
-.nac {
+.nac { /* the whole NAC string... NAC, freq tsbks, etc. */
font-family: Arial, Helvetica, sans-serif;
color: #000060;
@@ -169,24 +221,18 @@ div.adjacent {
}
-/* .s1 .s2 .s3 DIVs for the sections. see index.html */
-
.s1 {
/* empty */
}
.s2 {
- border: 1px solid #999;
- height: auto;
- width: 720px;
+ border: 0px solid #999;
+ position: relative;
+ display: inline-block;
+ max-height: 112px;
+ width: 512px;
padding: 5px;
- background: LightGray; /* For browsers that do not support gradients */
- background: linear-gradient(White, Silver);
- box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2), 0 3px 10px 0 rgba(0,0,0,0.19);
-}
-
-.s3 {
- /* empty */
+ margin: 0 0 0 2px;
}
.copyright-text {
@@ -238,8 +284,9 @@ div.adjacent {
.nav-button-active {
background-color: #9cc;
- background: linear-gradient(#8bb, #9cc);
- color: #000;
+ background: linear-gradient(#31687e, #56a0bd);
+ /* background: linear-gradient(#8bb, #9cc); */
+ color: #fff;
border: 0px;
padding: 20px;
display: block;
@@ -249,12 +296,15 @@ div.adjacent {
.nav-button:hover {
background-color: #699;
- background: linear-gradient(#588, #699);
+ /* background: linear-gradient(#588, #699); */
+ background: linear-gradient(#56a0bd, #31687e);
+ color: #fff;
}
.nav-button-active:hover {
background-color: #699;
- background: linear-gradient(#588, #699);
+ /* background: linear-gradient(#588, #699); */
+ background: linear-gradient(#56a0bd, #31687e);
}
#div_settings table {
@@ -292,7 +342,7 @@ div.adjacent {
#div_settings input[type=text] {
max-width: 75px;
border-top: none;
- border-bottom-width: 1;
+ border-bottom-width: 1px;
border-bottom: dotted;
border-right: none;
border-left: none;
@@ -336,7 +386,7 @@ div#cfg_list_area select {
#div_rx_opts input[type=text] {
max-width: 75px;
border-top: none;
- border-bottom-width: 1;
+ border-bottom-width: 1px;
border-bottom: dotted;
border-right: none;
border-left: none;
diff --git a/op25/gr-op25_repeater/www/www-static/main.js b/op25/gr-op25_repeater/www/www-static/main.js
index 5917e79..85fecad 100644
--- a/op25/gr-op25_repeater/www/www-static/main.js
+++ b/op25/gr-op25_repeater/www/www-static/main.js
@@ -255,30 +255,24 @@ function rx_update(d) {
function change_freq(d) {
var html = "
Frequency: " + d['freq'] / 1000000.0;
- html += " " + d['system'] + " ";
+ html += "
" + d['system'] + "
";
if (d['tgid'] != null) {
html += "
Talkgroup ID: " + d['tgid'];
html += " " + d['tag'] + " ";
}
- html += "
";
+ html += "";
var div_s2 = document.getElementById("div_s2");
div_s2.innerHTML = html;
div_s2.style["display"] = "";
if (d['tgid'] != null)
current_tgid = d['tgid'];
- if (current_tgid != null) {
- var div_s3 = document.getElementById("div_s3");
- div_s3.style["display"] = "";
- }
}
// adjacent sites table
function adjacent_data(d) {
- if (Object.keys(d).length < 1) {
- var html = "
";
- return html;
- }
+ if (Object.keys(d).length < 1)
+ return "";
var html = "