X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fwifi_status.htm;h=475b88a0071da7f0b2a940ac1734fee7333526f7;hp=8c50843ad34b838d6103216faef04e6f1a12d9af;hb=c7cf8ef8c14dce298b26185355b9ca2e458b7a92;hpb=e75c0911a3596be125c9eed1b53271e86546f6d1

diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
index 8c50843ad..475b88a00 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm
@@ -1,16 +1,15 @@
 <%+cbi/valueheader%>
 
-<script type="text/javascript"><![CDATA[
+<script type="text/javascript">//<![CDATA[
 	var iwxhr = new XHR();
-	(function() {
+	var update_status = function() {
 		iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "wireless_status", self.ifname)%>', null,
-			function(x)
+			function(x, iw)
 			{
-				var iw = x.responseText ? eval('(' + x.responseText + ')') : null;
 				if (iw && (iw = iw[0]))
 				{
-					var is_assoc = (iw.bssid && iw.channel);
-					var p = (100 / iw.quality_max * iw.quality);
+					var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel);
+					var p = iw.quality;
 					var q = is_assoc ? p : -1;
 
 					var icon;
@@ -30,7 +29,7 @@
 					var s = document.getElementById('<%=self.option%>-iw-signal');
 					if (s)
 						s.innerHTML = String.format(
-							'<img src="%s" title="<%:Signal%>: %d dBm / <%Noise%>: %d dBm" /><br />' +
+							'<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" /><br />' +
 							'<small>%d%%</small>', icon, iw.signal, iw.noise, p
 						);
 
@@ -38,7 +37,7 @@
 					if (d && is_assoc)
 						d.innerHTML = String.format(
 							'<strong><%:Mode%>:</strong> %s | ' +
-							'<strong><%:SSID%>:</strong> %s<br />' +
+							'<strong><%:SSID%>:</strong> %h<br />' +
 							'<strong><%:BSSID%>:</strong> %s | ' +
 							'<strong><%:Encryption%>:</strong> %s<br />' +
 							'<strong><%:Channel%>:</strong> %d (%.3f GHz) | ' +
@@ -48,20 +47,27 @@
 							'<strong><%:Bit Rate%>:</strong> %.1f MBit/s | ' +
 							'<strong><%:Country%>:</strong> %s',
 								iw.mode, iw.ssid, iw.bssid,
-								iw.encryption ? iw.encryption.description : '<%:None%>',
-								iw.channel, iw.frequency ? (iw.frequency / 1000) : 0,
+								iw.encryption ? iw.encryption : '<%:None%>',
+								iw.channel, iw.frequency ? iw.frequency : 0,
 								iw.txpower, iw.signal, iw.noise,
-								iw.bitrate ? (iw.bitrate / 1000) : 0, iw.country
+								iw.bitrate ? iw.bitrate : 0, iw.country
 						);
 					else if (d)
-						d.innerHTML = '<%:Wireless is disabled or not associated%>';
+						d.innerHTML = String.format(
+							'<strong><%:SSID%>:</strong> %h | ' +
+							'<strong><%:Mode%>:</strong> %s<br />' +
+							'<em><%:Wireless is disabled or not associated%></em>',
+								iw.ssid || '?', iw.mode
+						);
 				}
+
+				window.setTimeout(update_status, 5000);
 			}
 		)
+	};
 
-		window.setTimeout(arguments.callee, 5000);
-	})();
-]]></script>
+	update_status();
+//]]></script>
 
 <table>
 	<tr class="cbi-section-table">