From e5fcd4035f4030410d0479c8f6086385887ffa2b Mon Sep 17 00:00:00 2001 From: James Wilson Date: Thu, 19 Jan 2017 14:55:48 -0600 Subject: [PATCH] Redesign infoblock --- public_html/index.html | 165 +++++++++++++++++++++++++++-------------- public_html/script.js | 26 ++++--- public_html/style.css | 63 ++++++++++++++-- 3 files changed, 179 insertions(+), 75 deletions(-) diff --git a/public_html/index.html b/public_html/index.html index c386a7a..c418987 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -63,63 +63,118 @@
diff --git a/public_html/script.js b/public_html/script.js index 41bc30e..88b4ed4 100644 --- a/public_html/script.js +++ b/public_html/script.js @@ -801,7 +801,7 @@ function refreshSelected() { } else { $('#selected_callsign').text('n/a'); } - $('#selected_flightaware_link').html(getFlightAwareModeSLink(selected.icao, selected.flight, "[FlightAware]")); + $('#selected_flightaware_link').html(getFlightAwareModeSLink(selected.icao, selected.flight, "FlightAware.com Link")); if (selected.registration !== null) { $('#selected_registration').text(selected.registration); @@ -815,13 +815,14 @@ function refreshSelected() { $('#selected_icaotype').text(""); } - var emerg = document.getElementById('selected_emergency'); - if (selected.squawk in SpecialSquawks) { - emerg.className = SpecialSquawks[selected.squawk].cssClass; - emerg.textContent = NBSP + 'Squawking: ' + SpecialSquawks[selected.squawk].text + NBSP ; - } else { - emerg.className = 'hidden'; - } + // Not using this logic for the redesigned info panel at the time, but leaving it in if/when adding it back + // var emerg = document.getElementById('selected_emergency'); + // if (selected.squawk in SpecialSquawks) { + // emerg.className = SpecialSquawks[selected.squawk].cssClass; + // emerg.textContent = NBSP + 'Squawking: ' + SpecialSquawks[selected.squawk].text + NBSP ; + // } else { + // emerg.className = 'hidden'; + // } $("#selected_altitude").text(format_altitude_long(selected.altitude, selected.vert_rate, DisplayUnits)); @@ -856,12 +857,13 @@ function refreshSelected() { $('#selected_position').text('n/a'); $('#selected_follow').addClass('hidden'); } else { - var mlat_bit = (selected.position_from_mlat ? "MLAT: " : ""); + if (selected.seen_pos > 1) { - $('#selected_position').text(mlat_bit + format_latlng(selected.position) + " (" + selected.seen_pos.toFixed(1) + "s)"); + $('#selected_position').text(format_latlng(selected.position)); } else { - $('#selected_position').text(mlat_bit + format_latlng(selected.position)); + $('#selected_position').text(format_latlng(selected.position)); } + $('#selected_source').text( (selected.position_from_mlat ? "MLAT" : "ADS-B")); $('#selected_follow').removeClass('hidden'); if (FollowSelected) { $('#selected_follow').css('font-weight', 'bold'); @@ -1476,7 +1478,7 @@ function getFlightAwareModeSLink(code, ident, linkText) { function getFlightAwarePhotoLink(registration) { if (registration !== null && registration !== "") { - return "See Photos"; + return "See Aircraft Photos"; } return ""; diff --git a/public_html/style.css b/public_html/style.css index fedfb33..9ba0ce3 100644 --- a/public_html/style.css +++ b/public_html/style.css @@ -10,10 +10,10 @@ html, body { #selected_infoblock { position: absolute; - left: 20px; - top: 20px; - min-width: 360px; - padding: 20px; + left: 40px; + top: 60px; + min-width: 394px; + padding: 10px; background: #ffffff; box-shadow: 4px 4px 10px #444444; cursor: pointer; @@ -267,10 +267,6 @@ div#loader { z-index: 99; position: absolute; left: 0; top: 0; bottom: 0; right: .infoblock_heading a { text-decoration: none; color: blue; font-size: x-small;} .infoblock_body { font-size: small; } -#selected_icao { font-size: x-small; } -#selected_registration { font-size: x-small; } -#selected_icaotype { font-size: x-small; } - .dim { opacity: 0.3; filter:alpha(opacity=30); /* For IE8 and earlier */ } .pointer { cursor: pointer; } @@ -527,6 +523,57 @@ select.error, textarea.error, input.error { width: 40%; } +.infoRowFluid { + display: inline-block; +} + .infoRow { padding-top: 10px; +} + +.removePadding { + padding: 0; +} + +.rightLink { + float: right; + padding-right: 5px; +} + +.infoBlockTopSection { + padding-top: 14px; + padding-bottom: 14px; + padding-left: 8px; +} + +.infoBlock45pxSection { + height: 45px; + line-height: 45px; + padding-left: 10px; +} + +.infoBlockSection { + padding-top: 14px; + padding-bottom: 14px; + padding-left: 10px; +} + +.lightGreyBackground { + background-color: #efefef; +} + +.fourColumnSection1 { + width: 20%; +} + +.fourColumnSection2 { + width: 20%; +} + +.fourColumnSection3 { + width: 20%; +} + +.fourColumnSection4 { + width: 20%; } \ No newline at end of file