From d8d03b2ca30baf245d449fede963615f6b383248 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Mon, 28 Jun 2021 21:53:41 +0800 Subject: [PATCH] update status --- luci-app-status/Makefile | 0 .../luci-static/resources/status/css/wanstatus.css | 0 .../resources/status/images/status-doing.png | Bin .../resources/status/images/status-done.png | Bin .../resources/status/images/status-error.png | Bin .../resources/status/images/status-todo.png | Bin .../resources/status/images/status-warn.png | Bin .../resources/status/images/statusError.png | Bin .../resources/status/images/statusOK.png | Bin .../resources/status/images/statusWarning.png | Bin luci-app-status/luasrc/controller/status.lua | 5 ++++- luci-app-status/luasrc/view/status/server.htm | 0 luci-app-status/luasrc/view/status/wanstatus.htm | 0 luci-app-status/po/templates/status.pot | 0 luci-app-status/po/zh_Hans/status.po | 0 .../root/usr/share/luci/menu.d/luci-app-status.json | 0 .../root/usr/share/rpcd/acl.d/luci-app-status.json | 0 17 files changed, 4 insertions(+), 1 deletion(-) mode change 100755 => 100644 luci-app-status/Makefile mode change 100755 => 100644 luci-app-status/htdocs/luci-static/resources/status/css/wanstatus.css mode change 100755 => 100644 luci-app-status/htdocs/luci-static/resources/status/images/status-doing.png mode change 100755 => 100644 luci-app-status/htdocs/luci-static/resources/status/images/status-done.png mode change 100755 => 100644 luci-app-status/htdocs/luci-static/resources/status/images/status-error.png mode change 100755 => 100644 luci-app-status/htdocs/luci-static/resources/status/images/status-todo.png mode change 100755 => 100644 luci-app-status/htdocs/luci-static/resources/status/images/status-warn.png mode change 100755 => 100644 luci-app-status/htdocs/luci-static/resources/status/images/statusError.png mode change 100755 => 100644 luci-app-status/htdocs/luci-static/resources/status/images/statusOK.png mode change 100755 => 100644 luci-app-status/htdocs/luci-static/resources/status/images/statusWarning.png mode change 100755 => 100644 luci-app-status/luasrc/controller/status.lua mode change 100755 => 100644 luci-app-status/luasrc/view/status/server.htm mode change 100755 => 100644 luci-app-status/luasrc/view/status/wanstatus.htm mode change 100755 => 100644 luci-app-status/po/templates/status.pot mode change 100755 => 100644 luci-app-status/po/zh_Hans/status.po mode change 100755 => 100644 luci-app-status/root/usr/share/luci/menu.d/luci-app-status.json mode change 100755 => 100644 luci-app-status/root/usr/share/rpcd/acl.d/luci-app-status.json diff --git a/luci-app-status/Makefile b/luci-app-status/Makefile old mode 100755 new mode 100644 diff --git a/luci-app-status/htdocs/luci-static/resources/status/css/wanstatus.css b/luci-app-status/htdocs/luci-static/resources/status/css/wanstatus.css old mode 100755 new mode 100644 diff --git a/luci-app-status/htdocs/luci-static/resources/status/images/status-doing.png b/luci-app-status/htdocs/luci-static/resources/status/images/status-doing.png old mode 100755 new mode 100644 diff --git a/luci-app-status/htdocs/luci-static/resources/status/images/status-done.png b/luci-app-status/htdocs/luci-static/resources/status/images/status-done.png old mode 100755 new mode 100644 diff --git a/luci-app-status/htdocs/luci-static/resources/status/images/status-error.png b/luci-app-status/htdocs/luci-static/resources/status/images/status-error.png old mode 100755 new mode 100644 diff --git a/luci-app-status/htdocs/luci-static/resources/status/images/status-todo.png b/luci-app-status/htdocs/luci-static/resources/status/images/status-todo.png old mode 100755 new mode 100644 diff --git a/luci-app-status/htdocs/luci-static/resources/status/images/status-warn.png b/luci-app-status/htdocs/luci-static/resources/status/images/status-warn.png old mode 100755 new mode 100644 diff --git a/luci-app-status/htdocs/luci-static/resources/status/images/statusError.png b/luci-app-status/htdocs/luci-static/resources/status/images/statusError.png old mode 100755 new mode 100644 diff --git a/luci-app-status/htdocs/luci-static/resources/status/images/statusOK.png b/luci-app-status/htdocs/luci-static/resources/status/images/statusOK.png old mode 100755 new mode 100644 diff --git a/luci-app-status/htdocs/luci-static/resources/status/images/statusWarning.png b/luci-app-status/htdocs/luci-static/resources/status/images/statusWarning.png old mode 100755 new mode 100644 diff --git a/luci-app-status/luasrc/controller/status.lua b/luci-app-status/luasrc/controller/status.lua old mode 100755 new mode 100644 index b1f3dab0a..8cf891974 --- a/luci-app-status/luasrc/controller/status.lua +++ b/luci-app-status/luasrc/controller/status.lua @@ -295,7 +295,10 @@ function multipath_bandwidth() local label = s["label"] local dev = get_device(intname) if dev == "" then - dev = get_device(s["ifname"]) + dev = get_device(s["device"]) + if dev == "" then + dev = get_device(s["ifname"]) + end end local multipath = s["multipath"] or "" if dev ~= "lo" and dev ~= "" then diff --git a/luci-app-status/luasrc/view/status/server.htm b/luci-app-status/luasrc/view/status/server.htm old mode 100755 new mode 100644 diff --git a/luci-app-status/luasrc/view/status/wanstatus.htm b/luci-app-status/luasrc/view/status/wanstatus.htm old mode 100755 new mode 100644 diff --git a/luci-app-status/po/templates/status.pot b/luci-app-status/po/templates/status.pot old mode 100755 new mode 100644 diff --git a/luci-app-status/po/zh_Hans/status.po b/luci-app-status/po/zh_Hans/status.po old mode 100755 new mode 100644 diff --git a/luci-app-status/root/usr/share/luci/menu.d/luci-app-status.json b/luci-app-status/root/usr/share/luci/menu.d/luci-app-status.json old mode 100755 new mode 100644 diff --git a/luci-app-status/root/usr/share/rpcd/acl.d/luci-app-status.json b/luci-app-status/root/usr/share/rpcd/acl.d/luci-app-status.json old mode 100755 new mode 100644