diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/index.lua | 56 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/network.lua | 61 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/view/mini/index.htm | 1 |
3 files changed, 61 insertions, 57 deletions
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/index.lua b/modules/admin-mini/luasrc/model/cbi/mini/index.lua index 950a9319a7..352008e30d 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/index.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/index.lua @@ -44,59 +44,5 @@ f:field(DummyValue, "_systime", translate("m_i_systemtime")).value = f:field(DummyValue, "_uptime", translate("m_i_uptime")).value = luci.tools.webadmin.date_format(tonumber(uptime)) - - -m = Map("network", translate("interfaces")) -m.stateful = true -local netstat = luci.sys.net.deviceinfo() - -m.parse = function() end - -s = m:section(TypedSection, "interface", "") -s.template = "cbi/tblsection" - -function s.filter(self, section) - return section ~= "loopback" and section -end - -hwaddr = s:option(DummyValue, "_hwaddr") -function hwaddr.cfgvalue(self, section) - local ix = self.map:get(section, "ifname") or "" - return luci.fs.readfile("/sys/class/net/" .. ix .. "/address") or "n/a" -end - - -s:option(DummyValue, "ipaddr", translate("ipaddress")) - -s:option(DummyValue, "netmask", translate("netmask")) - - -txrx = s:option(DummyValue, "_txrx") - -function txrx.cfgvalue(self, section) - local ix = self.map:get(section, "ifname") - - local rx = netstat and netstat[ix] and netstat[ix][1] - rx = rx and luci.tools.webadmin.byte_format(tonumber(rx)) or "-" - - local tx = netstat and netstat[ix] and netstat[ix][9] - tx = tx and luci.tools.webadmin.byte_format(tonumber(tx)) or "-" - - return string.format("%s / %s", tx, rx) -end - -errors = s:option(DummyValue, "_err") - -function errors.cfgvalue(self, section) - local ix = self.map:get(section, "ifname") - - local rx = netstat and netstat[ix] and netstat[ix][3] - local tx = netstat and netstat[ix] and netstat[ix][11] - - rx = rx and tostring(rx) or "-" - tx = tx and tostring(tx) or "-" - - return string.format("%s / %s", tx, rx) -end -return w, f, m
\ No newline at end of file +return w, f
\ No newline at end of file diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua index 2e1d7955f9..aeaf8a7c13 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua @@ -12,7 +12,64 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("network", "Network") +m0 = Map("network", translate("network")) +m0.stateful = true +local netstat = luci.sys.net.deviceinfo() + +m0.parse = function() end + +s = m0:section(TypedSection, "interface", translate("status")) +s.template = "cbi/tblsection" +s.rowcolors = true + +function s.filter(self, section) + return section ~= "loopback" and section +end + +hwaddr = s:option(DummyValue, "_hwaddr") +function hwaddr.cfgvalue(self, section) + local ix = self.map:get(section, "ifname") or "" + return luci.fs.readfile("/sys/class/net/" .. ix .. "/address") or "n/a" +end + + +s:option(DummyValue, "ipaddr", translate("ipaddress")) + +s:option(DummyValue, "netmask", translate("netmask")) + + +txrx = s:option(DummyValue, "_txrx") + +function txrx.cfgvalue(self, section) + local ix = self.map:get(section, "ifname") + + local rx = netstat and netstat[ix] and netstat[ix][1] + rx = rx and luci.tools.webadmin.byte_format(tonumber(rx)) or "-" + + local tx = netstat and netstat[ix] and netstat[ix][9] + tx = tx and luci.tools.webadmin.byte_format(tonumber(tx)) or "-" + + return string.format("%s / %s", tx, rx) +end + +errors = s:option(DummyValue, "_err") + +function errors.cfgvalue(self, section) + local ix = self.map:get(section, "ifname") + + local rx = netstat and netstat[ix] and netstat[ix][3] + local tx = netstat and netstat[ix] and netstat[ix][11] + + rx = rx and tostring(rx) or "-" + tx = tx and tostring(tx) or "-" + + return string.format("%s / %s", tx, rx) +end + + + + +m = Map("network", "") s = m:section(NamedSection, "lan", "interface", translate("m_n_local")) s:option(Value, "ipaddr", translate("ipaddress")) @@ -76,4 +133,4 @@ srv.rmempty = true -return m
\ No newline at end of file +return m0, m
\ No newline at end of file diff --git a/modules/admin-mini/luasrc/view/mini/index.htm b/modules/admin-mini/luasrc/view/mini/index.htm index 385deaf7aa..e88324a8cb 100644 --- a/modules/admin-mini/luasrc/view/mini/index.htm +++ b/modules/admin-mini/luasrc/view/mini/index.htm @@ -18,3 +18,4 @@ $Id$ <%:a_i_i_admin3%></p> <p><%:a_i_i_admin6%></p> <p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team%></a></strong></em></p> +<br />
\ No newline at end of file |