Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result
[oweals/luci.git] / applications / luci-app-travelmate / luasrc / view / travelmate / wifi_scan.htm
index 44606da60a6fcdfb7edb8a7a7f5bf1647973cdc8..86846a57104f10d88d9d161460a37a3ea89ed248 100644 (file)
@@ -1,89 +1,99 @@
 <%#
-Copyright 2017 Dirk Brenken (dev@brenken.org)
+Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
 This is free software, licensed under the Apache License, Version 2.0
 -%>
 
 <%-
-    local sys = require "luci.sys"
-    local utl = require "luci.util"
-    local dev = luci.http.formvalue("device")
-    local iw = luci.sys.wifi.getiwinfo(dev)
+       local sys   = require("luci.sys")
+       local utl   = require("luci.util")
+       local dev   = luci.http.formvalue("device")
+       local iw    = luci.sys.wifi.getiwinfo(dev)
+       local label = {translate("WPA"), translate("WPA2"), translate("WPA/WPA2")}
 
-    if not iw then
-        luci.http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))
-    end
+       if not iw then
+               luci.http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))
+       end
 
-    function format_wifi_encryption(info)
-        if info.wep == true then
-            return translate("WEP")
-        elseif info.wpa > 0 then
-            return translate("WPA / WPA2")
-        elseif info.enabled then
-            return translate("Unknown")
-        else
-            return translate("Open")
-        end
-    end
+       function format_wifi_encryption(info)
+               if info.wep == true then
+                       return translate("WEP")
+               elseif info.wpa > 0 then
+                       return "%s (%s/%s)" %{label[info.wpa] or translate("Unknown"), table.concat(info.auth_suites), table.concat(info.group_ciphers)}
+               elseif info.enabled then
+                       return translate("Unknown")
+               else
+                       return translate("Open")
+               end
+       end
 
-    function percent_wifi_signal(info)
-        local qc = info.quality or 0
-        local qm = info.quality_max or 0
-        if info.bssid and qc > 0 and qm > 0 then
-            return math.floor((100 / qm) * qc)
-        else
-            return 0
-        end
-    end
+       function percent_wifi_signal(info)
+               local qc = info.quality or 0
+               local qm = info.quality_max or 0
+               if info.bssid and qc > 0 and qm > 0 then
+                       return math.floor((100 / qm) * qc)
+               else
+                       return 0
+               end
+       end
 -%>
 
 <%+header%>
 
 <div class="cbi-map">
-<h2 name="content"><%:Wireless Scan%></h2>
-    <fieldset class="cbi-section">
-        <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"><%: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) do%>
-            <tr class="cbi-section-table-row cbi-rowstyle-4">
-                <td class="cbi-value-field" style="text-align:left">
-                    <strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong>
-                </td>
-                <td class="cbi-value-field" style="text-align:left">
-                    <%=format_wifi_encryption(net.encryption)%>
-                </td>
-                <td class="cbi-value-field" style="text-align:left">
-                    <%=percent_wifi_signal(net)%> %
-                </td>
-                <td class="cbi-value-field" style="width:120px; text-align:right">
-                    <form class="inline" action="<%=url('admin/services/travelmate/wifiadd')%>" method="post">
-                        <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="wep" value="<%=net.encryption.wep and 1 or 0%>" />
-                        <% if net.encryption.wpa then %>
-                        <input type="hidden" name="wpa_version" value="<%=net.encryption.wpa%>" />
-                        <% for _, v in ipairs(net.encryption.auth_suites) do %><input type="hidden" name="wpa_suites" value="<%=v%>" />
-                        <% end; end %>
-                        <input class="cbi-button cbi-button-apply" style="width:110px" type="submit" value="<%:Add Uplink%>" />
-                    </form>
-                </td>
-            </tr>
-            <% end %>
-        </table>
-    </fieldset>
-<div class="cbi-page-actions right">
-    <form class="inline" action="<%=url('admin/services/travelmate/stations')%>" method="post">
-        <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>" />
-    </form>
-    <form class="inline" action="<%=url('admin/services/travelmate/wifiscan')%>" method="post">
-        <input type="hidden" name="token" value="<%=token%>" />
-        <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
-        <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>" />
-    </form>
+       <h3><%:Wireless Scan%></h3>
+       <div class="cbi-section">
+               <div class="table cbi-section-table">
+                       <div class="tr cbi-section-table-titles">
+                               <div class="th left"><%:Uplink SSID%></div>
+                               <div class="th left"><%:Uplink BSSID%></div>
+                               <div class="th left"><%:Encryption%></div>
+                               <div class="th left"><%:Signal strength%></div>
+                               <div class="th center"><%:Action%></div>
+                       </div>
+                       <%- for i, net in ipairs(iw.scanlist or { }) do -%>
+                       <div class="tr cbi-section-table-row cbi-rowstyle-1">
+                               <div class="td left" style="text-align: left !important">
+                                       <%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%>
+                               </div>
+                               <div class="td left" style="text-align: left !important">
+                                       <%=net.bssid and utl.pcdata(net.bssid)%>
+                               </div>
+                               <div class="td left" style="text-align: left !important">
+                                       <%=format_wifi_encryption(net.encryption)%>
+                               </div>
+                               <div class="td left" style="text-align: left !important">
+                                       <%=percent_wifi_signal(net)%> %
+                               </div>
+                               <div class="td cbi-section-actions">
+                                       <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiadd')%>" method="post">
+                                               <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%>"/>
+                                                       <%- for _, v in ipairs(net.encryption.auth_suites) do -%>
+                                                               <input type="hidden" name="wpa_suites" value="<%=v%>"/>
+                                                       <%- end -%>
+                                               <%- end -%>
+                                               <input class="cbi-button cbi-button-apply" type="submit" value="<%:Add Uplink%>"/>
+                                       </form>
+                               </div>
+                       </div>
+                       <%- end -%>
+               </div>
+       </div>
+       <div class="cbi-page-actions right">
+               <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/stations')%>" method="get">
+                       <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/>
+               </form>
+               <form class="inline" action="<%=luci.dispatcher.build_url('admin/services/travelmate/wifiscan')%>" method="post">
+                       <input type="hidden" name="token" value="<%=token%>"/>
+                       <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/>
+                       <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>"/>
+               </form>
+       </div>
 </div>
 
 <%+footer%>