[hamradio-commits] [dump1090] 337/373: Undo Parts of Pull request #29

Matthew Ernisse mernisse-guest at moszumanska.debian.org
Thu Oct 23 14:58:34 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 aa063ba89fce9cafa24b9fbba72a0743f9b45cb2
Author: Malcolm Robb <Support at ATTAvionics.com>
Date:   Tue Sep 30 16:35:15 2014 +0100

    Undo Parts of Pull request #29
    
    The table sizing doesn't seem to work in M$ IE8 and IE9.
---
 public_html/gmap.html | 62 +++++++++++++++++++++++++++------------------------
 public_html/style.css | 15 +++++--------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/public_html/gmap.html b/public_html/gmap.html
index 1898e06..96f412a 100644
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@@ -18,36 +18,40 @@
 		<div id="dialog-modal" title="Basic modal dialog" style="display:none;">
 			<p>The settings feature is coming soon. Keep checking GitHub.</p>
 		</div>
-		<div id="map_canvas"></div>
-		<div id="sidebar_canvas">
-			<div id="timestamps" style="align: center">
-				<table width="100%"><tr>
-					<td>Local Time</td>
-					<td>
-						<canvas id="localclock" class="CoolClock:classic:40"></canvas>
-					</td>
-					<td>UTC Time</td>
-					<td>
-						<canvas id="gmtclock" class="CoolClock:classic:40::0"></canvas>
-					</td>
-				</tr></table>
-			</div>
-			<div id="sudo_buttons">
-				<table width="100%"><tr>
-					<td width="150" style="text-align: center;" class="pointer">
-						[ <span onclick="resetMap();">Reset Map</span> ]
-					</td>
-					<td> </td>
-					<td width="150" style="text-align: center;" id="setings_button" class="pointer">
-						[ <span onclick="optionsModal();">Settings</span> ]
-					</td>
-				</tr></table>
-			</div>
+		<div id="map_container">
+			<div id="map_canvas"></div>
+		</div>
+		<div id="sidebar_container">
+			<div id="sidebar_canvas">
+				<div id="timestamps" style="align: center">
+					<table width="100%"><tr>
+						<td>Local Time</td>
+						<td>
+							<canvas id="localclock" class="CoolClock:classic:40"></canvas>
+						</td>
+						<td>UTC Time</td>
+						<td>
+							<canvas id="gmtclock" class="CoolClock:classic:40::0"></canvas>
+						</td>
+					</tr></table>
+				</div>
+				<div id="sudo_buttons">
+					<table width="100%"><tr>
+						<td width="150" style="text-align: center;" class="pointer">
+						    [ <span onclick="resetMap();">Reset Map</span> ]
+						</td>
+						<td> </td>
+						<td width="150" style="text-align: center;" id="setings_button" class="pointer">
+						    [ <span onclick="optionsModal();">Settings</span> ]
+						</td>
+					</tr></table>
+				</div>
 
-			<div id="plane_detail"></div>
-			<div id="options"></div>
-			<div id="planes_table"></div>
-			<div id="plane_extension"></div>
+				<div id="plane_detail"></div>
+				<div id="options"></div>
+				<div id="planes_table"></div>
+				<div id="plane_extension"></div>
+			</div>
 		</div>
 		<div id="SpecialSquawkWarning">
 		    <b>Squak 7x00 is reported and shown.</b><br>
diff --git a/public_html/style.css b/public_html/style.css
index eab51de..86cb053 100644
--- a/public_html/style.css
+++ b/public_html/style.css
@@ -1,23 +1,20 @@
 html, body {
     margin: 0; padding: 0; background-color: #ffffff; font-family: Tahoma, Sans-Serif;
-    font-size: 12pt; overflow: auto;
+    font-size: 10pt; overflow: auto;
 }
+div#map_container     { float: left; width: 100%; height: 100%; }
+div#map_canvas        { height: 100%; margin-right: 420px; }
 
-div#map_canvas     { width: 100%; height: 100%; }
+div#sidebar_container { float: left; width: 410px; margin-left: -410px; height: 100%; overflow: auto; }
 
-div#sidebar_canvas { position: absolute; top: 0px; right: 0px;
-	box-sizing: border-box; overflow: auto;
-	background: #FFFFFF; padding: 0px 2px 2px 2px;
-	border-bottom-left-radius: 5px; z-index: 99; }
-
-div#SpecialSquawkWarning { position: absolute; bottom: 25px; right: 0px; border: 2px solid red;
+div#SpecialSquawkWarning { position: absolute; bottom: 25px; right: 430px; border: 2px solid red;
     background-color: #FFFFA3; opacity: 0.75; filter:alpha(opacity=75); padding: 5px;
     display: none; text-align: center; }
 
 table#optionsTabs { width: 100%; font-size: small; font-family: monospace; background-color: #ddd;
     border: 1px; border-color: #000000;}
 
-#tableinfo, #sudo_buttons { font-family: monospace; }
+#tableinfo, #sudo_buttons { font-size: x-small; font-family: monospace; }
 
 .vPosition  { font-weight: bold; background-color: #d5ffd5; }
 .squawk7500 { font-weight: bold; background-color: #ff5555; }

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



More information about the pkg-hamradio-commits mailing list