Merge branch 'SkyAware' into dev

makrsmark · Jul 31, 2019 · 9cef820 · 9cef820
2 parents ef125bd + b01f420
commit 9cef820
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/public_html/config.js b/public_html/config.js
@@ -99,7 +99,7 @@ SiteCircles = true; // true to show circles (only shown if the center marker is
 SiteCirclesDistances = new Array(100,150,200);
 
 // Controls page title, righthand pane when nothing is selected
-PageName = "PiAware Skyview";
+PageName = "PiAware SkyAware";
 
 // Show country flags by ICAO addresses?
 ShowFlags = true;

diff --git a/public_html/images/ff-sa-logo.png b/public_html/images/ff-sa-logo.png
diff --git a/public_html/images/[email protected] b/public_html/images/[email protected]
diff --git a/public_html/images/[email protected] b/public_html/images/[email protected]
diff --git a/public_html/images/pa-sa-logo.png b/public_html/images/pa-sa-logo.png
diff --git a/public_html/images/[email protected] b/public_html/images/[email protected]
diff --git a/public_html/images/[email protected] b/public_html/images/[email protected]
diff --git a/public_html/index.html b/public_html/index.html
@@ -23,7 +23,7 @@
 		<script type="text/javascript" src="flags.js"></script>
 		<script type="text/javascript" src="layers.js"></script>
 		<script type="text/javascript" src="script.js?v=2"></script>
-		<title>PiAware Skyview</title>
+		<title>PiAware SkyAware</title>
 	</head>
 
 	<body onload="initialize()">
@@ -49,8 +49,8 @@
 		<div id="header" class="infoHeading">
 			<div class="logoContainer">
 				<a href="http://flightaware.com/" target="_blank"><img src="images/fa_logo_color.png" alt="FlightAware" class="flightawareLogo" srcset="images/fa_logo_color.png 1x, images/[email protected] 2x, images/[email protected] 3x"></a>
-				<img src="images/pa-sv-logo.png" alt="PiAware SkyView" class="adsbLogo piAwareLogo" srcset="images/pa-sv-logo.png 1x, images/pa-sv[email protected] 2x, images/pa-sv[email protected] 3x">
-				<img src="images/ff-sv-logo.png" alt="FlightFeeder SkyView" class="adsbLogo flightfeederLogo" srcset="images/ff-sv-logo.png 1x, images/ff-sv[email protected] 2x, images/ff-sv[email protected] 3x" style="display: none;">
+				<img src="images/pa-sa-logo.png" alt="PiAware SkyAware" class="adsbLogo piAwareLogo" srcset="images/pa-sa-logo.png 1x, images/pa-sa[email protected] 2x, images/pa-sa[email protected] 3x">
+				<img src="images/ff-sa-logo.png" alt="FlightFeeder SkyAware" class="adsbLogo flightfeederLogo" srcset="images/ff-sa-logo.png 1x, images/ff-sa[email protected] 2x, images/ff-sa[email protected] 3x" style="display: none;">
 			</div>
 			<div class="buttonContainer">
 				<div class="dateTime" id="clock_div"></div>

diff --git a/public_html/script.js b/public_html/script.js
@@ -1896,11 +1896,11 @@ function updatePiAwareOrFlightFeeder() {
 	if (isFlightFeeder) {
 		$('.piAwareLogo').hide();
 		$('.flightfeederLogo').show();
-		PageName = 'FlightFeeder Skyview';
+		PageName = 'FlightFeeder SkyAware';
 	} else {
 		$('.flightfeederLogo').hide();
 		$('.piAwareLogo').show();
-		PageName = 'PiAware Skyview';
+		PageName = 'PiAware SkyAware';
 	}
 	refreshPageTitle();
 }