diff options
Diffstat (limited to 'applications/luci-app-travelmate/luasrc/view')
3 files changed, 14 insertions, 3 deletions
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm index 53493a18f..2233a15e3 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm @@ -6,5 +6,8 @@ font-size: 12px; font-family: monospace; resize: none; + white-space: pre; + overflow-wrap: normal; + overflow-x: scroll; } </style> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm index 51db2861e..402b1c15c 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm @@ -22,6 +22,7 @@ This is free software, licensed under the Apache License, Version 2.0 <tr class="cbi-section-table-titles"> <th class="cbi-section-table-cell" style="text-align:left"><%:Device%></th> <th class="cbi-section-table-cell" style="text-align:left"><%:SSID%></th> + <th class="cbi-section-table-cell" style="text-align:left"><%:BSSID%></th> <th class="cbi-section-table-cell" style="text-align:left"><%:Encryption%></th> <th class="cbi-section-table-cell" style="text-align:center" colspan="2"><%:Actions%></th> </tr> @@ -32,6 +33,7 @@ This is free software, licensed under the Apache License, Version 2.0 local section = s['.name'] or "" local device = s.device or "" local ssid = s.ssid or "" + local bssid = s.bssid or "" local encryption = s.encryption or "" local disabled = s.disabled or "" local style = "color:#000000" @@ -42,6 +44,7 @@ This is free software, licensed under the Apache License, Version 2.0 <tr class="cbi-section-table-row cbi-rowstyle-1" style="<%=style%>"> <td style="text-align:left"><%=device%></td> <td style="text-align:left"><%=ssid%></td> + <td style="text-align:left"><%=bssid%></td> <td style="text-align:left"><%=encryption%></td> <td class="cbi-value-field" style="width:70px;text-align:right"> <input class="cbi-button cbi-button-up" type="button" value="" onclick="location.href='<%=luci.dispatcher.build_url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/> 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 053b4baca..68ca63f45 100644 --- 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%>"/> |