From 4fee871630dec3b6bfbfb6dadc1580f0e3edf830 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 3 May 2021 10:55:38 +0200 Subject: luci-app-mwan3: update status page for no tracked interfaces Signed-off-by: Florian Eckert --- .../luasrc/view/mwan/overview_status_interface.htm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm index 468aa12b41..9a4d85a706 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm @@ -46,6 +46,20 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface ); css = 'danger'; break; + case 'notracking': + state = '<%:No Tracking%>'; + if ((status.interfaces[iface].uptime) > 0) { + time = String.format( + '
Uptime: %s
', + secondsToString(status.interfaces[iface].uptime) + ); + css = 'success'; + } + else { + time = '
 
' + css = 'warning'; + } + break; default: state = '<%:Disabled%>'; time = '
 
' -- cgit v1.2.3 From 2b0fbcb0c88fb073745ec99974c12f363b771ac2 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 6 May 2021 11:22:02 +0200 Subject: luci-app-mwan3: add i18n to status page Signed-off-by: Florian Eckert --- .../luasrc/view/mwan/overview_status_interface.htm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm index 9a4d85a706..ee746a00bb 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm @@ -33,7 +33,7 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface case 'online': state = '<%:Online%>'; time = String.format( - '
Uptime: %s
', + '
<%:Uptime%>: %s
', secondsToString(status.interfaces[iface].online) ); css = 'success'; @@ -41,7 +41,7 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface case 'offline': state = '<%:Offline%>'; time = String.format( - '
Downtime: %s
', + '
<%:Downtime%>: %s
', secondsToString(status.interfaces[iface].offline) ); css = 'danger'; @@ -50,7 +50,7 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface state = '<%:No Tracking%>'; if ((status.interfaces[iface].uptime) > 0) { time = String.format( - '
Uptime: %s
', + '
<%:Uptime%>: %s
', secondsToString(status.interfaces[iface].uptime) ); css = 'success'; @@ -71,11 +71,11 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface css ); statusview += String.format( - '
Interface: %s
', + '
<%:Interface%>: %s
', iface ); statusview += String.format( - '
Status: %s
', + '
<%:Status%>: %s
', state ); if (time) -- cgit v1.2.3 From 6fa40fffcaa6015633e1e7426ff1f0bae61597c9 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 6 May 2021 11:44:57 +0200 Subject: luci-app-mwan3: fix css status with This commit fixes the width of the mwan3 status page for the openwrt-2020 theme. Signed-off-by: Florian Eckert --- .../luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm index ee746a00bb..b3210ee137 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm @@ -99,7 +99,7 @@ XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface display: inline-block; margin: 1rem; padding: 1rem; - width: 10rem; + width: 15rem; float: left; line-height: 125%; } -- cgit v1.2.3