modules/admin-full: new interface overview page, other template changes

[project/luci.git] / modules / admin-full / luasrc / view / admin_network / wifi_overview.htm

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 20f0e8d..d23a085 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -99,9 +99,8 @@ $Id$
 
        (function() {
                iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "wireless_status", table.concat(netlist, ","))%>', null,
-                       function(x)
+                       function(x, st)
                        {
-                               var st = x.responseText ? eval('(' + x.responseText + ')') : null;
                                if (st)
                                {
                                        var assoctable = document.getElementById('iw-assoclist');
@@ -109,11 +108,14 @@ $Id$
                                                while (assoctable.rows.length > 1)
                                                        assoctable.rows[1].parentNode.removeChild(assoctable.rows[1]);
 
+                                       var devup = { };
+
                                        for( var i = 0; i < st.length; i++ )
                                        {
                                                var iw = st[i];
+                                               var is_assoc = (iw.bssid && iw.channel);
                                                var p = (100 / iw.quality_max * iw.quality);
-                                               var q = (iw.bssid && iw.channel) ? p : -1;
+                                               var q = is_assoc ? p : -1;
 
                                                var icon;
                                                if (q < 0)
@@ -129,6 +131,9 @@ $Id$
                                                else
                                                        icon = "<%=resource%>/icons/signal-75-100.png";
 
+                                               if (!devup[wifidevs[iw.id]])
+                                                       devup[wifidevs[iw.id]] = is_assoc;
+
                                                var sig = document.getElementById(iw.id + '-iw-signal');
                                                if (sig)
                                                        sig.innerHTML = String.format(
@@ -138,24 +143,34 @@ $Id$
 
                                                var info = document.getElementById(iw.id + '-iw-status');
                                                if (info)
-                                                       info.innerHTML = String.format(
-                                                               '<strong><%:SSID%>:</strong> %s | ' +
-                                                               '<strong><%:Mode%>:</strong> %s<br />' +
-                                                               '<strong><%:BSSID%>:</strong> %s | ' +
-                                                               '<strong><%:Encryption%>:</strong> %s',
-                                                                       iw.ssid, iw.mode, iw.bssid,
-                                                                       iw.encryption ? iw.encryption.description : '<%:None%>'
-                                                       );
+                                               {
+                                                       if (is_assoc)
+                                                               info.innerHTML = String.format(
+                                                                       '<strong><%:SSID%>:</strong> %s | ' +
+                                                                       '<strong><%:Mode%>:</strong> %s<br />' +
+                                                                       '<strong><%:BSSID%>:</strong> %s | ' +
+                                                                       '<strong><%:Encryption%>:</strong> %s',
+                                                                               iw.ssid, iw.mode, iw.bssid,
+                                                                               iw.encryption ? iw.encryption.description : '<%:None%>'
+                                                               );
+                                                       else
+                                                               info.innerHTML = '<em><%:Wireless is disabled or not associated%></em>';
+                                               }
 
                                                var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo');
                                                if (dev)
-                                                       dev.innerHTML = String.format(
-                                                               '<strong><%:Channel%>:</strong> %s (%s GHz) | ' +
-                                                               '<strong><%:Bitrate%>:</strong> %s Mb/s',
-                                                                       iw.channel ? iw.channel : '?',
-                                                                       iw.frequency ? iw.frequency / 1000 : '?',
-                                                                       iw.bitrate ? iw.bitrate / 1000 : '?'
-                                                       );
+                                               {
+                                                       if (is_assoc)
+                                                               dev.innerHTML = String.format(
+                                                                       '<strong><%:Channel%>:</strong> %s (%s GHz) | ' +
+                                                                       '<strong><%:Bitrate%>:</strong> %s Mb/s',
+                                                                               iw.channel ? iw.channel : '?',
+                                                                               iw.frequency ? iw.frequency / 1000 : '?',
+                                                                               iw.bitrate ? iw.bitrate / 1000 : '?'
+                                                               );
+                                                       else
+                                                               dev.innerHTML = '';
+                                               }
 
                                                if (assoctable)
                                                {
@@ -218,6 +233,13 @@ $Id$
 
                                                assoctable.rows[0].parentNode.appendChild(tr);
                                        }
+
+                                       for (var dev in devup)
+                                       {
+                                               var img = document.getElementById(dev + '-iw-upstate');
+                                               if (img)
+                                                       img.src = '<%=resource%>/icons/wifi' + (devup[dev] ? '' : '_disabled') + '.png';
+                                       }
                                }
                        }
                )
@@ -236,14 +258,14 @@ $Id$
                <table class="cbi-section-table" style="margin:10px; empty-cells:hide">
                        <!-- physical device -->
                        <tr>
-                               <td style="width:34px"><img src="<%=resource%>/icons/wifi<%=dev:is_up() and "" or "_disabled"%>.png" style="float:left; margin-right:10px" /></td>
+                               <td style="width:34px"><img src="<%=resource%>/icons/wifi_disabled.png" style="float:left; margin-right:10px" id="<%=dev:name()%>-iw-upstate" /></td>
                                <td colspan="2" style="text-align:left">
                                        <big><strong><%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>)</strong></big><br />
                                        <span id="<%=dev:name()%>-iw-devinfo"></span>
                                </td>
                                <td style="width:40px">
-                                       <a href="<%=luci.dispatcher.build_url("admin/network/wireless_join?device="..dev:name())%>"><img style="border:none" src="<%=resource%>/cbi/find.gif" alt="Find and join network" title="Find and join network" /></a>
-                                       <a href="<%=luci.dispatcher.build_url("admin/network/wireless_add?device="..dev:name())%>"><img style="border:none" src="<%=resource%>/cbi/add.gif" alt="Provide new network" title="Provide new network" /></a>
+                                       <a href="<%=luci.dispatcher.build_url("admin/network/wireless_join")%>?device=<%=dev:name()%>"><img style="border:none" src="<%=resource%>/cbi/find.gif" alt="<%:Find and join network%>" title="<%:Find and join network%>" /></a>
+                                       <a href="<%=luci.dispatcher.build_url("admin/network/wireless_add")%>?device=<%=dev:name()%>"><img style="border:none" src="<%=resource%>/cbi/add.gif" alt="<%:Provide new network%>" title="<%:Provide new network%>" /></a>
                                </td>
                        </tr>
                        <!-- /physical device -->
@@ -261,8 +283,8 @@ $Id$
                                                <em><%:Collecting data...%></em>
                                        </td>
                                        <td class="cbi-value-field" style="width:40px">
-                                               <a href="<%=net:adminlink()%>"><img style="border:none" src="<%=resource%>/cbi/edit.gif" alt="Edit this network" title="Edit this network" /></a>
-                                               <a href="<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>"><img style="border:none" src="<%=resource%>/cbi/remove.gif" alt="Delete this network" title="Delete this network" /></a>
+                                               <a href="<%=net:adminlink()%>"><img style="border:none" src="<%=resource%>/cbi/edit.gif" alt="<%:Edit this network%>" title="<%:Edit this network%>" /></a>
+                                               <a href="<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>"><img style="border:none" src="<%=resource%>/cbi/remove.gif" alt="<%:Delete this network%>" title="<%:Delete this network%>" /></a>
                                        </td>
                                </tr>
                                <% end %>
@@ -270,7 +292,7 @@ $Id$
                                <tr class="cbi-section-table-row cbi-rowstyle-2">
                                        <td></td>
                                        <td colspan="3" class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
-                                               <em>(No network configured on this device)</em>
+                                               <em><%:No network configured on this device%></em>
                                        </td>
                                </tr>
                        <% end %>