[hamradio-commits] [dump1090] 239/373: Rolling back a couple changes and spawning a branch from here.

Thu Oct 23 14:58:23 UTC 2014

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch backport
in repository dump1090.

commit 072fba8718ef38e7ae8a21afd3990ae34269b30c
Author: Brian Davenport <the.lost.minded at gmail.com>
Date:   Thu May 30 21:26:16 2013 +0000

    Rolling back a couple changes and spawning a branch from here.
---
 public_html/gmap.html  | 14 +++++++-------
 public_html/options.js | 17 +++++++++++++++++
 public_html/script.js  |  9 ++-------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/public_html/gmap.html b/public_html/gmap.html
index 338bc78..a5c2df5 100644
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@@ -1,7 +1,9 @@
 <html>
 	<head>
 		<link rel="stylesheet" type="text/css" href="style.css" />
+		<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
 		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+		<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
 		<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false&libraries=geometry"></script>
 		<script type="text/javascript" src="config.js"></script>
 		<script type="text/javascript" src="untrackedDeveloperSettings.js"></script> <!-- Developers -->
@@ -14,6 +16,9 @@
 		<script type="text/javascript" src="coolclock/moreskins.js"></script>
 	</head>
 	<body onload="initialize()">
+		<div id="dialog-modal" title="Basic modal dialog">
+			<p>The settings feature is coming soon.  Keep checking github.</p>
+		</div>
 		<div id="map_container">
 			<div id="map_canvas"></div>
 		</div>
@@ -34,15 +39,10 @@
 				</div>
 				<div id="sudo_buttons">
 					<table width="100%"><tr>
-						<td width="150" style="text-align: center;">[ <span onclick="resetMap();">Reset Map</span> ]</td><td></td><td width="150" style="text-align: center;" id="setings_button">[ <span onclick="settingToggle();">Settings</span> ]</td>
-					</tr></table>
-				</div>
-				<div id="options" class="notvisable">
-					<table id="optionsTabs"><tr>
-						<td onclick="optionsGeneral();">General</td><td onclick="optionsKML();">KML</td>
+						<td width="150" style="text-align: center;">[ <span onclick="resetMap();">Reset Map</span> ]</td><td></td><td width="150" style="text-align: center;" id="setings_button">[ <span onclick="optionsModal();">Settings</span> ]</td>
 					</tr></table>
-					<div id="optionsBox"></div>
 				</div>
+
 				<div id="plane_detail"></div>
 				<div id="options"></div>
 				<div id="planes_table"></div>
diff --git a/public_html/options.js b/public_html/options.js
new file mode 100644
index 0000000..8ca2a83
--- /dev/null
+++ b/public_html/options.js
@@ -0,0 +1,17 @@
+var listKMLType = ['Approch', 'Departure', 'Transit', 'Custom1', 'Custom2'];
+var listKMLs = localStorage['listKMLs'] || [];
+
+function optionsInitalize() {
+	// Write your initalization here
+	// Gets called just before the 1-sec function call loop is setup
+	$( "#dialog-modal" ).dialog({
+		height: 140,
+		modal: true,
+		autoOpen: false,
+		closeOnEscape: false,
+	});
+}
+
+function optionsModal() {
+	$( "#dialog-modal" ).dialog( "open");
+}
diff --git a/public_html/script.js b/public_html/script.js
index fc8c0d0..aad0f79 100644
--- a/public_html/script.js
+++ b/public_html/script.js
@@ -167,8 +167,8 @@ function initialize() {
         }
 	}
 
-    // Load up our options page
-    optionsInitalize();
+	// Load up our options page
+	optionsInitalize();
 
 	// Did our crafty user need some setup?
 	extendedInitalize();
@@ -553,11 +553,6 @@ function resetMap() {
 	refreshSelected();
 }
 
-function settingToggle() {
-	console.log("Settings Click");
-	$("#options").toggleClass("notvisable");
-}
-
 function drawCircle(marker, distance) {
     if (typeof distance === 'undefined') {
         return false;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git

