luci-app-travelmate: bugfixes

[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 e79fb0c..d8ca966 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@ -3,7 +3,6 @@ Copyright 2017 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()
@@ -14,20 +13,25 @@ This is free software, licensed under the Apache License, Version 2.0
 
 <div class="cbi-map">
 <h2 name="content"><%:Wireless Stations%></h2>
-<div class="cbi-map-descr"><%:Provides an overview of all configured uplink interfaces for travelmate. You can edit and delete existing interfaces or scan for new uplinks.%></div>
+<div class="cbi-map-descr">
+  <%=translatef("Provides an overview of all configured uplinks for the travelmate interface (%s). You can edit, delete or re-order existing uplinks or scan for a new one. The currently used uplink is emphasized in blue.", trmiface)%>
+</div>
 
 <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"><%:Device%></th>
-      <th class="cbi-section-table-cell" style="text-align:left"><%:Mode%></th>
-      <th class="cbi-section-table-cell" style="text-align:left"><%:Uplink Interface%></th>
       <th class="cbi-section-table-cell" style="text-align:left"><%: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"><%:Disabled%></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 ""
@@ -35,18 +39,23 @@ This is free software, licensed under the Apache License, Version 2.0
     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
 %>
-    <tr class="cbi-section-table-row cbi-rowstyle-6"> 
+    <tr class="cbi-section-table-row cbi-rowstyle-1" style="<%=style%>">
       <td style="text-align:left"><%=device%></td>
-      <td style="text-align:left"><%=mode%></td>
-      <td style="text-align:left"><%=iface%></td>
       <td style="text-align:left"><%=ssid%></td>
       <td style="text-align:left"><%=encryption%></td>
-      <td style="text-align:left"><%=disabled%></td>
-      <td class="cbi-value-field" style="width:200px;text-align:right">
-        <input type="button" class="cbi-button cbi-button-edit" style="width:85px" 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" style="width:85px" onclick="location.href='<%=url('admin/services/travelmate/wifidelete')%>?cfg=<%=section%>'" title="<%:Delete this Uplink%>" value="<%:Delete%>"/>
+      <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>
+      <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>
     </tr>
 <% 
@@ -61,13 +70,14 @@ This is free software, licensed under the Apache License, Version 2.0
     local device = s[".name"]
 %>
   <form class="inline" action="<%=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" style="width:110px" 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%>"/>
   </form>
 <%
   end)
 %>
 </div>
+</div>
 
 <%+footer%>