projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1468 from dibdot/travelmate
[project/luci.git]
/
applications
/
luci-app-travelmate
/
luasrc
/
view
/
travelmate
/
stations.htm
diff --git
a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index
cbb6c18
..
11c36d4
100644
(file)
--- a/
applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/
applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@
-4,8
+4,8
@@
This is free software, licensed under the Apache License, Version 2.0
-%>
<%-
-%>
<%-
- local write = io.write
- local uci = require("luci.model.uci").cursor()
+ local write
= io.write
+ local uci
= require("luci.model.uci").cursor()
local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan"
-%>
local trmiface = uci:get("travelmate", "global", "trm_iface") or "trm_wwan"
-%>
@@
-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>
<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>
<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>
@@
-30,9
+31,10
@@
This is free software, licensed under the Apache License, Version 2.0
local iface = s.network or ""
if iface == trmiface then
local section = s['.name'] or ""
local iface = s.network or ""
if iface == trmiface then
local section = s['.name'] or ""
- local device = s.device or ""
- local ssid = s.ssid or ""
- local encryption = s.encryption 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"
if disabled == "0" then
local disabled = s.disabled or ""
local style = "color:#000000"
if disabled == "0" then
@@
-42,14
+44,15
@@
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>
<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">
<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='<%=url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=up'" alt="<%:Move up%>" title="<%:Move up%>"/>
- <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
+ <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%>"/>
+ <input class="cbi-button cbi-button-down" type="button" value="" onclick="location.href='<%=
luci.dispatcher.build_
url('admin/services/travelmate/wifiorder')%>?cfg=<%=section%>;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
</td>
<td class="cbi-value-field" style="width:150px;text-align:right">
</td>
<td class="cbi-value-field" style="width:150px;text-align:right">
- <input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/>
- <input type="button" class="cbi-button cbi-button-remove" onclick="location.href='<%=url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/>
+ <input type="button" class="cbi-button cbi-button-edit" onclick="location.href='<%=
luci.dispatcher.build_
url('admin/services/travelmate/wifiedit')%>?cfg=<%=section%>'" title="<%:Edit this Uplink%>" value="<%:Edit%>"/>
+ <input type="button" class="cbi-button cbi-button-remove" onclick="location.href='<%=
luci.dispatcher.build_
url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/>
</td>
</tr>
<%
</td>
</tr>
<%
@@
-63,7
+66,7
@@
This is free software, licensed under the Apache License, Version 2.0
uci:foreach("wireless", "wifi-device", function(s)
local device = s[".name"]
%>
uci:foreach("wireless", "wifi-device", function(s)
local device = s[".name"]
%>
- <form class="inline" action="<%=url('admin/services/travelmate/wifiscan')%>" method="post">
+ <form class="inline" action="<%=
luci.dispatcher.build_
url('admin/services/travelmate/wifiscan')%>" method="post">
<input type="hidden" name="device" value="<%=device%>"/>
<input type="hidden" name="token" value="<%=token%>"/>
<input type="submit" class="cbi-button cbi-button-find" title="<%:Find and join network on %><%=device%>" value="<%:Scan %><%=device%>"/>
<input type="hidden" name="device" value="<%=device%>"/>
<input type="hidden" name="token" value="<%=token%>"/>
<input type="submit" class="cbi-button cbi-button-find" title="<%:Find and join network on %><%=device%>" value="<%:Scan %><%=device%>"/>