luci-app-travelmate: sync with travelmate 0.9.5

[project/luci.git] / applications / luci-app-travelmate / luasrc / view / travelmate / wifi_scan.htm

diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
index 053b4ba..68ca63f 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
@@ -17,7 +17,7 @@ This is free software, licensed under the Apache License, Version 2.0
         if info.wep == true then
             return translate("WEP")
         elseif info.wpa > 0 then
-            return translate("WPA / WPA2")
+            return translate("WPA/WPA2 - " .. table.concat(info.auth_suites))
         elseif info.enabled then
             return translate("Unknown")
         else
@@ -28,7 +28,7 @@ This is free software, licensed under the Apache License, Version 2.0
     function percent_wifi_signal(info)
         local qc = info.quality or 0
         local qm = info.quality_max or 0
-        if info.ssid and qc > 0 and qm > 0 then
+        if info.bssid and qc > 0 and qm > 0 then
             return math.floor((100 / qm) * qc)
         else
             return 0
@@ -44,13 +44,17 @@ This is free software, licensed under the Apache License, Version 2.0
         <table class="cbi-section-table" style="empty-cells:hide">
             <tr class="cbi-section-table-titles">
                 <th class="cbi-section-table-cell" style="text-align:left"><%:Uplink SSID%></th>
+                <th class="cbi-section-table-cell" style="text-align:left"><%:Uplink BSSID%></th>
                 <th class="cbi-section-table-cell" style="text-align:left"><%:Encryption%></th>
                 <th class="cbi-section-table-cell" style="text-align:left" colspan="2"><%:Signal strength%></th>
             </tr>
             <% for i, net in ipairs(iw.scanlist or { }) do %>
             <tr class="cbi-section-table-row cbi-rowstyle-1">
                 <td class="cbi-value-field" style="text-align:left">
-                    <strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong>
+                    <%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%>
+                </td>
+                <td class="cbi-value-field" style="text-align:left">
+                    <%=net.bssid and utl.pcdata(net.bssid)%>
                 </td>
                 <td class="cbi-value-field" style="text-align:left">
                     <%=format_wifi_encryption(net.encryption)%>
@@ -63,6 +67,7 @@ This is free software, licensed under the Apache License, Version 2.0
                         <input type="hidden" name="token" value="<%=token%>"/>
                         <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/>
                         <input type="hidden" name="ssid" value="<%=utl.pcdata(net.ssid)%>"/>
+                        <input type="hidden" name="bssid" value="<%=utl.pcdata(net.bssid)%>"/>
                         <input type="hidden" name="wep" value="<%=net.encryption.wep and 1 or 0%>"/>
                         <% if net.encryption.wpa then %>
                         <input type="hidden" name="wpa_version" value="<%=net.encryption.wpa%>"/>