From 0453e50932ab03c172ef18727673a2d874d93c52 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 23 Feb 2012 17:15:50 +0000 Subject: [PATCH] modules/admin-full: display wifi rates in assoclist tables --- .../view/admin_network/wifi_overview.htm | 32 +++++++++++++------ .../luasrc/view/admin_status/index.htm | 32 +++++++++++++++---- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm index 046b769566..22d27cb1cd 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -213,13 +213,13 @@ $Id$ { if (is_assoc) { - toggle.style.backgroundImage = 'url(<%=resource%>/cbi/reset.gif)'; + toggle.className = 'cbi-button cbi-button-reset'; toggle.value = '<%:Disable%>'; toggle.title = '<%:Shutdown this network%>'; } else { - toggle.style.backgroundImage = 'url(<%=resource%>/cbi/reload.gif)'; + toggle.className = 'cbi-button cbi-button-reload'; toggle.value = '<%:Enable%>'; toggle.title = '<%:Activate this network%>'; } @@ -309,6 +309,16 @@ $Id$ tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].signal); tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].noise); + tr.insertCell(-1).innerHTML = (assoclist[j].rx_mcs > -1) + ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[j].rx_rate / 1000, assoclist[j].rx_mcs, assoclist[j].rx_40mhz ? 40 : 20) + : String.format('%.1f Mbit/s', assoclist[j].rx_rate / 1000) + ; + + tr.insertCell(-1).innerHTML = (assoclist[j].tx_mcs > -1) + ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[j].tx_rate / 1000, assoclist[j].tx_mcs, assoclist[j].tx_40mhz ? 40 : 20) + : String.format('%.1f Mbit/s', assoclist[j].tx_rate / 1000) + ; + rowstyle = (rowstyle == 1) ? 2 : 1; } } @@ -320,7 +330,7 @@ $Id$ tr.className = 'cbi-section-table-row'; var td = tr.insertCell(-1); - td.colSpan = 6; + td.colSpan = 8; td.innerHTML = '
<%:No information available%>'; } @@ -357,8 +367,8 @@ $Id$ - ?device=<%=dev:name()%>'" title="<%:Find and join network%>" value="<%:Scan%>" /> - ?device=<%=dev:name()%>'" title="<%:Provide new network%>" value="<%:Add%>" /> + ?device=<%=dev:name()%>'" title="<%:Find and join network%>" value="<%:Scan%>" /> + ?device=<%=dev:name()%>'" title="<%:Provide new network%>" value="<%:Add%>" /> @@ -376,9 +386,9 @@ $Id$ <%:Collecting data...%> - - - '" title="<%:Delete this network%>" value="<%:Remove%>" /> + + + '" title="<%:Delete this network%>" value="<%:Remove%>" /> <% end %> @@ -400,7 +410,7 @@ $Id$

<%:Associated Stations%>

- +
@@ -408,9 +418,11 @@ $Id$ + + - diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm index 1228fdf8d0..e54ee9a9a3 100644 --- a/modules/admin-full/luasrc/view/admin_status/index.htm +++ b/modules/admin-full/luasrc/view/admin_status/index.htm @@ -342,11 +342,17 @@ $Id$ for (var bssid in net.assoclist) { assoclist.push({ - bssid: bssid, - signal: net.assoclist[bssid].signal, - noise: net.assoclist[bssid].noise, - link: net.link, - name: net.name + bssid: bssid, + signal: net.assoclist[bssid].signal, + noise: net.assoclist[bssid].noise, + rx_rate: net.assoclist[bssid].rx_rate, + rx_mcs: net.assoclist[bssid].rx_mcs, + rx_40mhz: net.assoclist[bssid].rx_40mhz, + tx_rate: net.assoclist[bssid].tx_rate, + tx_mcs: net.assoclist[bssid].tx_mcs, + tx_40mhz: net.assoclist[bssid].tx_40mhz, + link: net.link, + name: net.name }); } } @@ -405,6 +411,16 @@ $Id$ tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[i].signal); tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[i].noise); + + tr.insertCell(-1).innerHTML = (assoclist[i].rx_mcs > -1) + ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[i].rx_rate / 1000, assoclist[i].rx_mcs, assoclist[i].rx_40mhz ? 40 : 20) + : String.format('%.1f Mbit/s', assoclist[i].rx_rate / 1000) + ; + + tr.insertCell(-1).innerHTML = (assoclist[i].tx_mcs > -1) + ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[i].tx_rate / 1000, assoclist[i].tx_mcs, assoclist[i].tx_40mhz ? 40 : 20) + : String.format('%.1f Mbit/s', assoclist[i].tx_rate / 1000) + ; } if (ac.rows.length == 1) @@ -413,7 +429,7 @@ $Id$ tr.className = 'cbi-section-table-row'; var td = tr.insertCell(-1); - td.colSpan = 5; + td.colSpan = 7; td.innerHTML = '
<%:No information available%>'; } } @@ -548,9 +564,11 @@ $Id$ + + - +
<%:SSID%><%:Address%> <%:Signal%> <%:Noise%><%:RX Rate%><%:TX Rate%>
+ <%:Collecting data...%>
<%:Network%> <%:Signal%> <%:Noise%><%:RX Rate%><%:TX Rate%>

<%:Collecting data...%>
<%:Collecting data...%>
-- 2.30.2