X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-travelmate%2Fluasrc%2Fview%2Ftravelmate%2Fstations.htm;h=ae1ea797a24ef04c6f7a6fe7fb71da6e5094475c;hp=d8ca96607f0f6cb89e355ed63b66f421587d526a;hb=2b200cfa792ab159247243dc2d7e961c10cb1a4d;hpb=4142839e0d3196cf74fdeee80de5e01d84ffb861

diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index d8ca96607..ae1ea797a 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@ -1,11 +1,11 @@
 <%#
-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 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"
 -%>
 
@@ -22,43 +22,40 @@ 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>
 <%
-  local pos = -1
-  uci:foreach("wireless", "wifi-device", function(s)
-    pos = pos + 1
-  end)
   uci:foreach("wireless", "wifi-iface", function(s)
-    pos = pos + 1
-    local section = s['.name']
-    local device = s.device or ""
-    local mode = s.mode or ""
     local iface = s.network or ""
-    local ssid = s.ssid or ""
-    local encryption = s.encryption or ""
-    local disabled = s.disabled or ""
-    local style = "color:#000000"
-    if disabled == "0" then
-      style = "color:#0069d6;font-weight:bold"
-    end
     if iface == trmiface then
+      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 = "text-align:left;color:#000000"
+      if disabled == "0" then
+        style = "text-align:left;color:#0069d6;font-weight:bold"
+      end
 %>
     <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"><%=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%>;pos=<%=pos%>;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%>;pos=<%=pos%>;dir=down'" alt="<%:Move down%>" title="<%:Move down%>"/>
+      <td style="<%=style%>"><%=device%></td>
+      <td style="<%=style%>"><%=ssid%></td>
+      <td style="<%=style%>"><%=bssid%></td>
+      <td style="<%=style%>"><%=encryption%></td>
+      <td class="cbi-value-field" style="width:80px">
+        <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">
-        <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%>"/>
+      <td class="cbi-value-field" style="width:150px">
+        <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>
-<% 
+<%
     end
   end)
 %>
@@ -69,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"]
 %>
-  <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%>"/>