From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 18 Oct 2011 15:12:20 +0000 (+0000)
Subject: Some fixes for IE7.
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=0bdaf47d127ba460234a7bcf8a85f80ba3e3b213;p=bertos.git

Some fixes for IE7.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@5172 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/boards/sam3x-ek/examples/sam3x-ek_http_server/sd_data/etc/style.css b/boards/sam3x-ek/examples/sam3x-ek_http_server/sd_data/etc/style.css
index d371b401..f6697bcb 100644
--- a/boards/sam3x-ek/examples/sam3x-ek_http_server/sd_data/etc/style.css
+++ b/boards/sam3x-ek/examples/sam3x-ek_http_server/sd_data/etc/style.css
@@ -1,193 +1,180 @@
-
-
-
-
-body {
-	font-family:  helvetica;
-	margin: 0px;
-	padding: 0px;
-	font-size: 0.9em;
-	color:#296628;
-	background-color: #cccccc;
-}
-
-#header h1,#header h3, #header div, #header img {
-	display: inline-block;
-	vertical-align: top;
-
-}
-
-#header {
-	border-style: solid;
-	border-color: #3E9A3C;
-	border-width: 1px;
-	border-top-width: 10px;
-	border-bottom-width: 10px;
-	/*border-top-left-radius: 10px;
-	border-top-right-radius: 10px;*/
-}
-
-
-#header h1 {
-	color:#3E9A3C;
-	margin-top: 35px;
-	text-shadow:3px 3px 1px #eee;
-	margin-bottom: 0px;
-}
-
-#header h3 {
-	margin-top: 0px;
-	color:#F58220;
-}
-
-#conteiner {
-	width: 800px;
-	margin:0px auto;
-	background-color: #ffffff;
-
-}
-
-#footer {
-	padding: 15px;
-	background-color: #3E9A3C;
-	color:#FFFFFF;
-}
-
-#footer a {
-	color:#FCAF17;
-}
-
-
-.content {
-	padding: 15px;
-	border-style: solid;
-	border-color: #3E9A3C;
-	border-width: 0px 1px 1px 1px;
-}
-
-
-
-.control {
-	display: inline-block;
-	min-width: 250px;
-}
-
-.led-on {
-	color:#FFFFFF;
-	font-size: 0.9em;
-	cursor:pointer;
-	width:55px;
-	display:inline-block;
-	background-color:#3E9A3C;
-	border: 1px solid #3E9A3C;
-	padding: 2px;
-	margin: 5px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.led-on span {
-	background-color:#FFFFFF;
-	float:right;
-	width: 17px;
-	height: 17px;
-	margin-left: 5px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	display: inline-block;
-}
-
-#led-0.led-on {
-	background-color:#0BC713;
-	color:#000000;
-	border: 1px solid #09580D;
-}
-
-#led-1.led-on {
-	background-color:#FAC52B;
-	color:#000000;
-	border: 1px solid #BB9010;
-}
-
-#led-2.led-on {
-	background-color:#1FC2E2;
-	color:#000000;
-	border: 1px solid #00697E;
-}
-
-.led-off {
-	color:#FFFFFF;
-	font-size: 0.9em;
-	cursor:pointer;
-	width:55px;
-	display:inline-block;
-	background-color:#A7A7A7;
-	border: 1px solid #A7A7A7;
-	padding: 2px;
-	margin: 5px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.led-off span {
-	background-color:#FFFFFF;
-	width: 17px;
-	height: 17px;
-	margin-right: 5px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	display: inline-block;
-}
-
-.trigger {
-	width:200px;
-	display:inline-block;
-	border: 1px solid #3E9A3C;
-	padding: 1px;
-	margin: 5px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.trigger span {
-	background-color:#3E9A3C;
-	width: 0px;;
-	height: 17px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	display: inline-block;
-}
-
-#temperature-plot{
-	height: 250px;
-	margin: 15px;
-}
-
-
-.box {
-	color:#FFFFFF;
-	font-size: 0.9em;
-	width:55px;
-	display:inline-block;
-	background-color:#3E9A3C;
-	border: 1px solid #3E9A3C;
-	padding: 2px;
-	margin: 5px;
-	text-align:center;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.label {
- width: 150px;
- display: inline-block;
-}
-
-
+body {
+	font-family:  helvetica;
+	margin: 0px;
+	padding: 0px;
+	font-size: 0.9em;
+	color:#296628;
+	background-color: #cccccc;
+}
+
+#header h1,#header h3, #header div, #header img {
+	display: inline-block;
+	vertical-align: top;
+	zoom:1;
+	*display:inline;
+}
+
+#header {
+	border-style: solid;
+	border-color: #3E9A3C;
+	border-width: 1px;
+	border-top-width: 10px;
+	border-bottom-width: 10px;
+	/*border-top-left-radius: 10px;
+	border-top-right-radius: 10px;*/
+}
+
+
+#header h1 {
+	color:#3E9A3C;
+	margin-top: 35px;
+	text-shadow:3px 3px 1px #eee;
+	margin-bottom: 0px;
+}
+
+#header h3 {
+	margin-top: 0px;
+	color:#F58220;
+}
+
+#conteiner {
+	width: 800px;
+	margin:0px auto;
+	background-color: #ffffff;
+
+}
+
+.footer {
+	padding: 15px;
+	background-color: #3E9A3C;
+	color:#FFFFFF;
+}
+
+.footer a {
+	color:#FCAF17;
+}
+
+
+.content {
+	padding: 15px;
+	border-style: solid;
+	border-color: #3E9A3C;
+	border-width: 0px 1px 1px 1px;
+}
+
+.control {
+	display: inline-block;
+	min-width: 250px;
+	zoom:1;
+	*display:inline;
+}
+
+.led {
+	cursor:pointer;
+	font-size: 0.9em;
+	width:55px;
+	padding: 2px;
+	margin: 5px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	display:inline-block;
+}
+
+.led span {
+	width: 17px;
+	height: 17px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	background-color:#FFFFFF;
+}
+
+.led-on {
+	color:#FFFFFF;
+	background-color:#3E9A3C;
+	border: 1px solid #3E9A3C;
+}
+
+.led-on span {
+	margin-left: 15px;
+	display: inline-block;
+}
+
+.led-off {
+	color:#FFFFFF;
+	background-color:#A7A7A7;
+	border: 1px solid #A7A7A7;
+}
+
+.led-off span {
+	margin-right: 5px;
+	display: inline-block;
+}
+
+
+#led-0.led-on {
+	background-color:#0BC713;
+	color:#000000;
+	border: 1px solid #09580D;
+}
+
+#led-1.led-on {
+	background-color:#FAC52B;
+	color:#000000;
+	border: 1px solid #BB9010;
+}
+
+#led-2.led-on {
+	background-color:#1FC2E2;
+	color:#000000;
+	border: 1px solid #00697E;
+}
+
+
+.trigger {
+	width:200px;
+	display:inline-block;
+	border: 1px solid #3E9A3C;
+	padding: 1px;
+	margin: 5px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+
+.trigger span {
+	background-color:#3E9A3C;
+	width: 0px;;
+	height: 17px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	display: inline-block;
+}
+
+.temperature-plot{
+	height: 250px;
+	margin: 15px 15px 0px 15px;
+}
+
+
+.box {
+	color:#FFFFFF;
+	font-size: 0.9em;
+	width:55px;
+	display:inline-block;
+	background-color:#3E9A3C;
+	border: 1px solid #3E9A3C;
+	padding: 2px;
+	margin: 5px;
+	text-align:center;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+
+.label {
+ 	width: 150px;
+ 	display: inline-block;
+}
\ No newline at end of file
diff --git a/boards/sam3x-ek/examples/sam3x-ek_http_server/sd_data/index.htm b/boards/sam3x-ek/examples/sam3x-ek_http_server/sd_data/index.htm
index fc2e701b..dc3aa3cf 100644
--- a/boards/sam3x-ek/examples/sam3x-ek_http_server/sd_data/index.htm
+++ b/boards/sam3x-ek/examples/sam3x-ek_http_server/sd_data/index.htm
@@ -1,148 +1,151 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>BeRTOS web server example</title>
-		<link rel="stylesheet" type="text/css" media="screen" href="etc/style.css" />
-		<script type="text/javascript" src="etc/js/jquery.js"></script>
-		<!--[if lte IE 8]><script type="text/javascript" src="etc/js/excan.js"></script><![endif]-->
-		<script type="text/javascript" src="etc/js/jqflot.js"></script>
-		<script type="text/javascript">
-			$(document).ready(function() {
-				$.ajax({
-					  url: "get_chipinfo",
-					  dataType :'json',
-					  async: false,
-					  success: function(data){
-					    	$.each(data,function(k,v){
-					    		$('#'+k).text(v);
-					    	});
-   					  }
-					});
-   				var set_led_status = function(elm,status) {
-
-   					if (status == 1) {
-						elm.addClass('led-on').removeClass('led-off').text('ON').append("<span>&nbsp;</span>");
-   					} else {
-   						elm.addClass('led-off').removeClass('led-on').text('OFF').prepend("<span>&nbsp;</span>");
-	   				}
-   				}
-   				$("span[id^=led]").click(function(){
-   					var elm = $(this);
-					if (elm.hasClass('led-off')) {
-						var status = 1;
-					} else {
-						var status = 0;
-					}
-					set_led_status(elm, status);
-					$.ajax({
-					  url: "set_led",
-					  async: false,
-					  data:{'n':elm.attr('name'),'set':status},
-					  dataType :'json',
-					  success: function(){
-					  }
-					});
-   				});
-   				var options = {
-			        series: { shadowSize: 0 },
-			        yaxis:  { min: 0},
-			        xaxis:  {min:0}
-			    };
-
-				var temperature_data = [];
-				var plot_temperature = $.plot($("#temperature-plot"), [{label: "Temperature", data:temperature_data}], options);
-
-			    function updateStatus() {
-
-			$.ajax({
-					  url: "status",
-					  async: false,
-					  dataType :'json',
-					  success: function(data){
-
-						 $('#potentiometer').width(200*(parseInt(data['volt'])/4095));
-						 $('#potentiometer-value').text(data['volt'])
-						 $('#uptime').text(data['up_time'] +' sec');
-						 $('#temperature').text(data['temp']+' °C');
-						 $('#local_ip').text(data['local_ip']);
-						 $('#last_connected_ip').text(data['last_connected_ip']);
-						 $('#tot_req').text(data['tot_req']);
-
-						 $.each(data['leds'], function (key,v) {
-							set_led_status($('#led-' + key), v);
-							});
-
-						 temperature_data.push([data['up_time'],data['temp']]);
-
-						 var x = plot_temperature.getAxes().xaxis.options;
-						 var y = plot_temperature.getAxes().yaxis.options;
-						 x.max = Math.max(25,data['up_time']);
-						 x.min = Math.max(0,(x.max - 25));
-
-						 plot_temperature.setData([{label: "Temperature", data:temperature_data}]);
-						 plot_temperature.setupGrid();
-						 plot_temperature.draw();
-						 setTimeout(updateStatus, 1000);
-					  }
-					});
-			    }
-			   updateStatus();
-			});
-
-		</script>
-	</head>
-	<body>
-
-		<div id="wrapper">
-			<div id="conteiner">
-				<div id="header">
-
-					<img src="etc/img/bertos.png" alt="BeRTOS Logo" />
-
-					<div>
-						<h1>web server example</h1><br/>
-						<h3>Remotely control your board via web browser</h3>
-					</div>
-
-				</div>
-				<div class="content">
-					<b>Hardware Info:</b><br>
-					<b>CPU Core:</b><span id="core_name">--</span><br>
-					<b>Chip name:</b><span id="arch_name">--</span><br>
-					<b>SRAM size:</b><span id="sram_size">--</span><br>
-					<b>Flash size:</b><span id="flash_size">--</span><br>
-					<b>Boot from memory:</b><span id="mem_boot_type">--</span>
-					<br>
-					<b>Connections Info:</b><br>
-					<b>Board IP:</b><span id="local_ip">--</span><br>
-					<b>Your IP:</b><span id="last_connected_ip">--</span><br>
-					<b>Total status requests:</b><span id="tot_req">--</span><br>
-				</div>
-				<div class="content">
-					<div class="control">
-						<b class="label">BeRTOS uptime:</b><span id="uptime" class="box">--</span><br>
-						<b class="label">Current temperature:</b><span id="temperature" class="box">--</span><br/>
-					</div>
-					<div class="control">
-						<b>Led status:</b><br/>
-						<span id="led-0" name="0" class="led-off">--</span><span id="led-1" name="1" class="led-off">--</span><span id="led-2" name="2" class="led-off">--</span>
-					</div>
-					<div class="control">
-						<b>Potentiometer Value:</b><br/>
-						<span class="trigger"><span id="potentiometer">&nbsp;</span></span>&nbsp;<span id="potentiometer-value">--</span>
-					</div>
-				</div>
-				<div class="content">
-						<b>Controller temperature:</b><br/>
-						<div id="temperature-plot"></div>
-				</div>
-				<div id="footer">
-						Please visit <a href="http://www.bertos.org">www.berots.org</a> for more info
-				</div>
-			</div>
-		</div>
-
-	</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<title>BeRTOS web server example</title>
+		<link rel="stylesheet" type="text/css" media="screen" href="etc/style.css" />
+		<script type="text/javascript" src="etc/js/jquery.js"></script>
+		<script type="text/javascript" src="etc/js/excan.js"></script>
+		<script type="text/javascript" src="etc/js/jqflot.js"></script>
+		<script type="text/javascript">
+			$(document).ready(function() {
+				$.ajax({
+					  url: "get_chipinfo",
+					  dataType :'json',
+					  async: false,
+					  cache: false,
+					  success: function(data){
+					    	$.each(data,function(k,v){
+					    		$('#'+k).text(v);
+					    	});
+   					  }
+					});
+   				var set_led_status = function(elm,status) {
+
+   					if (status == 1) {
+						elm.addClass('led-on').removeClass('led-off').text('ON').append("<span></span>");
+   					} else {
+   						elm.addClass('led-off').removeClass('led-on').text('OFF').prepend("<span></span>");
+	   				}
+   				}
+   				$("span[id^=led]").click(function(){
+   					var elm = $(this);
+					if (elm.hasClass('led-off')) {
+						var status = 1;
+					} else {
+						var status = 0;
+					}
+					set_led_status(elm, status);
+					$.ajax({
+					  url: "set_led",
+					  async: false,
+					  cache: false,
+					  data:{'n':elm.attr('name'),'set':status},
+					  dataType :'json',
+					  success: function(){
+					  }
+					});
+   				});
+   				var options = {
+			        series: { shadowSize: 0 },
+			        yaxis:  { min: 0},
+			        xaxis:  {min:0}
+			    };
+
+				var temperature_data = [];
+				var plot_temperature = $.plot($("#temperature-plot"), [{label: "Temperature", data:temperature_data}], options);
+
+			    function updateStatus() {
+
+			$.ajax({
+					  url: "status",
+					  async: false,
+					  cache: false,
+					  dataType :'json',
+					  success: function(data){
+
+						 $('#potentiometer').width(200*(parseInt(data['volt'])/4095));
+						 $('#potentiometer-value').text(data['volt'])
+						 $('#uptime').text(data['up_time'] +' sec');
+						 $('#temperature').text(data['temp']+' °C');
+						 $('#local_ip').text(data['local_ip']);
+						 $('#last_connected_ip').text(data['last_connected_ip']);
+						 $('#tot_req').text(data['tot_req']);
+
+						 $.each(data['leds'], function (key,v) {
+							set_led_status($('#led-' + key), v);
+							});
+
+						 temperature_data.push([data['up_time'],data['temp']]);
+
+						 var x = plot_temperature.getAxes().xaxis.options;
+						 var y = plot_temperature.getAxes().yaxis.options;
+						 x.max = Math.max(25,data['up_time']);
+						 x.min = Math.max(0,(x.max - 25));
+
+						 plot_temperature.setData([{label: "Temperature", data:temperature_data}]);
+						 plot_temperature.setupGrid();
+						 plot_temperature.draw();
+						 setTimeout(updateStatus, 1000);
+					  }
+					});
+			    }
+			   updateStatus();
+			});
+
+		</script>
+	</head>
+	<body>
+
+		<div id="wrapper">
+			<div id="conteiner">
+				<div id="header">
+
+					<img src="etc/img/bertos.png" alt="BeRTOS Logo" />
+
+					<div>
+						<h1>web server example</h1><br>
+						<h3>Remotely control your board via web browser</h3>
+					</div>
+
+				</div>
+				<div class="content">
+					<b>Hardware Info:</b><br>
+					<b>CPU Core:</b><span id="core_name">--</span><br>
+					<b>Chip name:</b><span id="arch_name">--</span><br>
+					<b>SRAM size:</b><span id="sram_size">--</span><br>
+					<b>Flash size:</b><span id="flash_size">--</span><br>
+					<b>Boot from memory:</b><span id="mem_boot_type">--</span>
+					<br>
+					<b>Connections Info:</b><br>
+					<b>Board IP:</b><span id="local_ip">--</span><br>
+					<b>Your IP:</b><span id="last_connected_ip">--</span><br>
+					<b>Total status requests:</b><span id="tot_req">--</span><br>
+				</div>
+				<div class="content">
+					<div class="control">
+						<b class="label">BeRTOS uptime:</b><span id="uptime" class="box">--</span><br>
+						<b class="label">Current temperature:</b><span id="temperature" class="box">--</span><br/>
+					</div>
+					<div class="control">
+						<b>Led status:</b><br/>
+						<span id="led-0" name="0" class="led led-off">--</span><span id="led-1" name="1" class="led led-off">--</span><span id="led-2" name="2" class="led led-off">--</span>
+					</div>
+					<div class="control">
+						<b>Potentiometer Value:</b><br/>
+						<span class="trigger"><span id="potentiometer">&nbsp;</span></span>&nbsp;<span id="potentiometer-value">--</span>
+					</div>
+				</div>
+				<div class="content">
+						<b>Controller temperature:</b><br/>
+						<div id="temperature-plot" class="temperature-plot"></div>
+				</div>
+				<div  class="content footer">
+						Please visit <a href="http://www.bertos.org">www.berots.org</a> for more info
+				</div>
+			</div>
+		</div>
+
+	</body>
+</html>