From db4139b1491a0ca7ba7897208d49be126c368ae9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 19 Jun 2018 17:18:36 +0200 Subject: [PATCH] luci-app-travelmate: consolidate markup Rework the various application view templates to properly render with the latest responsive design changes. Signed-off-by: Jo-Philipp Wich --- .../luasrc/view/travelmate/logread.htm | 4 +-- .../luasrc/view/travelmate/stations.htm | 28 ++++++++-------- .../luasrc/view/travelmate/wifi_scan.htm | 32 ++++++++++--------- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm index 6cbeaffde6..c40bdeeb59 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm @@ -6,10 +6,10 @@ This is free software, licensed under the Apache License, Version 2.0 <%+header%>
-
+
<%:This form shows the syslog output, pre-filtered for travelmate related messages only.%>
-
+
+
<%=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)%>
-
-
+
+
-
<%:Device%>
-
<%:SSID%>
-
<%:BSSID%>
-
<%:Encryption%>
-
<%:Actions%>
+
<%:Device%>
+
<%:SSID%>
+
<%:BSSID%>
+
<%:Encryption%>
+
 
<% uci:foreach("wireless", "wifi-iface", function(s) @@ -45,11 +47,9 @@ This is free software, licensed under the Apache License, Version 2.0
<%=ssid%>
<%=bssid%>
<%=encryption%>
-
- - -
-
+
+ +
@@ -59,7 +59,7 @@ This is free software, licensed under the Apache License, Version 2.0 end) %>
-
+
<% uci:foreach("wireless", "wifi-device", function(s) @@ -68,7 +68,7 @@ This is free software, licensed under the Apache License, Version 2.0
- +
<% end) 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 81182b99b4..57efd97376 100644 --- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm @@ -39,31 +39,33 @@ This is free software, licensed under the Apache License, Version 2.0 <%+header%> + +

<%:Wireless Scan%>

-
-
+
+
-
<%:Uplink SSID%>
-
<%:Uplink BSSID%>
-
<%:Encryption%>
-
<%:Signal strength%>
+
<%:Uplink SSID%>
+
<%:Uplink BSSID%>
+
<%:Encryption%>
+
<%:Signal strength%>
<% for i, net in ipairs(iw.scanlist or { }) do %>
-
+
<%=net.ssid and utl.pcdata(net.ssid) or "%s" % translate("hidden")%>
-
+
<%=net.bssid and utl.pcdata(net.bssid)%>
-
+
<%=format_wifi_encryption(net.encryption)%>
-
+
<%=percent_wifi_signal(net)%> %
-
+
@@ -80,16 +82,16 @@ This is free software, licensed under the Apache License, Version 2.0
<% end %>
-
+
+ + +
-
- -
-- 2.30.2